diff options
Diffstat (limited to 'po/sv.po')
| -rw-r--r-- | po/sv.po | 4533 |
1 files changed, 2447 insertions, 2086 deletions
@@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.12.0\n" +"Project-Id-Version: git 2.13.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-02-18 01:00+0800\n" -"PO-Revision-Date: 2017-02-20 19:38+0100\n" +"POT-Creation-Date: 2017-05-05 09:35+0800\n" +"PO-Revision-Date: 2017-05-09 08:02+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" -"Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n" +"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -70,7 +70,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:114 builtin/merge.c:1206 +#: advice.c:114 builtin/merge.c:1185 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." @@ -342,7 +342,7 @@ msgstr "patch misslyckades: %s:%ld" msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248 +#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" @@ -467,7 +467,7 @@ msgstr "nytt läge för %s, som inte finns i nuvarande HEAD" msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135 +#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" @@ -543,7 +543,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:4531 builtin/fetch.c:737 builtin/fetch.c:986 +#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" @@ -571,160 +571,160 @@ msgstr "indata känns inte igen" msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4824 +#: apply.c:4823 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4849 +#: apply.c:4850 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "undertryckte %d fel i blanksteg" msgstr[1] "undertryckte %d fel i blanksteg" -#: apply.c:4855 apply.c:4870 +#: apply.c:4856 apply.c:4871 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d rad lägger till fel i blanksteg." msgstr[1] "%d rader lägger till fel i blanksteg." -#: apply.c:4863 +#: apply.c:4864 #, c-format msgid "%d line applied after fixing whitespace errors." 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:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 +#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280 -#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591 -#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960 -#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104 +#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279 +#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180 +#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 +#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 #: git-add--interactive.perl:239 msgid "path" msgstr "sökväg" -#: apply.c:4911 +#: apply.c:4912 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4914 +#: apply.c:4915 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4916 builtin/am.c:2286 +#: apply.c:4917 builtin/am.c:2285 msgid "num" msgstr "antal" -#: apply.c:4917 +#: apply.c:4918 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4920 +#: apply.c:4921 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4922 +#: apply.c:4923 msgid "instead of applying the patch, output diffstat for the input" msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" -#: apply.c:4926 +#: apply.c:4927 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:4928 +#: apply.c:4929 msgid "instead of applying the patch, output a summary for the input" msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" -#: apply.c:4930 +#: apply.c:4931 msgid "instead of applying the patch, see if the patch is applicable" msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" -#: apply.c:4932 +#: apply.c:4933 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:4934 +#: apply.c:4935 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:4936 +#: apply.c:4937 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:4938 +#: apply.c:4939 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:4940 +#: apply.c:4941 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:4942 +#: apply.c:4943 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507 +#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:4947 +#: apply.c:4948 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:4948 builtin/am.c:2265 +#: apply.c:4949 builtin/am.c:2264 msgid "action" msgstr "åtgärd" -#: apply.c:4949 +#: apply.c:4950 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:4952 apply.c:4955 +#: apply.c:4953 apply.c:4956 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:4958 +#: apply.c:4959 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:4960 +#: apply.c:4961 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:4962 +#: apply.c:4963 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:4964 +#: apply.c:4965 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19 +#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19 #: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 -#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114 +#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134 msgid "be verbose" msgstr "var pratsam" -#: apply.c:4967 +#: apply.c:4968 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:4970 +#: apply.c:4971 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:4972 builtin/am.c:2274 +#: apply.c:4973 builtin/am.c:2273 msgid "root" msgstr "rot" -#: apply.c:4973 +#: apply.c:4974 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" @@ -747,103 +747,108 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 +#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: archive.c:429 +#: archive.c:417 msgid "fmt" msgstr "fmt" -#: archive.c:429 +#: archive.c:417 msgid "archive format" msgstr "arkivformat" -#: archive.c:430 builtin/log.c:1429 +#: archive.c:418 builtin/log.c:1436 msgid "prefix" msgstr "prefix" -#: archive.c:431 +#: archive.c:419 msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59 -#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054 -#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544 -#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 +#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061 +#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129 #: parse-options.h:153 msgid "file" msgstr "fil" -#: archive.c:433 builtin/archive.c:89 +#: archive.c:421 builtin/archive.c:89 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:435 +#: archive.c:423 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:436 +#: archive.c:424 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:437 +#: archive.c:425 msgid "store only" msgstr "endast spara" -#: archive.c:438 +#: archive.c:426 msgid "compress faster" msgstr "komprimera snabbare" -#: archive.c:446 +#: archive.c:434 msgid "compress better" msgstr "komprimera bättre" -#: archive.c:449 +#: archive.c:437 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 -#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969 +#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106 +#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982 msgid "repo" msgstr "arkiv" -#: archive.c:452 builtin/archive.c:91 +#: archive.c:440 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485 +#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485 msgid "command" msgstr "kommando" -#: archive.c:454 builtin/archive.c:93 +#: archive.c:442 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "sökväg till kommandot git-upload-archive på fjärren" -#: archive.c:461 +#: archive.c:449 msgid "Unexpected option --remote" msgstr "Oväntad flagga --remote" -#: archive.c:463 +#: archive.c:451 msgid "Option --exec can only be used together with --remote" msgstr "Flaggan --exec kan endast användas tillsammans med --remote" -#: archive.c:465 +#: archive.c:453 msgid "Unexpected option --output" msgstr "Oväntad flagga --output" -#: archive.c:487 +#: archive.c:475 #, c-format msgid "Unknown archive format '%s'" msgstr "Okänt arkivformat \"%s\"" -#: archive.c:494 +#: archive.c:482 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumentet stöd inte för formatet \"%s\": -%d" -#: attr.c:263 +#: attr.c:212 +#, c-format +msgid "%.*s is not a valid attribute name" +msgstr "%-*s är inte ett giltigt namn på attribut" + +#: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -851,27 +856,27 @@ msgstr "" "Negativa mönster ignoreras i git-attribut\n" "Använd '\\!' för att inleda med ett utropstecken." -#: bisect.c:441 +#: bisect.c:444 #, c-format msgid "Could not open file '%s'" msgstr "Kunde inte öppna filen \"%s\"" -#: bisect.c:446 +#: bisect.c:449 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Felaktigt citerat innehåll i filen \"%s\": %s" -#: bisect.c:655 +#: bisect.c:657 #, c-format msgid "We cannot bisect more!\n" msgstr "Det finns inte mer att göra \"bisect\" på!\n" -#: bisect.c:708 +#: bisect.c:710 #, c-format msgid "Not a valid commit name %s" msgstr "Namnet på incheckningen är inte giltigt: %s" -#: bisect.c:732 +#: bisect.c:734 #, c-format msgid "" "The merge base %s is bad.\n" @@ -880,7 +885,7 @@ msgstr "" "Sammanslagningsbasen %s är trasig.\n" "Det betyder att felet har rättats mellan %s och [%s].\n" -#: bisect.c:737 +#: bisect.c:739 #, c-format msgid "" "The merge base %s is new.\n" @@ -889,7 +894,7 @@ msgstr "" "Sammanslagningsbasen %s är ny.\n" "Egenskapen har ändrats mellan %s och [%s].\n" -#: bisect.c:742 +#: bisect.c:744 #, c-format msgid "" "The merge base %s is %s.\n" @@ -898,7 +903,7 @@ msgstr "" "Sammanslagningsbasen %s är %s.\n" "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n" -#: bisect.c:750 +#: bisect.c:752 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -909,7 +914,7 @@ msgstr "" "git bisect kan inte fungera korrekt i detta fall.\n" "Kanske du skrev fel %s- och %s-revisioner?\n" -#: bisect.c:763 +#: bisect.c:765 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -921,36 +926,36 @@ msgstr "" "%s.\n" "Vi fortsätter ändå." -#: bisect.c:798 +#: bisect.c:800 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisect: en sammanslagningsbas måste testas\n" -#: bisect.c:849 +#: bisect.c:851 #, c-format msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262 +#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:917 +#: bisect.c:919 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" -#: bisect.c:947 +#: bisect.c:949 msgid "reading bisect refs failed" msgstr "misslyckades läsa bisect-referenser" -#: bisect.c:967 +#: bisect.c:969 #, c-format msgid "%s was both %s and %s\n" msgstr "%s var både %s och %s\n" -#: bisect.c:975 +#: bisect.c:977 #, c-format msgid "" "No testable commit found.\n" @@ -959,7 +964,7 @@ msgstr "" "Ingen testbar incheckning hittades.\n" "Kanske du startade med felaktiga sökvägsparametrar?\n" -#: bisect.c:994 +#: bisect.c:996 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -968,7 +973,7 @@ msgstr[1] "(ungefär %d steg)" #. TRANSLATORS: the last %s will be replaced with #. "(roughly %d steps)" translation -#: bisect.c:998 +#: bisect.c:1000 #, 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" @@ -1108,7 +1113,7 @@ msgstr "Avgreningspunkten är inte giltig: \"%s\"" msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad på \"%s\"" -#: branch.c:363 +#: branch.c:364 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" @@ -1123,7 +1128,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -1132,10 +1137,10 @@ msgstr "kunde inte öppna \"%s\"" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290 -#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348 -#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 -#: builtin/merge.c:360 builtin/shortlog.c:177 +#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321 +#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353 +#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916 +#: builtin/merge.c:359 builtin/shortlog.c:176 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -1174,7 +1179,7 @@ msgstr "rev-list dog" msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282 +#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -1197,8 +1202,8 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457 -#: builtin/am.c:1493 builtin/am.c:2127 +#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455 +#: builtin/am.c:1489 builtin/am.c:2126 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -1208,7 +1213,7 @@ msgstr "kunde inte tolka %s" msgid "%s %s is not a commit!" msgstr "%s %s är inte en incheckning!" -#: commit.c:1514 +#: commit.c:1511 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" @@ -1222,140 +1227,160 @@ msgstr "" msgid "memory exhausted" msgstr "minnet slut" -#: config.c:518 +#: config.c:191 +msgid "relative config include conditionals must come from files" +msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer" + +#: config.c:711 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:522 +#: config.c:715 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:526 +#: config.c:719 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:530 +#: config.c:723 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:534 +#: config.c:727 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:538 +#: config.c:731 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:657 +#: config.c:859 msgid "out of range" msgstr "utanför intervallet" -#: config.c:657 +#: config.c:859 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:663 +#: config.c:865 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:668 +#: config.c:870 #, 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:671 +#: config.c:873 #, 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:674 +#: config.c:876 #, 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:677 +#: config.c:879 #, 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:680 +#: config.c:882 #, 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:683 +#: config.c:885 #, 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:770 +#: config.c:980 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:865 config.c:876 +#: config.c:1075 config.c:1086 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:993 +#: config.c:1203 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1149 +#: config.c:1359 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1339 +#: config.c:1557 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:1389 +#: config.c:1611 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:1743 +#: config.c:1970 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "Felaktigt %s: \"%s\"" + +#: config.c:1991 +#, 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:2017 +#, 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:2028 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:1745 +#: config.c:2030 #, 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:1804 +#: config.c:2089 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2225 config.c:2450 +#: config.c:2423 config.c:2648 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2343 +#: config.c:2541 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2345 +#: config.c:2543 builtin/remote.c:774 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" @@ -1528,20 +1553,20 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:3085 +#: diff.c:3102 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:3411 +#: diff.c:3428 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:3501 +#: diff.c:3518 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:3664 +#: diff.c:3681 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1550,207 +1575,232 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3678 +#: diff.c:3695 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:4696 +#: diff.c:4719 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:4699 +#: diff.c:4722 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:4702 +#: diff.c:4725 #, 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:1862 +#: dir.c:1899 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:1981 +#: dir.c:2018 msgid "Untracked cache is disabled on this system or location." msgstr "Ospårad cache är inaktiverad på systemet eller platsen." -#: dir.c:2759 +#: dir.c:2776 dir.c:2781 +#, c-format +msgid "could not create directories for %s" +msgstr "kunde inte skapa kataloger för %s" + +#: dir.c:2806 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" -#: fetch-pack.c:213 +#: entry.c:280 +#, c-format +msgid "could not stat file '%s'" +msgstr "kunde inte ta status på filen \"%s\"" + +#: fetch-pack.c:249 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: förväntade grund lista" -#: fetch-pack.c:225 +#: fetch-pack.c:261 msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF" -#: fetch-pack.c:243 +#: fetch-pack.c:280 builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "fjärrfel: %s" + +#: fetch-pack.c:281 #, 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:295 +#: fetch-pack.c:333 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc kräver \"multi ack detailed\"" -#: fetch-pack.c:381 +#: fetch-pack.c:419 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:387 +#: fetch-pack.c:425 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:389 +#: fetch-pack.c:427 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:392 +#: fetch-pack.c:430 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:394 +#: fetch-pack.c:432 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:397 +#: fetch-pack.c:435 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" -#: fetch-pack.c:436 +#: fetch-pack.c:474 #, c-format msgid "got %s %d %s" msgstr "fick %s %d %s" -#: fetch-pack.c:450 +#: fetch-pack.c:488 #, c-format msgid "invalid commit %s" msgstr "ogiltig incheckning %s" -#: fetch-pack.c:483 +#: fetch-pack.c:521 msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:493 progress.c:235 +#: fetch-pack.c:531 progress.c:235 msgid "done" msgstr "klart" -#: fetch-pack.c:505 +#: fetch-pack.c:543 #, c-format msgid "got %s (%d) %s" msgstr "fick %s (%d) %s" -#: fetch-pack.c:551 +#: fetch-pack.c:589 #, c-format msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:697 +#: fetch-pack.c:737 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:735 +#: fetch-pack.c:775 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:743 +#: fetch-pack.c:783 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:799 +#: fetch-pack.c:839 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:815 +#: fetch-pack.c:855 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:817 +#: fetch-pack.c:857 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:844 +#: fetch-pack.c:884 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:848 +#: fetch-pack.c:888 msgid "Server supports multi_ack_detailed" msgstr "Servern stöder \"multi_ack_detailed\"" -#: fetch-pack.c:851 +#: fetch-pack.c:891 msgid "Server supports no-done" msgstr "Servern stöder \"no-done\"" -#: fetch-pack.c:857 +#: fetch-pack.c:897 msgid "Server supports multi_ack" msgstr "Servern stöder \"multi_ack\"" -#: fetch-pack.c:861 +#: fetch-pack.c:901 msgid "Server supports side-band-64k" msgstr "Servern stöder \"side-band-64k\"" -#: fetch-pack.c:865 +#: fetch-pack.c:905 msgid "Server supports side-band" msgstr "Servern stöder \"side-band\"" -#: fetch-pack.c:869 +#: fetch-pack.c:909 msgid "Server supports allow-tip-sha1-in-want" msgstr "Servern stöder \"allow-tip-sha1-in-want\"" -#: fetch-pack.c:873 +#: fetch-pack.c:913 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Servern stöder \"allow-reachable-sha1-in-want\"" -#: fetch-pack.c:883 +#: fetch-pack.c:923 msgid "Server supports ofs-delta" msgstr "Servern stöder \"ofs-delta\"" -#: fetch-pack.c:890 +#: fetch-pack.c:930 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:896 +#: fetch-pack.c:936 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:900 +#: fetch-pack.c:940 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:902 +#: fetch-pack.c:942 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:913 +#: fetch-pack.c:953 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:925 +#: fetch-pack.c:965 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1087 +#: fetch-pack.c:1127 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" +#: fetch-pack.c:1149 +#, c-format +msgid "no such remote ref %s" +msgstr "ingen sådan fjärreferens: %s" + +#: fetch-pack.c:1152 +#, c-format +msgid "Server does not allow request for unadvertised object %s" +msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s" + #: gpg-interface.c:185 msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" @@ -1769,17 +1819,17 @@ msgstr "misslyckades skriva fristående signatur till \"%s\"" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" -#: grep.c:1794 +#: grep.c:1796 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133 +#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:1822 +#: grep.c:1824 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" @@ -1848,7 +1898,7 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: ident.c:334 +#: ident.c:343 msgid "" "\n" "*** Please tell me who you are.\n" @@ -1874,6 +1924,39 @@ msgstr "" "Kör utan --global för att endast ändra i aktuellt arkiv.\n" "\n" +#: ident.c:367 +msgid "no email was given and auto-detection is disabled" +msgstr "ingen e-post angavs och autodetektering är inaktiverad" + +#: ident.c:372 +#, c-format +msgid "unable to auto-detect email address (got '%s')" +msgstr "kunde inte autodetektera e-postadress (fick \"%s\")" + +#: ident.c:382 +msgid "no name was given and auto-detection is disabled" +msgstr "inget namn angavs och autodetektering är inaktiverad" + +#: ident.c:388 +#, c-format +msgid "unable to auto-detect name (got '%s')" +msgstr "kunde inte autodetektera namn (fick \"%s\")" + +#: ident.c:396 +#, c-format +msgid "empty ident name (for <%s>) not allowed" +msgstr "tomt ident-namn (för <%s>) ej tillåtet" + +#: ident.c:402 +#, c-format +msgid "name consists only of disallowed characters: %s" +msgstr "namnet består enbart av ej tillåtna tecken: %s" + +#: ident.c:417 builtin/commit.c:611 +#, c-format +msgid "invalid date format: %s" +msgstr "felaktigt datumformat: %s" + #: lockfile.c:152 #, c-format msgid "" @@ -1903,8 +1986,8 @@ msgstr "kunde inte skapa \"%s.lock\": %s" msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374 -#: builtin/checkout.c:588 builtin/clone.c:731 +#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393 +#: builtin/checkout.c:607 builtin/clone.c:749 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -1974,7 +2057,7 @@ msgstr "Misslyckades exekvera intern sammanslagning" msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:1088 merge-recursive.c:1102 +#: merge-recursive.c:1092 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -1983,7 +2066,16 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet." -#: merge-recursive.c:1094 merge-recursive.c:1107 +#: merge-recursive.c:1097 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree." +msgstr "" +"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:1104 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -1992,20 +2084,29 @@ msgstr "" "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:1150 +#: merge-recursive.c:1109 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree at %s." +msgstr "" +"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:1143 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1150 +#: merge-recursive.c:1143 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1207 +#: merge-recursive.c:1200 #, 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:1232 +#: merge-recursive.c:1225 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2014,135 +2115,135 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1237 +#: merge-recursive.c:1230 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1299 +#: merge-recursive.c:1292 #, 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:1332 +#: merge-recursive.c:1325 #, 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:1535 +#: merge-recursive.c:1528 #, 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:1550 +#: merge-recursive.c:1543 #, c-format msgid "Adding merged %s" msgstr "Lägger till sammanslagen %s" -#: merge-recursive.c:1557 merge-recursive.c:1771 +#: merge-recursive.c:1550 merge-recursive.c:1780 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:1614 +#: merge-recursive.c:1607 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:1617 +#: merge-recursive.c:1610 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:1670 +#: merge-recursive.c:1679 msgid "modify" msgstr "ändra" -#: merge-recursive.c:1670 +#: merge-recursive.c:1679 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:1680 +#: merge-recursive.c:1689 msgid "content" msgstr "innehåll" -#: merge-recursive.c:1687 +#: merge-recursive.c:1696 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:1723 +#: merge-recursive.c:1732 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:1737 +#: merge-recursive.c:1746 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1741 git-submodule.sh:930 +#: merge-recursive.c:1750 git-submodule.sh:944 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:1742 +#: merge-recursive.c:1751 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:1836 +#: merge-recursive.c:1845 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:1862 +#: merge-recursive.c:1871 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:1868 +#: merge-recursive.c:1877 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:1874 +#: merge-recursive.c:1883 #, 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:1883 +#: merge-recursive.c:1892 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1920 +#: merge-recursive.c:1929 msgid "Already up-to-date!" msgstr "Redan à jour!" -#: merge-recursive.c:1929 +#: merge-recursive.c:1938 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:2012 +#: merge-recursive.c:2021 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:2025 +#: merge-recursive.c:2034 #, 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:2064 +#: merge-recursive.c:2073 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2127 +#: merge-recursive.c:2136 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792 +#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -2219,17 +2320,34 @@ msgstr "-TAL" msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: path.c:826 +#: path.c:810 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" -#: pathspec.c:142 +#: pathspec.c:125 +msgid "Escape character '\\' not allowed as last character in attr value" +msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde" + +#: pathspec.c:143 +msgid "Only one 'attr:' specification is allowed." +msgstr "Endast en \"attr:\"-angivelse tillåten." + +#: pathspec.c:146 +msgid "attr spec must not be empty" +msgstr "attr-angivelse kan inte vara tom" + +#: pathspec.c:189 +#, c-format +msgid "invalid attribute name %s" +msgstr "ogiltigt attributnamn %s" + +#: pathspec.c:254 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla" -#: pathspec.c:149 +#: pathspec.c:261 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -2237,51 +2355,51 @@ msgstr "" "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra " "globala sökvägsinställningar" -#: pathspec.c:188 +#: pathspec.c:301 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\"" -#: pathspec.c:201 +#: pathspec.c:322 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "felaktigt sökvägsuttryck \"%.*s\" i \"%s\"" -#: pathspec.c:206 +#: pathspec.c:327 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\"" -#: pathspec.c:238 +#: pathspec.c:365 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Tecknet \"%c\" i sökvägsuttrycket i \"%s\" har inte implementerats" -#: pathspec.c:293 pathspec.c:315 +#: pathspec.c:421 pathspec.c:443 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" -#: pathspec.c:350 +#: pathspec.c:483 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: \"literal\" och \"glob\" är inkompatibla" -#: pathspec.c:363 +#: pathspec.c:496 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: \"%s\" är utanför arkivet" -#: pathspec.c:451 +#: pathspec.c:584 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "\"%s\" (minnesstöd: \"%c\")" -#: pathspec.c:461 +#: pathspec.c:594 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s" -#: pathspec.c:511 +#: pathspec.c:644 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2289,24 +2407,16 @@ msgstr "" "tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande " "utgåva. använd istället . om du vill träffa alla sökvägar" -#: pathspec.c:535 +#: pathspec.c:668 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" -#: pathspec.c:544 -msgid "" -"There is nothing to exclude from by :(exclude) patterns.\n" -"Perhaps you forgot to add either ':/' or '.' ?" -msgstr "" -"Ingenting att exkludera från med :(exkludera)-mönster.\n" -"Glömde du kanske att antingen lägga till \":/\" eller \".\"?" - #: pretty.c:982 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: read-cache.c:1307 +#: read-cache.c:1442 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2315,7 +2425,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1317 +#: read-cache.c:1452 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2324,161 +2434,268 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: refs.c:576 builtin/merge.c:844 +#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048 +#, c-format +msgid "could not stat '%s'" +msgstr "kunde inte ta status på \"%s\"" + +#: read-cache.c:2388 +#, c-format +msgid "unable to open git dir: %s" +msgstr "kunde inte öppna git-katalog: %s" + +#: read-cache.c:2400 +#, c-format +msgid "unable to unlink: %s" +msgstr "misslyckades ta bort länken: %s" + +#: refs.c:620 builtin/merge.c:844 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: refs/files-backend.c:2481 +#: refs.c:1667 +msgid "ref updates forbidden inside quarantine environment" +msgstr "referensuppdateringar förbjudna i karantänmiljö" + +#: refs/files-backend.c:1631 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:2484 +#: refs/files-backend.c:1634 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" -#: refs/files-backend.c:2493 +#: refs/files-backend.c:1643 #, c-format msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" -#: ref-filter.c:56 +#: ref-filter.c:35 wt-status.c:1780 +msgid "gone" +msgstr "försvunnen" + +#: ref-filter.c:36 +#, c-format +msgid "ahead %d" +msgstr "före %d" + +#: ref-filter.c:37 +#, c-format +msgid "behind %d" +msgstr "bakom %d" + +#: ref-filter.c:38 +#, c-format +msgid "ahead %d, behind %d" +msgstr "före %d, bakom %d" + +#: ref-filter.c:104 #, c-format msgid "expected format: %%(color:<color>)" msgstr "förväntat format: %%(color:<color>)" -#: ref-filter.c:58 +#: ref-filter.c:106 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "okänd färg: %%(color:%s)" -#: ref-filter.c:72 +#: ref-filter.c:120 +#, c-format +msgid "Integer value expected refname:lstrip=%s" +msgstr "Heltalsvärde förväntades refname:lstrip=%s" + +#: ref-filter.c:124 #, c-format -msgid "unrecognized format: %%(%s)" -msgstr "okänt format: %%(%s)" +msgid "Integer value expected refname:rstrip=%s" +msgstr "Heltalsvärde förväntades refname:rstrip=%s" -#: ref-filter.c:78 +#: ref-filter.c:126 +#, c-format +msgid "unrecognized %%(%s) argument: %s" +msgstr "okänt %%(%s)-argument: %s" + +#: ref-filter.c:166 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) tar inte argument" -#: ref-filter.c:85 +#: ref-filter.c:173 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) tar inte argument" -#: ref-filter.c:92 +#: ref-filter.c:180 #, c-format msgid "%%(trailers) does not take arguments" msgstr "%%(trailers) tar inte argument" -#: ref-filter.c:111 +#: ref-filter.c:199 #, c-format msgid "positive value expected contents:lines=%s" msgstr "positivt värde förväntat contents:lines=%s" -#: ref-filter.c:113 +#: ref-filter.c:201 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "okänt %%(contents)-argument: %s" -#: ref-filter.c:123 +#: ref-filter.c:214 +#, c-format +msgid "positive value expected objectname:short=%s" +msgstr "positivt värde förväntat objectname:short=%s" + +#: ref-filter.c:218 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "okänt %%(objectname)-argument: %s" -#: ref-filter.c:145 +#: ref-filter.c:245 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "förväntat format: %%(align:<bredd>,<position>)" -#: ref-filter.c:157 +#: ref-filter.c:257 #, c-format msgid "unrecognized position:%s" msgstr "okänd position:%s" -#: ref-filter.c:161 +#: ref-filter.c:261 #, c-format msgid "unrecognized width:%s" msgstr "okänd bredd:%s" -#: ref-filter.c:167 +#: ref-filter.c:267 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "okänt %%(align)-argument: %s" -#: ref-filter.c:171 +#: ref-filter.c:271 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "positiv bredd förväntad med atomen %%(align)" -#: ref-filter.c:255 +#: ref-filter.c:286 +#, c-format +msgid "unrecognized %%(if) argument: %s" +msgstr "okänt %%(if)-argument: %s" + +#: ref-filter.c:371 #, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" -#: ref-filter.c:281 +#: ref-filter.c:397 #, c-format msgid "unknown field name: %.*s" msgstr "okänt fältnamn: %.*s" -#: ref-filter.c:383 +#: ref-filter.c:501 +#, c-format +msgid "format: %%(if) atom used without a %%(then) atom" +msgstr "format: atomen %%(if) använd utan en %%(then)-atom" + +#: ref-filter.c:561 +#, c-format +msgid "format: %%(then) atom used without an %%(if) atom" +msgstr "format: atomen %%(then) använd utan en %%(if)-atom" + +#: ref-filter.c:563 +#, c-format +msgid "format: %%(then) atom used more than once" +msgstr "format: atomen %%(then) använd mer än en gång" + +#: ref-filter.c:565 +#, c-format +msgid "format: %%(then) atom used after %%(else)" +msgstr "format: atomen %%(then) använd efter %%(else)" + +#: ref-filter.c:591 +#, c-format +msgid "format: %%(else) atom used without an %%(if) atom" +msgstr "format: atomen %%(else) använd utan en %%(if)-atom" + +#: ref-filter.c:593 +#, c-format +msgid "format: %%(else) atom used without a %%(then) atom" +msgstr "format: atomen %%(else) använd utan en %%(then)-atom" + +#: ref-filter.c:595 +#, c-format +msgid "format: %%(else) atom used more than once" +msgstr "format: atomen %%(else) använd mer än en gång" + +#: ref-filter.c:608 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:435 +#: ref-filter.c:663 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:898 -msgid ":strip= requires a positive integer argument" -msgstr ":strip= kräver ett positivt heltalsargument" +#: ref-filter.c:1247 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "(ingen gren, ombaserar %s)" -#: ref-filter.c:903 +#: ref-filter.c:1250 #, c-format -msgid "ref '%s' does not have %ld components to :strip" -msgstr "referensen \"%s\" har inte %ld komponenter för :strip" +msgid "(no branch, bisect started on %s)" +msgstr "(ingen gren, \"bisect\" startad på %s)" + +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: ref-filter.c:1256 +#, c-format +msgid "(HEAD detached at %s)" +msgstr "(HEAD frånkopplat vid %s)" -#: ref-filter.c:1066 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: ref-filter.c:1261 #, c-format -msgid "unknown %.*s format %s" -msgstr "okänt \"%.*s\"-format %s" +msgid "(HEAD detached from %s)" +msgstr "(HEAD frånkopplat från %s)" + +#: ref-filter.c:1265 +msgid "(no branch)" +msgstr "(ingen gren)" -#: ref-filter.c:1086 ref-filter.c:1117 +#: ref-filter.c:1420 ref-filter.c:1451 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1089 ref-filter.c:1120 +#: ref-filter.c:1423 ref-filter.c:1454 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:1343 +#: ref-filter.c:1692 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:1410 +#: ref-filter.c:1759 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:1415 +#: ref-filter.c:1764 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: ref-filter.c:1670 +#: ref-filter.c:2028 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:1734 +#: ref-filter.c:2109 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" @@ -2624,15 +2841,25 @@ msgstr "misslyckades öppna /dev/null" msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) misslyckades" -#: send-pack.c:297 +#: send-pack.c:150 +#, c-format +msgid "unable to parse remote unpack status: %s" +msgstr "kunde inte tolka fjärruppackningsstatus: %s" + +#: send-pack.c:152 +#, c-format +msgid "remote unpack failed: %s" +msgstr "fjärruppackning misslyckades: %s" + +#: send-pack.c:315 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:410 +#: send-pack.c:428 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" -#: send-pack.c:412 +#: send-pack.c:430 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -2640,11 +2867,11 @@ msgstr "" "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --" "signed" -#: send-pack.c:424 +#: send-pack.c:442 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stöder inte push med --atomic" -#: send-pack.c:429 +#: send-pack.c:447 msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" @@ -2683,12 +2910,12 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:294 sequencer.c:1667 +#: sequencer.c:294 sequencer.c:1682 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686 +#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" @@ -2698,13 +2925,13 @@ msgstr "kunde inte skriva till \"%s\"" msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674 +#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689 #, c-format msgid "failed to finalize '%s'." msgstr "misslyckades färdigställa \"%s\"." -#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259 -#: builtin/commit.c:749 builtin/merge.c:1036 +#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257 +#: builtin/commit.c:749 builtin/merge.c:1018 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" @@ -2768,17 +2995,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:688 +#: sequencer.c:694 #, c-format msgid "could not parse commit %s\n" msgstr "kunde inte tolka incheckningen %s\n" -#: sequencer.c:693 +#: sequencer.c:699 #, c-format msgid "could not parse parent commit %s\n" msgstr "kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:815 +#: sequencer.c:821 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -2789,7 +3016,7 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:821 +#: sequencer.c:827 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -2800,231 +3027,231 @@ msgstr "" "\n" "\t%.*s" -#: sequencer.c:827 sequencer.c:852 +#: sequencer.c:833 sequencer.c:858 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:836 +#: sequencer.c:842 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:838 +#: sequencer.c:844 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:840 +#: sequencer.c:846 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:846 +#: sequencer.c:852 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:855 git-rebase--interactive.sh:445 +#: sequencer.c:861 git-rebase--interactive.sh:445 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:863 +#: sequencer.c:869 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:870 +#: sequencer.c:876 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:875 +#: sequencer.c:881 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:880 +#: sequencer.c:886 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:946 +#: sequencer.c:952 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:964 +#: sequencer.c:970 #, 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:972 +#: sequencer.c:978 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:976 +#: sequencer.c:982 #, 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:982 +#: sequencer.c:988 #, 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:1001 +#: sequencer.c:1009 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:1063 sequencer.c:1812 +#: sequencer.c:1071 sequencer.c:1827 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:1114 +#: sequencer.c:1122 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:1115 +#: sequencer.c:1123 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:1157 +#: sequencer.c:1165 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:1167 +#: sequencer.c:1175 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:1174 +#: sequencer.c:1182 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:1294 +#: sequencer.c:1303 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:1302 +#: sequencer.c:1311 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:1334 +#: sequencer.c:1344 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: sequencer.c:1341 +#: sequencer.c:1356 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:1343 +#: sequencer.c:1358 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: %s" -#: sequencer.c:1348 +#: sequencer.c:1363 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:1359 +#: sequencer.c:1374 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:1361 +#: sequencer.c:1376 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:1424 +#: sequencer.c:1439 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" -#: sequencer.c:1427 +#: sequencer.c:1442 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:1484 +#: sequencer.c:1499 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: %s" -#: sequencer.c:1522 +#: sequencer.c:1537 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:1523 +#: sequencer.c:1538 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1526 +#: sequencer.c:1541 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:1540 +#: sequencer.c:1555 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:1596 sequencer.c:2150 +#: sequencer.c:1611 sequencer.c:2181 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:1598 +#: sequencer.c:1613 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:1600 sequencer.c:1634 +#: sequencer.c:1615 sequencer.c:1649 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:1620 builtin/grep.c:904 +#: sequencer.c:1635 builtin/grep.c:910 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:1622 +#: sequencer.c:1637 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:1623 +#: sequencer.c:1638 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:1629 +#: sequencer.c:1644 #, 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:1640 +#: sequencer.c:1655 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:1777 sequencer.c:2049 +#: sequencer.c:1792 sequencer.c:2080 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:1817 builtin/difftool.c:574 +#: sequencer.c:1832 builtin/difftool.c:616 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:1833 +#: sequencer.c:1848 msgid "could not read index" msgstr "Kunde inte läsa indexet" -#: sequencer.c:1838 +#: sequencer.c:1853 #, c-format msgid "" "execution failed: %s\n" @@ -3039,11 +3266,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:1844 +#: sequencer.c:1859 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:1850 +#: sequencer.c:1865 #, c-format msgid "" "execution succeeded: %s\n" @@ -3060,17 +3287,17 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:1905 git-rebase.sh:168 +#: sequencer.c:1920 git-rebase.sh:169 #, c-format msgid "Applied autostash." msgstr "Tillämpade autostash." -#: sequencer.c:1917 +#: sequencer.c:1932 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:1919 git-rebase.sh:172 +#: sequencer.c:1934 git-rebase.sh:173 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3081,57 +3308,57 @@ msgstr "" "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:2000 +#: sequencer.c:2016 #, c-format -msgid "stopped at %s... %.*s" -msgstr "stoppade på %s... %.*s" +msgid "Stopped at %s... %.*s\n" +msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:2027 +#: sequencer.c:2058 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:2057 +#: sequencer.c:2088 msgid "could not read orig-head" msgstr "Kunde inte läsa orig-head" -#: sequencer.c:2061 +#: sequencer.c:2092 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:2068 +#: sequencer.c:2099 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:2075 +#: sequencer.c:2106 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:2159 +#: sequencer.c:2190 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:2164 +#: sequencer.c:2195 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:2173 +#: sequencer.c:2204 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:2175 +#: sequencer.c:2206 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:2177 +#: sequencer.c:2208 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:2180 +#: sequencer.c:2211 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3141,25 +3368,25 @@ msgstr "" "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:2190 +#: sequencer.c:2221 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:2270 +#: sequencer.c:2301 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:2274 +#: sequencer.c:2305 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:2307 +#: sequencer.c:2338 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: setup.c:160 +#: setup.c:165 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -3169,7 +3396,7 @@ msgstr "" "Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns " "lokalt." -#: setup.c:173 +#: setup.c:178 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3181,7 +3408,7 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:223 +#: setup.c:228 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3192,29 +3419,34 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:470 +#: setup.c:475 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Förväntade git-arkivversion <= %d, hittade %d" -#: setup.c:478 +#: setup.c:483 msgid "unknown repository extensions found:" msgstr "okända arkivutökningar hittades:" -#: setup.c:768 +#: setup.c:776 #, 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:770 setup.c:922 builtin/index-pack.c:1643 +#: setup.c:778 builtin/index-pack.c:1646 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: setup.c:852 +#: setup.c:1010 msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" -#: setup.c:927 +#: setup.c:1022 setup.c:1028 +#, c-format +msgid "Cannot change to '%s'" +msgstr "Kan inte byta till \"%s\"" + +#: setup.c:1041 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -3224,12 +3456,7 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:934 -#, c-format -msgid "Cannot change to '%s/..'" -msgstr "kan inte byta till \"%s/..\"" - -#: setup.c:996 +#: setup.c:1106 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3238,55 +3465,55 @@ msgstr "" "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:490 +#: sha1_file.c:559 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: sha1_file.c:516 +#: sha1_file.c:585 #, 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:522 +#: sha1_file.c:591 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: sha1_file.c:528 +#: sha1_file.c:597 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: sha1_file.c:536 +#: sha1_file.c:605 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: sha1_file.c:1176 +#: sha1_file.c:1245 msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: sha1_file.c:2637 +#: sha1_file.c:2721 #, 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?)" -#: sha1_file.c:2641 +#: sha1_file.c:2725 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" -#: sha1_name.c:407 +#: sha1_name.c:409 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "kort SHA1 %s är tvetydig" -#: sha1_name.c:418 +#: sha1_name.c:420 msgid "The candidates are:" msgstr "Kandidaterna är:" -#: sha1_name.c:578 +#: sha1_name.c:580 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -3308,46 +3535,56 @@ msgstr "" "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" "genom att köra \"git config advice.objectNameWarning false\"" -#: submodule.c:65 submodule.c:99 +#: submodule.c:67 submodule.c:101 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Kan inte ändra .gitmodules-fil som inte slagits ihop, lös " "sammanslagningskonflikter först" -#: submodule.c:69 submodule.c:103 +#: submodule.c:71 submodule.c:105 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s" -#: submodule.c:77 +#: submodule.c:79 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" -#: submodule.c:110 +#: submodule.c:112 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Kunde inte ta bort .gitmodules-posten för %s" -#: submodule.c:121 +#: submodule.c:123 msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:159 +#: submodule.c:161 msgid "negative values not allowed for submodule.fetchJobs" msgstr "negativa värden är inte tillåtna för submodule.fetchJobs" -#: submodule.c:1184 +#: submodule.c:1194 #, c-format -msgid "could not start 'git status in submodule '%s'" +msgid "'%s' not recognized as a git repository" +msgstr "\"%s\" känns inte igen som ett git-arkiv" + +#: submodule.c:1332 +#, c-format +msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1197 +#: submodule.c:1345 #, c-format -msgid "could not run 'git status in submodule '%s'" +msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1398 +#: submodule.c:1421 +#, c-format +msgid "submodule '%s' has dirty index" +msgstr "undermodulen \"%s\" har ett smutsigt index" + +#: submodule.c:1678 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3355,18 +3592,18 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:1410 submodule.c:1471 +#: submodule.c:1690 submodule.c:1746 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640 -#: builtin/submodule--helper.c:650 +#: submodule.c:1694 builtin/submodule--helper.c:678 +#: builtin/submodule--helper.c:688 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: submodule.c:1420 +#: submodule.c:1697 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3377,12 +3614,25 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:1512 +#: submodule.c:1781 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule-config.c:360 +#: submodule.c:1825 +msgid "could not start ls-files in .." +msgstr "kunde inte starta ls-files i .." + +#: submodule.c:1845 +msgid "BUG: returned path string doesn't match cwd?" +msgstr "BUG: returnerad sökvägssträng matchar inte cwd?" + +#: submodule.c:1864 +#, c-format +msgid "ls-tree returned unexpected return code %d" +msgstr "ls-tree returnerade en oväntad returkod %d" + +#: submodule-config.c:380 #, c-format msgid "invalid value for %s" msgstr "ogiltigt värde för %s" @@ -3451,7 +3701,7 @@ msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n" msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: %s" -#: transport.c:885 +#: transport.c:889 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3460,7 +3710,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:889 +#: transport.c:893 #, c-format msgid "" "\n" @@ -3487,11 +3737,11 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:897 +#: transport.c:901 msgid "Aborting." msgstr "Avbryter." -#: transport-helper.c:1082 +#: transport-helper.c:1080 #, c-format msgid "Could not read ref %s" msgstr "Kunde inte läsa referensen %s" @@ -3512,7 +3762,7 @@ msgstr "tomt filnamn i trädpost" msgid "too-short tree file" msgstr "trädfil för kort" -#: unpack-trees.c:99 +#: unpack-trees.c:104 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3521,7 +3771,7 @@ msgstr "" "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:101 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3530,7 +3780,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%s" -#: unpack-trees.c:104 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3540,7 +3790,7 @@ msgstr "" "sammanslagning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:106 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3550,7 +3800,7 @@ msgstr "" "sammanslagning:\n" "%%s" -#: unpack-trees.c:109 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3559,7 +3809,7 @@ msgstr "" "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:111 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3568,7 +3818,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:121 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -3578,7 +3828,7 @@ msgstr "" "dem:\n" "%s" -#: unpack-trees.c:120 +#: unpack-trees.c:125 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3587,7 +3837,7 @@ msgstr "" "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:122 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3596,7 +3846,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%s" -#: unpack-trees.c:125 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3606,7 +3856,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du slår samman." -#: unpack-trees.c:127 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3616,7 +3866,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:130 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3625,7 +3875,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:132 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3634,7 +3884,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3645,7 +3895,7 @@ msgstr "" "utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:139 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3656,7 +3906,7 @@ msgstr "" "utcheckningen:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3666,7 +3916,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:144 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3676,7 +3926,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:147 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3685,7 +3935,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:149 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3694,12 +3944,12 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:156 +#: unpack-trees.c:161 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda." -#: unpack-trees.c:159 +#: unpack-trees.c:164 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" @@ -3708,7 +3958,7 @@ msgstr "" "Kan inte uppdatera gles utcheckning: följande poster är inte àjour:\n" "%s" -#: unpack-trees.c:161 +#: unpack-trees.c:166 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3719,7 +3969,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:163 +#: unpack-trees.c:168 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3730,45 +3980,59 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:240 +#: unpack-trees.c:170 +#, c-format +msgid "" +"Cannot update submodule:\n" +"%s" +msgstr "" +"Kan inte uppdatera undermodul:\n" +"%s" + +#: unpack-trees.c:247 #, c-format msgid "Aborting\n" msgstr "Avbryter\n" -#: unpack-trees.c:270 +#: unpack-trees.c:272 +#, c-format +msgid "submodule update strategy not supported for submodule '%s'" +msgstr "uppdateringsstrategi för undermodul stöds inte för undermodulen \"%s\"" + +#: unpack-trees.c:340 msgid "Checking out files" msgstr "Checkar ut filer" -#: urlmatch.c:120 +#: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix" -#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 +#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 #, c-format msgid "invalid %XX escape sequence" msgstr "ogiltig %XX-teckensekvens" -#: urlmatch.c:172 +#: urlmatch.c:215 msgid "missing host and scheme is not 'file:'" msgstr "värd saknas och schemat är inte \"file:\"" -#: urlmatch.c:189 +#: urlmatch.c:232 msgid "a 'file:' URL may not have a port number" msgstr "en \"file:\"-URL kan inte innehålla portnummer" -#: urlmatch.c:199 +#: urlmatch.c:247 msgid "invalid characters in host name" msgstr "ogiltiga tecken i värdnamnet" -#: urlmatch.c:244 urlmatch.c:255 +#: urlmatch.c:292 urlmatch.c:303 msgid "invalid port number" msgstr "felaktigt portnummer" -#: urlmatch.c:322 +#: urlmatch.c:371 msgid "invalid '..' path segment" msgstr "felaktigt \"..\"-sökvägssegment" -#: worktree.c:282 +#: worktree.c:285 #, c-format msgid "failed to read '%s'" msgstr "misslyckades läsa \"%s\"" @@ -3783,28 +4047,28 @@ msgstr "kunde inte öppna \"%s\" för läsning och skrivning" msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" -#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757 +#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015 #: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: wrapper.c:605 wrapper.c:626 +#: wrapper.c:581 wrapper.c:602 #, c-format msgid "unable to access '%s'" msgstr "kan inte komma åt \"%s\"" -#: wrapper.c:634 +#: wrapper.c:610 msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" -#: wrapper.c:658 +#: wrapper.c:634 #, c-format msgid "could not write to %s" msgstr "kunde inte skriva till %s" -#: wrapper.c:660 +#: wrapper.c:636 #, c-format msgid "could not close %s" msgstr "kunde inte stänga %s" @@ -3834,11 +4098,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning) msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:199 wt-status.c:945 +#: wt-status.c:199 wt-status.c:958 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:217 wt-status.c:954 +#: wt-status.c:217 wt-status.c:967 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" @@ -3942,15 +4206,15 @@ msgstr "ändrat innehåll, " msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:818 +#: wt-status.c:831 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:820 +#: wt-status.c:833 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:901 +#: wt-status.c:914 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -3958,107 +4222,107 @@ msgstr "" "Rör inte raden ovan.\n" "Allt nedan kommer tas bort." -#: wt-status.c:1013 +#: wt-status.c:1026 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:1016 +#: wt-status.c:1029 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:1018 +#: wt-status.c:1031 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" -#: wt-status.c:1023 +#: wt-status.c:1036 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:1026 +#: wt-status.c:1039 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:1036 +#: wt-status.c:1049 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:1039 +#: wt-status.c:1052 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:1043 +#: wt-status.c:1056 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:1045 +#: wt-status.c:1058 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:1047 +#: wt-status.c:1060 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:1176 +#: wt-status.c:1189 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo saknas." -#: wt-status.c:1178 +#: wt-status.c:1191 msgid "No commands done." msgstr "Inga kommandon utförda." -#: wt-status.c:1181 +#: wt-status.c:1194 #, 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:1192 +#: wt-status.c:1205 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1197 +#: wt-status.c:1210 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: wt-status.c:1200 +#: wt-status.c:1213 #, 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:1208 +#: wt-status.c:1221 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:1221 +#: wt-status.c:1234 #, 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:1226 +#: wt-status.c:1239 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1240 +#: wt-status.c:1253 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1242 +#: wt-status.c:1255 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1244 +#: wt-status.c:1257 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:1250 +#: wt-status.c:1263 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1254 +#: wt-status.c:1267 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -4066,122 +4330,122 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1259 +#: wt-status.c:1272 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:1262 +#: wt-status.c:1275 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:1266 +#: wt-status.c:1279 #, 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:1271 +#: wt-status.c:1284 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:1274 +#: wt-status.c:1287 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:1276 +#: wt-status.c:1289 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:1286 +#: wt-status.c:1299 #, 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:1291 +#: wt-status.c:1304 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1294 +#: wt-status.c:1307 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1296 +#: wt-status.c:1309 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:1305 +#: wt-status.c:1318 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1310 +#: wt-status.c:1323 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1313 +#: wt-status.c:1326 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1315 +#: wt-status.c:1328 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1326 +#: wt-status.c:1339 #, 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:1330 +#: wt-status.c:1343 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1333 +#: wt-status.c:1346 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:1530 +#: wt-status.c:1543 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1536 +#: wt-status.c:1549 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå" -#: wt-status.c:1538 +#: wt-status.c:1551 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå" -#: wt-status.c:1543 +#: wt-status.c:1556 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1545 +#: wt-status.c:1558 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1548 +#: wt-status.c:1561 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1566 +#: wt-status.c:1579 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1580 +#: wt-status.c:1593 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1582 +#: wt-status.c:1595 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1586 +#: wt-status.c:1599 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4193,32 +4457,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1592 +#: wt-status.c:1605 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1594 +#: wt-status.c:1607 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1600 +#: wt-status.c:1613 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1605 +#: wt-status.c:1618 #, 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:1608 +#: wt-status.c:1621 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1611 +#: wt-status.c:1624 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -4227,67 +4491,63 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1614 +#: wt-status.c:1627 #, 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:1617 +#: wt-status.c:1630 #, 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:1620 wt-status.c:1625 +#: wt-status.c:1633 wt-status.c:1638 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1623 +#: wt-status.c:1636 #, 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:1627 +#: wt-status.c:1640 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1734 +#: wt-status.c:1749 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1738 +#: wt-status.c:1753 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1767 -msgid "gone" -msgstr "försvunnen" - -#: wt-status.c:1769 wt-status.c:1777 +#: wt-status.c:1782 wt-status.c:1790 msgid "behind " msgstr "efter " -#: wt-status.c:1772 wt-status.c:1775 +#: wt-status.c:1785 wt-status.c:1788 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2277 +#: wt-status.c:2280 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2283 +#: wt-status.c:2286 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2285 +#: wt-status.c:2288 #, 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:57 builtin/clone.c:414 +#: compat/precompose_utf8.c:57 builtin/clone.c:432 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -4314,7 +4574,7 @@ msgstr "ta bort \"%s\"\n" msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:209 builtin/rev-parse.c:845 +#: builtin/add.c:209 builtin/rev-parse.c:872 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" @@ -4349,9 +4609,9 @@ msgstr "Kunde inte tillämpa \"%s\"" 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:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123 +#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123 #: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 -#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162 +#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163 msgid "dry run" msgstr "testkörning" @@ -4359,7 +4619,7 @@ msgstr "testkörning" msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286 +#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286 msgid "select hunks interactively" msgstr "välj stycken interaktivt" @@ -4399,11 +4659,11 @@ msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:283 builtin/update-index.c:947 +#: builtin/add.c:283 builtin/update-index.c:951 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:283 builtin/update-index.c:948 +#: builtin/add.c:283 builtin/update-index.c:952 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" @@ -4439,115 +4699,115 @@ msgstr "Inget angivet, inget tillagt.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 -#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 +#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298 +#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350 #: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 #: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/am.c:414 +#: builtin/am.c:412 msgid "could not parse author script" msgstr "kunde inte tolka författarskript" -#: builtin/am.c:491 +#: builtin/am.c:489 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:532 +#: builtin/am.c:530 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:569 +#: builtin/am.c:567 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:595 +#: builtin/am.c:593 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:775 +#: builtin/am.c:777 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:840 +#: builtin/am.c:842 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: builtin/am.c:887 +#: builtin/am.c:889 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:890 builtin/am.c:898 +#: builtin/am.c:892 builtin/am.c:900 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:895 +#: builtin/am.c:897 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:984 +#: builtin/am.c:986 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:989 builtin/clone.c:379 +#: builtin/am.c:991 builtin/clone.c:397 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:993 +#: builtin/am.c:995 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1125 builtin/commit.c:376 +#: builtin/am.c:1127 builtin/commit.c:376 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1176 +#: builtin/am.c:1178 #, 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:1177 +#: builtin/am.c:1179 #, 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:1178 +#: builtin/am.c:1180 #, 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:1316 +#: builtin/am.c:1315 msgid "Patch is empty. Was it split wrong?" msgstr "Patchen är tom. Delades den upp felaktigt?" -#: builtin/am.c:1390 builtin/log.c:1550 +#: builtin/am.c:1386 builtin/log.c:1557 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/am.c:1417 +#: builtin/am.c:1413 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: builtin/am.c:1610 +#: builtin/am.c:1606 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:1612 +#: builtin/am.c:1608 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1631 +#: builtin/am.c:1627 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -4555,39 +4815,39 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1637 +#: builtin/am.c:1633 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1662 +#: builtin/am.c:1658 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1686 builtin/merge.c:632 +#: builtin/am.c:1682 builtin/merge.c:631 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/am.c:1693 +#: builtin/am.c:1689 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 +#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802 #: builtin/merge.c:827 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/am.c:1739 builtin/am.c:1743 +#: builtin/am.c:1735 builtin/am.c:1739 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1759 +#: builtin/am.c:1755 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:1764 +#: builtin/am.c:1760 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -4595,35 +4855,35 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1774 +#: builtin/am.c:1770 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:1824 +#: builtin/am.c:1820 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1861 builtin/am.c:1933 +#: builtin/am.c:1860 builtin/am.c:1932 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1877 +#: builtin/am.c:1876 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1885 +#: builtin/am.c:1884 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1891 +#: builtin/am.c:1890 #, 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:1936 +#: builtin/am.c:1935 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -4633,7 +4893,7 @@ msgstr "" "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:1943 +#: builtin/am.c:1942 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -4641,17 +4901,17 @@ msgstr "" "Du har fortfarande sökvägar som inte slagits samman i ditt index.\n" "Glömde du använda \"git add\"?" -#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 +#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"" -#: builtin/am.c:2103 +#: builtin/am.c:2102 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2137 +#: builtin/am.c:2136 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -4659,133 +4919,133 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2200 +#: builtin/am.c:2199 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2233 +#: builtin/am.c:2232 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2234 +#: builtin/am.c:2233 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2242 +#: builtin/am.c:2241 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2244 +#: builtin/am.c:2243 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 +#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57 #: builtin/repack.c:178 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2247 +#: builtin/am.c:2246 msgid "add a Signed-off-by line to the commit message" msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2252 +#: builtin/am.c:2251 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2254 +#: builtin/am.c:2253 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2258 +#: builtin/am.c:2257 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:2261 +#: builtin/am.c:2260 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:2264 +#: builtin/am.c:2263 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 -#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 -#: builtin/am.c:2293 +#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274 +#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286 +#: builtin/am.c:2292 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135 +#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 +#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135 #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 -#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355 +#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" -#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 -#: builtin/tag.c:387 builtin/verify-tag.c:38 +#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37 +#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2290 +#: builtin/am.c:2289 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2298 +#: builtin/am.c:2297 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2301 +#: builtin/am.c:2300 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2311 +#: builtin/am.c:2310 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370 +#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232 +#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2316 +#: builtin/am.c:2315 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2334 +#: builtin/am.c:2333 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." @@ -4793,16 +5053,16 @@ msgstr "" "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:2341 +#: builtin/am.c:2340 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2356 +#: builtin/am.c:2355 #, 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:2380 +#: builtin/am.c:2379 #, c-format msgid "" "Stray %s directory found.\n" @@ -4811,7 +5071,7 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2386 +#: builtin/am.c:2385 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." @@ -4841,11 +5101,6 @@ msgstr "git archive: förväntade ACK/NAK, fick EOF" msgid "git archive: NACK %s" msgstr "git archive: NACK %s" -#: builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "fjärrfel: %s" - #: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "git archive: protokollfel" @@ -4874,111 +5129,111 @@ msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" -#: builtin/blame.c:1786 +#: builtin/blame.c:1777 msgid "Blaming lines" msgstr "Klandra rader" -#: builtin/blame.c:2582 +#: builtin/blame.c:2573 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:2583 +#: builtin/blame.c:2574 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:2584 +#: builtin/blame.c:2575 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:2585 +#: builtin/blame.c:2576 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:2586 +#: builtin/blame.c:2577 msgid "Force progress reporting" msgstr "Tvinga förloppsrapportering" -#: builtin/blame.c:2587 +#: builtin/blame.c:2578 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:2588 +#: builtin/blame.c:2579 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:2589 +#: builtin/blame.c:2580 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:2590 +#: builtin/blame.c:2581 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:2591 +#: builtin/blame.c:2582 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:2592 +#: builtin/blame.c:2583 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:2593 +#: builtin/blame.c:2584 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:2594 +#: builtin/blame.c:2585 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:2595 +#: builtin/blame.c:2586 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:2596 +#: builtin/blame.c:2587 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:2597 +#: builtin/blame.c:2588 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:2604 +#: builtin/blame.c:2595 msgid "Use an experimental heuristic to improve diffs" msgstr "Använd en experimentell algoritm för att förbättra diffar" -#: builtin/blame.c:2606 +#: builtin/blame.c:2597 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:2607 +#: builtin/blame.c:2598 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:2608 +#: builtin/blame.c:2599 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:2609 builtin/blame.c:2610 +#: builtin/blame.c:2600 builtin/blame.c:2601 msgid "score" msgstr "poäng" -#: builtin/blame.c:2609 +#: builtin/blame.c:2600 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:2610 +#: builtin/blame.c:2601 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:2611 +#: builtin/blame.c:2602 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2611 +#: builtin/blame.c:2602 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" -#: builtin/blame.c:2658 +#: builtin/blame.c:2649 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress kan inte användas med --incremental eller porslinsformat" @@ -4988,42 +5243,42 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2706 +#: builtin/blame.c:2697 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" -#: builtin/blame.c:2786 +#: builtin/blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "--contents och --reverse fungerar inte så bra tillsammans." -#: builtin/blame.c:2806 +#: builtin/blame.c:2797 msgid "cannot use --contents with final commit object name" msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt" -#: builtin/blame.c:2811 +#: builtin/blame.c:2802 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: builtin/blame.c:2838 +#: builtin/blame.c:2829 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" -#: builtin/blame.c:2849 +#: builtin/blame.c:2840 #, c-format msgid "no such path %s in %s" msgstr "sökvägen %s i %s finns inte" -#: builtin/blame.c:2860 +#: builtin/blame.c:2851 #, c-format msgid "cannot read blob %s for path %s" msgstr "kan inte läsa objektet %s för sökvägen %s" -#: builtin/blame.c:2879 +#: builtin/blame.c:2870 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" @@ -5050,7 +5305,11 @@ msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>" msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<flaggor>] [-r | -a] [--points-at]" -#: builtin/branch.c:143 +#: builtin/branch.c:31 +msgid "git branch [<options>] [-r | -a] [--format]" +msgstr "git branch [<flaggor>] [-r | -a] [--format]" + +#: builtin/branch.c:144 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -5059,7 +5318,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:147 +#: builtin/branch.c:148 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -5068,12 +5327,12 @@ msgstr "" "tar inte bort grenen \"%s\" som inte har slagits ihop med\n" " \"%s\", trots att den har slagits ihop med HEAD." -#: builtin/branch.c:161 +#: builtin/branch.c:162 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" -#: builtin/branch.c:165 +#: builtin/branch.c:166 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -5082,164 +5341,92 @@ msgstr "" "Grenen \"%s\" har inte slagits samman i sin helhet.\n" "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"." -#: builtin/branch.c:178 +#: builtin/branch.c:179 msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" -#: builtin/branch.c:206 +#: builtin/branch.c:210 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:212 +#: builtin/branch.c:216 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:226 +#: builtin/branch.c:230 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\"" -#: builtin/branch.c:241 +#: builtin/branch.c:245 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "fjärrspårande grenen \"%s\" hittades inte." -#: builtin/branch.c:242 +#: builtin/branch.c:246 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:257 +#: builtin/branch.c:261 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\"" -#: builtin/branch.c:258 +#: builtin/branch.c:262 #, c-format msgid "Error deleting branch '%s'" msgstr "Fel vid borttagning av grenen \"%s\"" -#: builtin/branch.c:265 +#: builtin/branch.c:269 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" -#: builtin/branch.c:266 +#: builtin/branch.c:270 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:312 -#, c-format -msgid "[%s: gone]" -msgstr "[%s: försvunnen]" - -#: builtin/branch.c:317 -#, c-format -msgid "[%s]" -msgstr "[%s]" - -#: builtin/branch.c:322 -#, c-format -msgid "[%s: behind %d]" -msgstr "[%s: bakom %d] " - -#: builtin/branch.c:324 -#, c-format -msgid "[behind %d]" -msgstr "[bakom %d] " - -#: builtin/branch.c:328 -#, c-format -msgid "[%s: ahead %d]" -msgstr "[%s: före %d] " - -#: builtin/branch.c:330 -#, c-format -msgid "[ahead %d]" -msgstr "[före %d] " - -#: builtin/branch.c:333 -#, c-format -msgid "[%s: ahead %d, behind %d]" -msgstr "[%s: före %d, bakom %d] " - -#: builtin/branch.c:336 -#, c-format -msgid "[ahead %d, behind %d]" -msgstr "[före %d, bakom %d] " - -#: builtin/branch.c:349 -msgid " **** invalid ref ****" -msgstr " **** ogiltig ref ****" - -#: builtin/branch.c:375 -#, c-format -msgid "(no branch, rebasing %s)" -msgstr "(ingen gren, ombaserar %s)" - -#: builtin/branch.c:378 -#, c-format -msgid "(no branch, bisect started on %s)" -msgstr "(ingen gren, \"bisect\" startad på %s)" - -#. TRANSLATORS: make sure this matches -#. "HEAD detached at " in wt-status.c -#: builtin/branch.c:384 -#, c-format -msgid "(HEAD detached at %s)" -msgstr "(HEAD frånkopplat vid %s)" - -#. TRANSLATORS: make sure this matches -#. "HEAD detached from " in wt-status.c -#: builtin/branch.c:389 -#, c-format -msgid "(HEAD detached from %s)" -msgstr "(HEAD frånkopplat från %s)" - -#: builtin/branch.c:393 -msgid "(no branch)" -msgstr "(ingen gren)" - -#: builtin/branch.c:535 +#: builtin/branch.c:441 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Grenen %s ombaseras på %s" -#: builtin/branch.c:539 +#: builtin/branch.c:445 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:554 +#: builtin/branch.c:460 msgid "cannot rename the current branch while not on any." msgstr "" "kunde inte byta namn på aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:564 +#: builtin/branch.c:470 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:581 +#: builtin/branch.c:487 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:585 +#: builtin/branch.c:490 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:588 +#: builtin/branch.c:493 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!" -#: builtin/branch.c:595 +#: builtin/branch.c:502 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:611 +#: builtin/branch.c:518 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5250,208 +5437,217 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:643 +#: builtin/branch.c:551 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:645 +#: builtin/branch.c:553 msgid "show hash and subject, give twice for upstream branch" msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren" -#: builtin/branch.c:646 +#: builtin/branch.c:554 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:647 +#: builtin/branch.c:555 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:649 +#: builtin/branch.c:557 msgid "change upstream info" msgstr "ändra uppströmsinformation" -#: builtin/branch.c:651 +#: builtin/branch.c:559 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:651 +#: builtin/branch.c:559 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:652 +#: builtin/branch.c:560 msgid "Unset the upstream info" msgstr "ta bort uppströmsinformationen" -#: builtin/branch.c:653 +#: builtin/branch.c:561 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:654 +#: builtin/branch.c:562 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:656 builtin/branch.c:657 +#: builtin/branch.c:564 builtin/branch.c:566 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:660 +#: builtin/branch.c:565 builtin/branch.c:567 +msgid "print only branches that don't contain the commit" +msgstr "visa endast grenar som inte innehåller incheckningen" + +#: builtin/branch.c:570 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:661 +#: builtin/branch.c:571 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:663 +#: builtin/branch.c:573 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:664 +#: builtin/branch.c:574 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:665 +#: builtin/branch.c:575 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:666 +#: builtin/branch.c:576 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:667 +#: builtin/branch.c:577 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:668 +#: builtin/branch.c:578 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:670 +#: builtin/branch.c:580 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:671 +#: builtin/branch.c:581 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:672 +#: builtin/branch.c:582 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:673 +#: builtin/branch.c:583 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:674 +#: builtin/branch.c:584 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381 +#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426 msgid "key" msgstr "nyckel" -#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382 +#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427 msgid "field name to sort on" msgstr "fältnamn att sortera på" -#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404 +#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:384 +#: builtin/tag.c:429 msgid "object" msgstr "objekt" -#: builtin/branch.c:679 +#: builtin/branch.c:589 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388 +#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434 msgid "sorting and filtering are case insensitive" msgstr "sortering och filtrering skiljer gemener och VERSALER" -#: builtin/branch.c:698 +#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433 +#: builtin/verify-tag.c:38 +msgid "format to use for the output" +msgstr "format att använda för utdata" + +#: builtin/branch.c:611 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:702 builtin/clone.c:706 +#: builtin/branch.c:615 builtin/clone.c:724 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:724 +#: builtin/branch.c:638 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:735 builtin/branch.c:787 +#: builtin/branch.c:649 builtin/branch.c:701 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:763 +#: builtin/branch.c:677 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:768 +#: builtin/branch.c:682 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:775 +#: builtin/branch.c:689 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu" -#: builtin/branch.c:778 +#: builtin/branch.c:692 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:793 +#: builtin/branch.c:707 msgid "too many branches for a rename operation" msgstr "för många grenar för namnbyte" -#: builtin/branch.c:798 +#: builtin/branch.c:712 msgid "too many branches to set new upstream" msgstr "för många grenar för att byta uppström" -#: builtin/branch.c:802 +#: builtin/branch.c:716 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren." -#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848 +#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:809 +#: builtin/branch.c:723 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:821 +#: builtin/branch.c:735 msgid "too many branches to unset upstream" msgstr "för många grenar för att ta bort uppström" -#: builtin/branch.c:825 +#: builtin/branch.c:739 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren." -#: builtin/branch.c:831 +#: builtin/branch.c:745 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:845 +#: builtin/branch.c:759 msgid "it does not make sense to create 'HEAD' manually" msgstr "kan inte skapa \"HEAD\" manuellt" -#: builtin/branch.c:851 +#: builtin/branch.c:765 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett " "grennamn" -#: builtin/branch.c:854 +#: builtin/branch.c:768 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -5460,7 +5656,7 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to\n" -#: builtin/branch.c:871 +#: builtin/branch.c:785 #, c-format msgid "" "\n" @@ -5471,16 +5667,16 @@ msgstr "" "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" "\n" -#: builtin/bundle.c:51 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "%s är okej\n" -#: builtin/bundle.c:64 +#: builtin/bundle.c:58 msgid "Need a repository to create a bundle." msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." -#: builtin/bundle.c:68 +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." @@ -5528,7 +5724,7 @@ msgstr "för blob-objekt, kör filter på objektets innehåll" 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:561 git-submodule.sh:929 +#: builtin/cat-file.c:561 git-submodule.sh:943 msgid "blob" msgstr "blob" @@ -5585,7 +5781,7 @@ 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:18 builtin/checkout.c:1140 builtin/gc.c:332 +#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -5675,9 +5871,9 @@ msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600 -#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967 -#: builtin/worktree.c:471 +#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 +#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 +#: builtin/worktree.c:477 msgid "string" msgstr "sträng" @@ -5689,113 +5885,113 @@ msgstr "när filer skapas, lägg till <sträng> först" msgid "copy out the files from named stage" msgstr "kopiera ut filer från namngiven etapp" -#: builtin/checkout.c:25 +#: builtin/checkout.c:27 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<flaggor>] <gren>" -#: builtin/checkout.c:26 +#: builtin/checkout.c:28 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..." -#: builtin/checkout.c:134 builtin/checkout.c:167 +#: builtin/checkout.c:153 builtin/checkout.c:186 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:136 builtin/checkout.c:169 +#: builtin/checkout.c:155 builtin/checkout.c:188 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:152 +#: builtin/checkout.c:171 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner" -#: builtin/checkout.c:196 +#: builtin/checkout.c:215 #, c-format msgid "path '%s' does not have necessary versions" msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" -#: builtin/checkout.c:213 +#: builtin/checkout.c:232 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:230 +#: builtin/checkout.c:249 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 -#: builtin/checkout.c:259 +#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275 +#: builtin/checkout.c:278 #, 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:262 builtin/checkout.c:265 +#: builtin/checkout.c:281 builtin/checkout.c:284 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:268 +#: builtin/checkout.c:287 #, 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:339 builtin/checkout.c:346 +#: builtin/checkout.c:358 builtin/checkout.c:365 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:494 +#: builtin/checkout.c:513 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:625 +#: builtin/checkout.c:644 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:666 +#: builtin/checkout.c:685 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:670 builtin/clone.c:660 +#: builtin/checkout.c:689 builtin/clone.c:678 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:674 +#: builtin/checkout.c:693 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:677 +#: builtin/checkout.c:696 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:681 +#: builtin/checkout.c:700 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:683 builtin/checkout.c:1072 +#: builtin/checkout.c:702 builtin/checkout.c:1090 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:685 +#: builtin/checkout.c:704 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:736 +#: builtin/checkout.c:755 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:742 +#: builtin/checkout.c:761 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5818,7 +6014,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:761 +#: builtin/checkout.c:780 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5845,151 +6041,151 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:797 +#: builtin/checkout.c:816 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:801 +#: builtin/checkout.c:820 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:828 builtin/checkout.c:1067 +#: builtin/checkout.c:847 builtin/checkout.c:1085 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:973 +#: builtin/checkout.c:991 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1013 builtin/worktree.c:214 +#: builtin/checkout.c:1031 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1042 +#: builtin/checkout.c:1060 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1099 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1084 builtin/checkout.c:1088 +#: builtin/checkout.c:1102 builtin/checkout.c:1106 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100 -#: builtin/checkout.c:1103 +#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118 +#: builtin/checkout.c:1121 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1126 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 -#: builtin/worktree.c:326 +#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329 +#: builtin/worktree.c:331 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1160 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1162 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1163 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1146 builtin/worktree.c:328 +#: builtin/checkout.c:1164 builtin/worktree.c:333 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1165 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1167 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1167 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1168 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1170 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1172 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1173 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:1156 builtin/merge.c:235 +#: builtin/checkout.c:1174 builtin/merge.c:234 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251 +#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251 msgid "style" msgstr "stil" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1176 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1179 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1181 msgid "second guess 'git checkout <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1183 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:1166 builtin/clone.c:63 builtin/fetch.c:119 -#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539 -#: builtin/send-pack.c:168 +#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119 +#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539 +#: builtin/send-pack.c:172 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1224 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1214 +#: builtin/checkout.c:1241 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1219 +#: builtin/checkout.c:1246 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1255 +#: builtin/checkout.c:1282 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1262 +#: builtin/checkout.c:1289 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -5998,12 +6194,12 @@ msgstr "" "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n" "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1294 #, 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:1271 +#: builtin/checkout.c:1298 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6043,7 +6239,7 @@ msgstr "Skulle hoppa över arkivet %s\n" msgid "failed to remove %s" msgstr "misslyckades ta bort %s" -#: builtin/clean.c:291 git-add--interactive.perl:623 +#: builtin/clean.c:297 git-add--interactive.perl:614 #, c-format msgid "" "Prompt help:\n" @@ -6056,7 +6252,7 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" " - (tomt) markera ingenting\n" -#: builtin/clean.c:295 git-add--interactive.perl:632 +#: builtin/clean.c:301 git-add--interactive.perl:623 #, c-format msgid "" "Prompt help:\n" @@ -6077,38 +6273,38 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering\n" -#: builtin/clean.c:511 git-add--interactive.perl:598 -#: git-add--interactive.perl:603 +#: builtin/clean.c:517 git-add--interactive.perl:589 +#: git-add--interactive.perl:594 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Vadå (%s)?\n" -#: builtin/clean.c:653 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "Ange ignoreringsmönster>>" -#: builtin/clean.c:690 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "VARNING: Hittar inte poster som motsvarar: %s" -#: builtin/clean.c:711 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Välj poster att ta bort" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:752 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]?" -#: builtin/clean.c:777 git-add--interactive.perl:1669 +#: builtin/clean.c:783 git-add--interactive.perl:1660 #, c-format msgid "Bye.\n" msgstr "Hej då.\n" -#: builtin/clean.c:785 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6126,62 +6322,63 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:812 git-add--interactive.perl:1745 +#: builtin/clean.c:818 git-add--interactive.perl:1736 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: builtin/clean.c:813 git-add--interactive.perl:1742 +#: builtin/clean.c:819 git-add--interactive.perl:1733 msgid "What now" msgstr "Vad nu" -#: builtin/clean.c:821 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Skulle ta bort följande post:" msgstr[1] "Skulle ta bort följande poster:" -#: builtin/clean.c:838 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "Inga fler filer att städa, avslutar." -#: builtin/clean.c:869 +#: builtin/clean.c:875 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:871 +#: builtin/clean.c:877 msgid "force" msgstr "tvinga" -#: builtin/clean.c:872 +#: builtin/clean.c:878 msgid "interactive cleaning" msgstr "städa interaktivt" -#: builtin/clean.c:874 +#: builtin/clean.c:880 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056 -#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176 +#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451 +#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348 +#: builtin/name-rev.c:350 builtin/show-ref.c:176 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:876 +#: builtin/clean.c:882 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:877 +#: builtin/clean.c:883 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:879 +#: builtin/clean.c:885 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:897 +#: builtin/clean.c:903 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:901 +#: builtin/clean.c:907 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -6189,7 +6386,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:904 +#: builtin/clean.c:910 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6201,130 +6398,134 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:65 +#: builtin/clone.c:80 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478 +#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:70 +#: builtin/clone.c:85 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:72 +#: builtin/clone.c:87 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:74 +#: builtin/clone.c:89 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:76 +#: builtin/clone.c:91 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:78 builtin/clone.c:80 +#: builtin/clone.c:93 builtin/clone.c:97 +msgid "pathspec" +msgstr "sökvägsangivelse" + +#: builtin/clone.c:93 builtin/clone.c:97 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:82 +#: builtin/clone.c:100 msgid "number of submodules cloned in parallel" msgstr "antal undermoduler som klonas parallellt" -#: builtin/clone.c:83 builtin/init-db.c:475 +#: builtin/clone.c:101 builtin/init-db.c:475 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:84 builtin/init-db.c:476 +#: builtin/clone.c:102 builtin/init-db.c:476 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604 -#: builtin/submodule--helper.c:970 +#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642 +#: builtin/submodule--helper.c:983 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:90 +#: builtin/clone.c:108 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" -#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43 msgid "name" msgstr "namn" -#: builtin/clone.c:92 +#: builtin/clone.c:110 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:94 +#: builtin/clone.c:112 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:96 +#: builtin/clone.c:114 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 +#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006 #: builtin/pull.c:202 msgid "depth" msgstr "djup" -#: builtin/clone.c:98 +#: builtin/clone.c:116 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836 +#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918 #: parse-options.h:142 msgid "time" msgstr "tid" -#: builtin/clone.c:100 +#: builtin/clone.c:118 msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:101 builtin/fetch.c:124 +#: builtin/clone.c:119 builtin/fetch.c:124 msgid "revision" msgstr "revision" -#: builtin/clone.c:102 builtin/fetch.c:125 +#: builtin/clone.c:120 builtin/fetch.c:125 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" -#: builtin/clone.c:104 +#: builtin/clone.c:122 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:106 +#: builtin/clone.c:124 msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" -#: builtin/clone.c:107 builtin/init-db.c:484 +#: builtin/clone.c:125 builtin/init-db.c:484 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:108 builtin/init-db.c:485 +#: builtin/clone.c:126 builtin/init-db.c:485 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:109 +#: builtin/clone.c:127 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:110 +#: builtin/clone.c:128 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550 +#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552 +#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" -#: builtin/clone.c:250 +#: builtin/clone.c:268 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -6332,42 +6533,42 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog på kommandoraden" -#: builtin/clone.c:303 +#: builtin/clone.c:321 #, 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:375 +#: builtin/clone.c:393 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: builtin/clone.c:383 +#: builtin/clone.c:401 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:397 +#: builtin/clone.c:415 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:419 +#: builtin/clone.c:437 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:423 +#: builtin/clone.c:441 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:448 +#: builtin/clone.c:466 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:460 +#: builtin/clone.c:478 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -6377,139 +6578,138 @@ msgstr "" "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:537 +#: builtin/clone.c:555 #, 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:632 +#: builtin/clone.c:650 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: builtin/clone.c:648 +#: builtin/clone.c:666 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:697 +#: builtin/clone.c:715 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:728 +#: builtin/clone.c:746 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:768 +#: builtin/clone.c:786 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:831 +#: builtin/clone.c:849 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:833 +#: builtin/clone.c:851 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:866 builtin/receive-pack.c:1895 +#: builtin/clone.c:884 builtin/receive-pack.c:1900 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:870 +#: builtin/clone.c:888 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:883 +#: builtin/clone.c:901 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:886 +#: builtin/clone.c:904 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:899 +#: builtin/clone.c:917 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:905 builtin/fetch.c:1335 +#: builtin/clone.c:923 builtin/fetch.c:1337 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:915 +#: builtin/clone.c:933 #, 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:925 +#: builtin/clone.c:943 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252 -#: builtin/submodule--helper.c:659 builtin/worktree.c:222 -#: builtin/worktree.c:249 +#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252 +#: builtin/worktree.c:221 builtin/worktree.c:251 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:943 +#: builtin/clone.c:961 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:955 +#: builtin/clone.c:973 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:957 +#: builtin/clone.c:975 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:963 +#: builtin/clone.c:999 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:1019 +#: builtin/clone.c:1055 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:1021 +#: builtin/clone.c:1057 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:1023 +#: builtin/clone.c:1059 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:1026 +#: builtin/clone.c:1062 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1031 +#: builtin/clone.c:1067 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1035 +#: builtin/clone.c:1071 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:1090 builtin/clone.c:1098 +#: builtin/clone.c:1126 builtin/clone.c:1134 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1101 +#: builtin/clone.c:1137 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -6703,11 +6903,6 @@ msgstr "incheckningen \"%s\" har felformaterat författarhuvud" msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:611 -#, c-format -msgid "invalid date format: %s" -msgstr "felaktigt datumformat: %s" - #: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" @@ -6721,7 +6916,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:704 builtin/shortlog.c:295 +#: builtin/commit.c:704 builtin/shortlog.c:294 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" @@ -6821,7 +7016,7 @@ msgstr "Kan inte läsa indexet" msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:968 builtin/tag.c:280 +#: builtin/commit.c:968 builtin/tag.c:273 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" @@ -6886,7 +7081,7 @@ msgstr "Du måste ange sökvägar tillsammans med --include/--only." msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..." -#: builtin/commit.c:1224 builtin/tag.c:495 +#: builtin/commit.c:1224 builtin/tag.c:551 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" @@ -6908,7 +7103,7 @@ msgid "version" msgstr "version" #: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 -#: builtin/worktree.c:442 +#: builtin/worktree.c:448 msgid "machine-readable output" msgstr "maskinläsbar utdata" @@ -6921,7 +7116,7 @@ msgid "terminate entries with NUL" msgstr "terminera poster med NUL" #: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:368 +#: builtin/fast-export.c:984 builtin/tag.c:411 msgid "mode" msgstr "läge" @@ -6977,7 +7172,7 @@ msgstr "visa diff i mallen för incheckningsmeddelandet" msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1586 builtin/tag.c:366 +#: builtin/commit.c:1586 builtin/tag.c:409 msgid "read message from file" msgstr "läs meddelande från fil" @@ -6989,7 +7184,7 @@ msgstr "författare" msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1588 builtin/gc.c:333 +#: builtin/commit.c:1588 builtin/gc.c:357 msgid "date" msgstr "datum" @@ -6997,8 +7192,8 @@ msgstr "datum" msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:364 +#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398 +#: builtin/notes.c:561 builtin/tag.c:407 msgid "message" msgstr "meddelande" @@ -7007,7 +7202,7 @@ msgid "commit message" msgstr "incheckningsmeddelande" #: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 -#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81 +#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77 msgid "commit" msgstr "incheckning" @@ -7034,7 +7229,7 @@ msgstr "" 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:1595 builtin/log.c:1413 builtin/revert.c:86 +#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" @@ -7050,7 +7245,7 @@ msgstr "tvinga redigering av incheckning" msgid "default" msgstr "standard" -#: builtin/commit.c:1598 builtin/tag.c:369 +#: builtin/commit.c:1598 builtin/tag.c:412 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" @@ -7058,8 +7253,8 @@ msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166 -#: builtin/revert.c:93 +#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166 +#: builtin/revert.c:112 msgid "GPG sign commit" msgstr "GPG-signera incheckning" @@ -7154,139 +7349,139 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<flaggor>]" -#: builtin/config.c:55 +#: builtin/config.c:56 msgid "Config file location" msgstr "Konfigurationsfilens plats" -#: builtin/config.c:56 +#: builtin/config.c:57 msgid "use global config file" msgstr "använd global konfigurationsfil" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "use system config file" msgstr "använd systemets konfigurationsfil" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use repository config file" msgstr "använd arkivets konfigurationsfil" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use given config file" msgstr "använd angiven konfigurationsfil" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "read config from given blob object" msgstr "läs konfiguration från givet blob-objekt" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "Action" msgstr "Åtgärd" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "get value: name [value-regex]" msgstr "hämta värde: namn [värde-reguttr]" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "get all values: key [value-regex]" msgstr "hämta alla värden: nyckel [värde-reguttr]" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get values for regexp: name-regex [value-regex]" msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get value specific for the URL: section[.var] URL" msgstr "hämta värde specifikt URL:en: sektion[.var] URL" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "replace all matching variables: name value [value_regex]" msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "add a new variable: name value" msgstr "lägg till en ny variabel: namn värde" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "remove a variable: name [value-regex]" msgstr "ta bort en variabel: namn [värde-reguttr]" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "remove all matches: name [value-regex]" msgstr "ta bort alla träffar: namn [värde-reguttr]" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "rename section: old-name new-name" msgstr "byt namn på sektion: gammalt-namn nytt-namn" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "remove a section: name" msgstr "ta bort en sektion: namn" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "list all" msgstr "visa alla" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "open an editor" msgstr "öppna textredigeringsprogram" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "find the color configured: slot [default]" msgstr "hitta den inställda färgen: slot [default]" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "find the color setting: slot [stdout-is-tty]" msgstr "hitta färginställningen: slot [stdout-is-tty]" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "Type" msgstr "Typ" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "value is \"true\" or \"false\"" msgstr "värdet är \"true\" eller \"false\"" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "value is decimal number" msgstr "värdet är ett decimalt tal" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is --bool or --int" msgstr "värdet är --bool eller --int" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is a path (file or directory name)" msgstr "värdet är en sökväg (fil- eller katalognamn)" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "Other" msgstr "Andra" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "terminate values with NUL byte" msgstr "terminera värden med NUL-byte" -#: builtin/config.c:83 +#: builtin/config.c:84 msgid "show variable names only" msgstr "visa endast variabelnamn" -#: builtin/config.c:84 +#: builtin/config.c:85 msgid "respect include directives on lookup" msgstr "respektera inkluderingsdirektiv vid uppslag" -#: builtin/config.c:85 +#: builtin/config.c:86 msgid "show origin of config (file, standard input, blob, command line)" msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)" -#: builtin/config.c:327 +#: builtin/config.c:328 msgid "unable to parse default color value" msgstr "kan inte tolka standardfärgvärde" -#: builtin/config.c:471 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7301,12 +7496,12 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:613 +#: builtin/config.c:615 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" -#: builtin/config.c:625 +#: builtin/config.c:627 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7323,55 +7518,67 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" -#: builtin/describe.c:17 +#: builtin/describe.c:18 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<flaggor>] [<incheckning-igt>...]" -#: builtin/describe.c:18 +#: builtin/describe.c:19 msgid "git describe [<options>] --dirty" msgstr "git describe [<flaggor>] --dirty" -#: builtin/describe.c:217 +#: builtin/describe.c:53 +msgid "head" +msgstr "huvud" + +#: builtin/describe.c:53 +msgid "lightweight" +msgstr "lättviktig" + +#: builtin/describe.c:53 +msgid "annotated" +msgstr "annoterad" + +#: builtin/describe.c:250 #, c-format msgid "annotated tag %s not available" msgstr "den annoterade taggen %s inte tillgänglig" -#: builtin/describe.c:221 +#: builtin/describe.c:254 #, c-format msgid "annotated tag %s has no embedded name" msgstr "den annoterade taggen %s har inget inbäddat namn" -#: builtin/describe.c:223 +#: builtin/describe.c:256 #, c-format msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" är i verkligheten \"%s\" här" -#: builtin/describe.c:250 builtin/log.c:480 +#: builtin/describe.c:283 builtin/log.c:487 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" -#: builtin/describe.c:253 +#: builtin/describe.c:286 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: builtin/describe.c:270 +#: builtin/describe.c:303 #, c-format msgid "no tag exactly matches '%s'" msgstr "ingen tagg motsvarar \"%s\" exakt" -#: builtin/describe.c:272 +#: builtin/describe.c:305 #, c-format msgid "searching to describe %s\n" msgstr "söker för att beskriva %s\n" -#: builtin/describe.c:319 +#: builtin/describe.c:352 #, c-format msgid "finished search at %s\n" msgstr "avslutade sökning på %s\n" -#: builtin/describe.c:346 +#: builtin/describe.c:379 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -7380,7 +7587,7 @@ msgstr "" "Inga annoterade taggar kan beskriva \"%s\".\n" "Det finns dock oannoterade taggar: testa --tags." -#: builtin/describe.c:350 +#: builtin/describe.c:383 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -7389,12 +7596,12 @@ msgstr "" "Inga taggar kan beskriva \"%s\".\n" "Testa --always, eller skapa några taggar." -#: builtin/describe.c:371 +#: builtin/describe.c:413 #, c-format msgid "traversed %lu commits\n" msgstr "traverserade %lu incheckningar\n" -#: builtin/describe.c:374 +#: builtin/describe.c:416 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -7403,66 +7610,78 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" -#: builtin/describe.c:396 +#: builtin/describe.c:438 msgid "find the tag that comes after the commit" msgstr "hitta taggen som kommer efter incheckningen" -#: builtin/describe.c:397 +#: builtin/describe.c:439 msgid "debug search strategy on stderr" msgstr "felsök sökstrategin på standard fel" -#: builtin/describe.c:398 +#: builtin/describe.c:440 msgid "use any ref" msgstr "använd alla referenser" -#: builtin/describe.c:399 +#: builtin/describe.c:441 msgid "use any tag, even unannotated" msgstr "använd alla taggar, även oannoterade" -#: builtin/describe.c:400 +#: builtin/describe.c:442 msgid "always use long format" msgstr "använd alltid långt format" -#: builtin/describe.c:401 +#: builtin/describe.c:443 msgid "only follow first parent" msgstr "följ endast första föräldern" -#: builtin/describe.c:404 +#: builtin/describe.c:446 msgid "only output exact matches" msgstr "skriv endast ut exakta träffar" -#: builtin/describe.c:406 +#: builtin/describe.c:448 msgid "consider <n> most recent tags (default: 10)" msgstr "överväg de <n> nyaste taggarna (standard: 10)" -#: builtin/describe.c:408 +#: builtin/describe.c:450 msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: builtin/describe.c:410 builtin/name-rev.c:320 +#: builtin/describe.c:452 +msgid "do not consider tags matching <pattern>" +msgstr "överväg inte taggar som motsvarar <mönster>" + +#: builtin/describe.c:454 builtin/name-rev.c:357 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" -#: builtin/describe.c:411 +#: builtin/describe.c:455 builtin/describe.c:458 msgid "mark" msgstr "märke" -#: builtin/describe.c:412 +#: builtin/describe.c:456 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")" -#: builtin/describe.c:430 +#: builtin/describe.c:459 +msgid "append <mark> on broken working tree (default: \"-broken\")" +msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")" + +#: builtin/describe.c:477 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" -#: builtin/describe.c:456 +#: builtin/describe.c:506 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." -#: builtin/describe.c:476 +#: builtin/describe.c:549 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" +#: builtin/describe.c:551 +msgid "--broken is incompatible with commit-ishes" +msgstr "--broken är inkompatibelt med \"commit-ish\"-värden" + #: builtin/diff.c:83 #, c-format msgid "'%s': not a regular file or symlink" @@ -7502,7 +7721,22 @@ msgstr "" msgid "failed: %d" msgstr "misslyckades: %d" -#: builtin/difftool.c:342 +#: builtin/difftool.c:283 +#, c-format +msgid "could not read symlink %s" +msgstr "kunde inte läsa symboliska länken %s" + +#: builtin/difftool.c:285 +#, c-format +msgid "could not read symlink file %s" +msgstr "kunde inte läsa symbolisk länk-fil %s" + +#: builtin/difftool.c:293 +#, c-format +msgid "could not read object %s for symlink %s" +msgstr "kunde inte läsa objektet %s för symboliska länken %s" + +#: builtin/difftool.c:395 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -7510,53 +7744,53 @@ msgstr "" "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n" "katalogdiffläge (\"-d\" och \"--dir-diff\")." -#: builtin/difftool.c:567 +#: builtin/difftool.c:609 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "bägge filerna ändrade: \"%s\" och \"%s\"." -#: builtin/difftool.c:569 +#: builtin/difftool.c:611 msgid "working tree file has been left." msgstr "filen i arbetskatalogen lämnades kvar." -#: builtin/difftool.c:580 +#: builtin/difftool.c:622 #, c-format msgid "temporary files exist in '%s'." msgstr "temporära filer finns i \"%s\"." -#: builtin/difftool.c:581 +#: builtin/difftool.c:623 msgid "you may want to cleanup or recover these." msgstr "du kanske vill städa eller rädda dem." -#: builtin/difftool.c:626 +#: builtin/difftool.c:669 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "använd \"diff.guitool\" istället för \"diff.tool\"" -#: builtin/difftool.c:628 +#: builtin/difftool.c:671 msgid "perform a full-directory diff" msgstr "utför diff för hela katalogen" -#: builtin/difftool.c:630 +#: builtin/difftool.c:673 msgid "do not prompt before launching a diff tool" msgstr "fråga inte vid start av diff-verktyg" -#: builtin/difftool.c:636 +#: builtin/difftool.c:679 msgid "use symlinks in dir-diff mode" msgstr "använd symboliska länkar i katalogdiffläge" -#: builtin/difftool.c:637 +#: builtin/difftool.c:680 msgid "<tool>" msgstr "<verktyg>" -#: builtin/difftool.c:638 +#: builtin/difftool.c:681 msgid "use the specified diff tool" msgstr "använd angivet diff-verktyg" -#: builtin/difftool.c:640 +#: builtin/difftool.c:683 msgid "print a list of diff tools that may be used with `--tool`" msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\"" -#: builtin/difftool.c:643 +#: builtin/difftool.c:686 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -7564,19 +7798,19 @@ msgstr "" "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " "skilt från noll" -#: builtin/difftool.c:645 +#: builtin/difftool.c:688 msgid "<command>" msgstr "<kommando>" -#: builtin/difftool.c:646 +#: builtin/difftool.c:689 msgid "specify a custom command for viewing diffs" msgstr "ange eget kommando för att visa diffar" -#: builtin/difftool.c:670 +#: builtin/difftool.c:713 msgid "no <tool> given for --tool=<tool>" msgstr "inget <verktyg> angavs för --tool=<verktyg>" -#: builtin/difftool.c:677 +#: builtin/difftool.c:720 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" @@ -7712,7 +7946,7 @@ msgstr "fördjupa historik för grund klon baserad på tid" msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:131 builtin/log.c:1433 +#: builtin/fetch.c:131 builtin/log.c:1440 msgid "dir" msgstr "kat" @@ -7740,73 +7974,73 @@ msgstr "ange referenskarta för \"fetch\"" msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:511 +#: builtin/fetch.c:513 #, 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:604 +#: builtin/fetch.c:606 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:608 +#: builtin/fetch.c:610 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:621 builtin/fetch.c:701 +#: builtin/fetch.c:623 builtin/fetch.c:703 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:622 +#: builtin/fetch.c:624 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:631 +#: builtin/fetch.c:633 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681 -#: builtin/fetch.c:696 +#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683 +#: builtin/fetch.c:698 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:651 +#: builtin/fetch.c:653 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:654 +#: builtin/fetch.c:656 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:657 +#: builtin/fetch.c:659 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:696 +#: builtin/fetch.c:698 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:701 +#: builtin/fetch.c:703 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:746 +#: builtin/fetch.c:748 #, 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:766 +#: builtin/fetch.c:768 #, 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:853 builtin/fetch.c:949 +#: builtin/fetch.c:855 builtin/fetch.c:951 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:864 +#: builtin/fetch.c:866 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -7815,55 +8049,55 @@ msgstr "" "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:919 +#: builtin/fetch.c:921 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:920 +#: builtin/fetch.c:922 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:952 +#: builtin/fetch.c:954 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:953 builtin/remote.c:1020 +#: builtin/fetch.c:955 builtin/remote.c:1022 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:976 +#: builtin/fetch.c:978 #, 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:995 +#: builtin/fetch.c:997 #, 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:998 +#: builtin/fetch.c:1000 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1074 +#: builtin/fetch.c:1076 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:1234 +#: builtin/fetch.c:1236 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1236 builtin/remote.c:96 +#: builtin/fetch.c:1238 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1254 +#: builtin/fetch.c:1256 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -7871,40 +8105,40 @@ msgstr "" "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:1277 +#: builtin/fetch.c:1279 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1319 +#: builtin/fetch.c:1321 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1321 +#: builtin/fetch.c:1323 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1326 +#: builtin/fetch.c:1328 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1328 +#: builtin/fetch.c:1330 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1350 +#: builtin/fetch.c:1352 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1352 +#: builtin/fetch.c:1354 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1363 +#: builtin/fetch.c:1365 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1371 +#: builtin/fetch.c:1373 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -7943,12 +8177,13 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <objekt>]" #: builtin/for-each-ref.c:11 -msgid "git for-each-ref [(--merged | --no-merged) [<object>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<objekt>]]" +msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" +msgstr "git for-each-ref [(--merged | --no-merged) [<incheckning>]]" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [--contains [<object>]]" -msgstr "git for-each-ref [--contains [<objekt>]]" +msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" +msgstr "" +"git for-each-ref [--contains [<incheckning>]] [--no-contains [<incheckning>]]" #: builtin/for-each-ref.c:27 msgid "quote placeholders suitably for shells" @@ -7970,10 +8205,6 @@ msgstr "citera platshållare passande för Tcl" msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38 -msgid "format to use for the output" -msgstr "format att använda för utdata" - #: builtin/for-each-ref.c:41 msgid "print only refs which points at the given object" msgstr "visa endast referenser som pekar på objektet" @@ -7990,6 +8221,10 @@ msgstr "visa endast referenser som ej slagits samman" msgid "print only refs which contain the commit" msgstr "visa endast referenser som innehåller incheckningen" +#: builtin/for-each-ref.c:46 +msgid "print only refs which don't contain the commit" +msgstr "visa endast referenser som inte innehåller incheckningen" + #: builtin/fsck.c:554 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" @@ -8056,17 +8291,17 @@ msgstr "Kontrollerar objekt" msgid "git gc [<options>]" msgstr "git gc [<flaggor>]" -#: builtin/gc.c:72 +#: builtin/gc.c:78 #, c-format -msgid "Invalid %s: '%s'" -msgstr "Felaktigt %s: \"%s\"" +msgid "Failed to fstat %s: %s" +msgstr "Misslyckades ta status (fstat) på %s: %s" -#: builtin/gc.c:139 +#: builtin/gc.c:310 #, c-format -msgid "insanely long object directory %.*s" -msgstr "tokigt lång objektkatalog %.*s" +msgid "Can't stat %s" +msgstr "Kan inte ta status på %s" -#: builtin/gc.c:297 +#: builtin/gc.c:319 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8081,38 +8316,43 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:334 +#: builtin/gc.c:358 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:336 +#: builtin/gc.c:360 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:337 +#: builtin/gc.c:361 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:338 +#: builtin/gc.c:362 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:380 +#: builtin/gc.c:379 +#, c-format +msgid "Failed to parse gc.logexpiry value %s" +msgstr "Kan inte tolka värdet %s för gc.logexpiry" + +#: builtin/gc.c:407 #, 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:382 +#: builtin/gc.c:409 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:383 +#: builtin/gc.c:410 #, 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:404 +#: builtin/gc.c:431 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8120,7 +8360,7 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:448 +#: builtin/gc.c:475 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -8141,235 +8381,240 @@ msgstr "grep: misslyckades skapa tråd. %s" msgid "invalid number of threads specified (%d) for %s" msgstr "felaktigt antal trådar angivet (%d) för %s" -#: builtin/grep.c:763 builtin/grep.c:804 +#: builtin/grep.c:769 builtin/grep.c:810 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:823 +#: builtin/grep.c:829 #, c-format msgid "unable to grep from object of type %s" msgstr "Kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:887 +#: builtin/grep.c:893 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:973 +#: builtin/grep.c:980 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:975 +#: builtin/grep.c:982 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:977 +#: builtin/grep.c:984 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:979 +#: builtin/grep.c:986 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:981 -msgid "recursivley search in each submodule" +#: builtin/grep.c:988 +msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:983 +#: builtin/grep.c:990 msgid "basename" msgstr "basnamn" -#: builtin/grep.c:984 +#: builtin/grep.c:991 msgid "prepend parent project's basename to output" msgstr "lägg till föräldraprojektets basnamn i utdata" -#: builtin/grep.c:987 +#: builtin/grep.c:994 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:989 +#: builtin/grep.c:996 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:991 +#: builtin/grep.c:998 msgid "match patterns only at word boundaries" msgstr "matcha endast mönster vid ordgränser" -#: builtin/grep.c:993 +#: builtin/grep.c:1000 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:995 +#: builtin/grep.c:1002 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:998 +#: builtin/grep.c:1005 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:1000 +#: builtin/grep.c:1007 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:1004 +#: builtin/grep.c:1011 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:1007 +#: builtin/grep.c:1014 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:1010 +#: builtin/grep.c:1017 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:1013 +#: builtin/grep.c:1020 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:1016 +#: builtin/grep.c:1023 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:1017 +#: builtin/grep.c:1024 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:1018 +#: builtin/grep.c:1025 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:1020 +#: builtin/grep.c:1027 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:1022 +#: builtin/grep.c:1029 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:1024 +#: builtin/grep.c:1031 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:1027 +#: builtin/grep.c:1034 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:1029 +#: builtin/grep.c:1036 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:1031 +#: builtin/grep.c:1038 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:1032 +#: builtin/grep.c:1039 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:1034 +#: builtin/grep.c:1041 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:1036 +#: builtin/grep.c:1043 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:1039 +#: builtin/grep.c:1046 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:1042 +#: builtin/grep.c:1049 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:1044 +#: builtin/grep.c:1051 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:1046 +#: builtin/grep.c:1053 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:1047 +#: builtin/grep.c:1054 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:1050 +#: builtin/grep.c:1057 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:1052 +#: builtin/grep.c:1059 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:1055 +#: builtin/grep.c:1062 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:1057 +#: builtin/grep.c:1064 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:1059 +#: builtin/grep.c:1066 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:1071 +#: builtin/grep.c:1078 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:1073 +#: builtin/grep.c:1080 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:1075 +#: builtin/grep.c:1082 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:1079 +#: builtin/grep.c:1086 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:1079 +#: builtin/grep.c:1086 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:1082 +#: builtin/grep.c:1089 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:1146 +#: builtin/grep.c:1153 msgid "no pattern given." msgstr "inget mönster angavs." -#: builtin/grep.c:1178 builtin/index-pack.c:1482 +#: builtin/grep.c:1189 +msgid "--no-index or --untracked cannot be used with revs" +msgstr "--no-index och --untracked kan inte användas med revisioner" + +#: builtin/grep.c:1195 +#, c-format +msgid "unable to resolve revision: %s" +msgstr "kan inte slå upp revision: %s" + +#: builtin/grep.c:1228 builtin/index-pack.c:1485 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:1215 +#: builtin/grep.c:1251 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1238 +#: builtin/grep.c:1274 msgid "option not supported with --recurse-submodules." msgstr "flaggan stöds inte med --recurse-submodules." -#: builtin/grep.c:1244 +#: builtin/grep.c:1280 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached och --untracked kan inte användas med --no-index." -#: builtin/grep.c:1249 -msgid "--no-index or --untracked cannot be used with revs." -msgstr "--no-index och --untracked kan inte användas med revisioner." - -#: builtin/grep.c:1252 +#: builtin/grep.c:1286 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:1260 +#: builtin/grep.c:1294 msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." @@ -8595,240 +8840,245 @@ msgstr "paket är större än tillåten maximal storlek" msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: builtin/index-pack.c:322 +#: builtin/index-pack.c:323 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:336 +#: builtin/index-pack.c:337 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:338 +#: builtin/index-pack.c:339 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:356 +#: builtin/index-pack.c:357 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s" -#: builtin/index-pack.c:478 +#: builtin/index-pack.c:479 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:527 +#: builtin/index-pack.c:528 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:535 +#: builtin/index-pack.c:536 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:543 +#: builtin/index-pack.c:544 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:574 +#: builtin/index-pack.c:575 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:576 +#: builtin/index-pack.c:577 #, 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:602 +#: builtin/index-pack.c:603 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 -#: builtin/index-pack.c:813 builtin/index-pack.c:822 +#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 +#: builtin/index-pack.c:816 builtin/index-pack.c:825 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:751 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:752 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:257 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:819 +#: builtin/index-pack.c:814 +#, c-format +msgid "cannot read existing object info %s" +msgstr "kan inte läsa information om befintligt objekt %s" + +#: builtin/index-pack.c:822 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:833 +#: builtin/index-pack.c:836 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:850 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:853 msgid "Error in object" msgstr "Fel i objekt" -#: builtin/index-pack.c:852 +#: builtin/index-pack.c:855 #, 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:924 builtin/index-pack.c:955 +#: builtin/index-pack.c:927 builtin/index-pack.c:958 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1125 +#: builtin/index-pack.c:1128 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1125 +#: builtin/index-pack.c:1128 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1165 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1168 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1176 +#: builtin/index-pack.c:1179 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1199 +#: builtin/index-pack.c:1202 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1210 +#: builtin/index-pack.c:1213 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1255 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1258 +#: builtin/index-pack.c:1261 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "slutfördes med %d lokalt objekt" msgstr[1] "slutfördes med %d lokala objekt" -#: builtin/index-pack.c:1270 +#: builtin/index-pack.c:1273 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1274 +#: builtin/index-pack.c:1277 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paketet har %d oanalyserat delta" msgstr[1] "paketet har %d oanalyserade delta" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1301 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1374 +#: builtin/index-pack.c:1377 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1398 +#: builtin/index-pack.c:1403 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1411 +#: builtin/index-pack.c:1415 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1419 +#: builtin/index-pack.c:1423 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1432 +#: builtin/index-pack.c:1433 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1443 +#: builtin/index-pack.c:1441 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1479 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1486 builtin/index-pack.c:1683 +#: builtin/index-pack.c:1489 builtin/index-pack.c:1686 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/index-pack.c:1544 +#: builtin/index-pack.c:1547 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1546 +#: builtin/index-pack.c:1549 #, 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:1593 +#: builtin/index-pack.c:1596 #, 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:1600 +#: builtin/index-pack.c:1603 #, 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:1613 +#: builtin/index-pack.c:1616 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1695 builtin/index-pack.c:1698 -#: builtin/index-pack.c:1714 builtin/index-pack.c:1718 +#: builtin/index-pack.c:1698 builtin/index-pack.c:1701 +#: builtin/index-pack.c:1717 builtin/index-pack.c:1721 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1734 +#: builtin/index-pack.c:1737 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1736 +#: builtin/index-pack.c:1739 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1744 +#: builtin/index-pack.c:1747 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -8988,104 +9238,104 @@ msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." -#: builtin/log.c:84 +#: builtin/log.c:89 #, c-format msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:139 +#: builtin/log.c:144 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: builtin/log.c:140 +#: builtin/log.c:145 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:141 +#: builtin/log.c:146 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:142 +#: builtin/log.c:147 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:145 +#: builtin/log.c:150 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:241 +#: builtin/log.c:246 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:486 +#: builtin/log.c:493 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:500 builtin/log.c:594 +#: builtin/log.c:507 builtin/log.c:601 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:618 +#: builtin/log.c:625 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:739 +#: builtin/log.c:746 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:839 +#: builtin/log.c:846 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:854 +#: builtin/log.c:861 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:868 +#: builtin/log.c:875 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:878 +#: builtin/log.c:885 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:984 +#: builtin/log.c:991 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:1063 +#: builtin/log.c:1071 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1091 +#: builtin/log.c:1098 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1141 +#: builtin/log.c:1148 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905 +#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" -#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476 +#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/log.c:1263 +#: builtin/log.c:1270 msgid "Could not find exact merge base." msgstr "Kunde inte hitta exakt sammanslagningsbas." -#: builtin/log.c:1267 +#: builtin/log.c:1274 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" @@ -9096,315 +9346,315 @@ msgstr "" "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> " "manuellt." -#: builtin/log.c:1287 +#: builtin/log.c:1294 msgid "Failed to find exact merge base" msgstr "Kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1298 +#: builtin/log.c:1305 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1302 +#: builtin/log.c:1309 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1351 +#: builtin/log.c:1358 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1408 +#: builtin/log.c:1415 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:1411 +#: builtin/log.c:1418 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1415 +#: builtin/log.c:1422 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1417 +#: builtin/log.c:1424 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1419 +#: builtin/log.c:1426 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1420 +#: builtin/log.c:1427 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1421 +#: builtin/log.c:1428 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1423 +#: builtin/log.c:1430 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1425 +#: builtin/log.c:1432 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1427 +#: builtin/log.c:1434 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1430 +#: builtin/log.c:1437 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1433 +#: builtin/log.c:1440 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1436 +#: builtin/log.c:1443 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1439 +#: builtin/log.c:1446 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1441 +#: builtin/log.c:1448 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1443 +#: builtin/log.c:1450 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1445 +#: builtin/log.c:1452 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1447 +#: builtin/log.c:1454 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1448 +#: builtin/log.c:1455 msgid "header" msgstr "huvud" -#: builtin/log.c:1449 +#: builtin/log.c:1456 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1450 builtin/log.c:1452 +#: builtin/log.c:1457 builtin/log.c:1459 msgid "email" msgstr "epost" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "add To: header" msgstr "Lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1452 +#: builtin/log.c:1459 msgid "add Cc: header" msgstr "Lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1454 +#: builtin/log.c:1461 msgid "ident" msgstr "ident" -#: builtin/log.c:1455 +#: builtin/log.c:1462 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:1457 +#: builtin/log.c:1464 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1458 +#: builtin/log.c:1465 msgid "make first mail a reply to <message-id>" msgstr "Gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1459 builtin/log.c:1462 +#: builtin/log.c:1466 builtin/log.c:1469 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1460 +#: builtin/log.c:1467 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1463 +#: builtin/log.c:1470 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1467 +#: builtin/log.c:1474 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1469 +#: builtin/log.c:1476 msgid "signature" msgstr "signatur" -#: builtin/log.c:1470 +#: builtin/log.c:1477 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1471 +#: builtin/log.c:1478 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1472 +#: builtin/log.c:1479 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1474 +#: builtin/log.c:1481 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1475 +#: builtin/log.c:1482 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1565 +#: builtin/log.c:1572 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1567 +#: builtin/log.c:1574 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt." -#: builtin/log.c:1575 +#: builtin/log.c:1582 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1577 +#: builtin/log.c:1584 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1579 +#: builtin/log.c:1586 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1609 +#: builtin/log.c:1616 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1611 +#: builtin/log.c:1618 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1705 +#: builtin/log.c:1712 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1777 +#: builtin/log.c:1784 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1826 +#: builtin/log.c:1833 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1880 +#: builtin/log.c:1887 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:509 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:511 +#: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" msgstr "använd små bokstäver för \"anta oförändrade\"-filer" -#: builtin/ls-files.c:513 +#: builtin/ls-files.c:521 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:515 +#: builtin/ls-files.c:523 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:525 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:527 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:529 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:524 +#: builtin/ls-files.c:532 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:534 msgid "show files on the filesystem that need to be removed" msgstr "visa filer i filsystemet som behöver tas bort" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:536 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:538 msgid "show line endings of files" msgstr "visa radslut i filer" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:540 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:535 +#: builtin/ls-files.c:543 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:537 +#: builtin/ls-files.c:545 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:539 +#: builtin/ls-files.c:547 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:550 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:553 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:555 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:558 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:561 msgid "recurse through submodules" msgstr "rekursera ner i undermoduler" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:563 msgid "if any <file> is not in the index, treat this as an error" msgstr "om en <fil> inte är indexet, betrakta det som ett fel" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:564 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:565 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:567 msgid "show debugging data" msgstr "visa felsökningsutdata" @@ -9418,39 +9668,39 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<arkiv> [<referenser>...]]" -#: builtin/ls-remote.c:50 +#: builtin/ls-remote.c:52 msgid "do not print remote URL" msgstr "visa inte fjärr-URL" -#: builtin/ls-remote.c:51 builtin/ls-remote.c:53 +#: builtin/ls-remote.c:53 builtin/ls-remote.c:55 msgid "exec" msgstr "exec" -#: builtin/ls-remote.c:52 builtin/ls-remote.c:54 +#: builtin/ls-remote.c:54 builtin/ls-remote.c:56 msgid "path of git-upload-pack on the remote host" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/ls-remote.c:56 +#: builtin/ls-remote.c:58 msgid "limit to tags" msgstr "begränsa till taggar" -#: builtin/ls-remote.c:57 +#: builtin/ls-remote.c:59 msgid "limit to heads" msgstr "begränsa till huvuden" -#: builtin/ls-remote.c:58 +#: builtin/ls-remote.c:60 msgid "do not show peeled tags" msgstr "visa inte avskalade taggar" -#: builtin/ls-remote.c:60 +#: builtin/ls-remote.c:62 msgid "take url.<base>.insteadOf into account" msgstr "ta hänsyn till url.<bas>.insteadOf" -#: builtin/ls-remote.c:62 +#: builtin/ls-remote.c:64 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:64 +#: builtin/ls-remote.c:66 msgid "show underlying ref in addition to the object pointed by it" msgstr "visa underliggande referens och objektet det pekar på" @@ -9495,147 +9745,143 @@ msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<flaggor>] [<incheckning>...]" #: builtin/merge.c:47 -msgid "git merge [<options>] <msg> HEAD <commit>" -msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>" - -#: builtin/merge.c:48 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:49 +#: builtin/merge.c:48 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:104 +#: builtin/merge.c:103 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:141 +#: builtin/merge.c:140 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:142 +#: builtin/merge.c:141 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:147 +#: builtin/merge.c:146 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:197 builtin/pull.c:127 +#: builtin/merge.c:196 builtin/pull.c:127 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:200 builtin/pull.c:130 +#: builtin/merge.c:199 builtin/pull.c:130 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:201 builtin/pull.c:133 +#: builtin/merge.c:200 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:203 builtin/pull.c:136 +#: builtin/merge.c:202 builtin/pull.c:136 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:206 builtin/pull.c:139 +#: builtin/merge.c:205 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:208 builtin/pull.c:142 +#: builtin/merge.c:207 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:210 builtin/pull.c:145 +#: builtin/merge.c:209 builtin/pull.c:145 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:211 +#: builtin/merge.c:210 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:213 builtin/pull.c:151 +#: builtin/merge.c:212 builtin/pull.c:151 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:217 builtin/pull.c:154 +#: builtin/merge.c:216 builtin/pull.c:154 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:218 builtin/notes.c:774 builtin/pull.c:158 -#: builtin/revert.c:89 +#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158 +#: builtin/revert.c:108 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:219 builtin/pull.c:159 +#: builtin/merge.c:218 builtin/pull.c:159 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:220 builtin/pull.c:162 +#: builtin/merge.c:219 builtin/pull.c:162 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:221 builtin/pull.c:163 +#: builtin/merge.c:220 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:223 +#: builtin/merge.c:222 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:227 +#: builtin/merge.c:226 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:229 +#: builtin/merge.c:228 msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -#: builtin/merge.c:231 builtin/pull.c:170 +#: builtin/merge.c:230 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" -#: builtin/merge.c:259 +#: builtin/merge.c:258 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:264 +#: builtin/merge.c:263 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:269 +#: builtin/merge.c:268 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:288 builtin/merge.c:305 +#: builtin/merge.c:287 builtin/merge.c:304 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:335 +#: builtin/merge.c:334 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:346 +#: builtin/merge.c:345 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:396 +#: builtin/merge.c:395 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:446 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:537 +#: builtin/merge.c:536 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" @@ -9697,64 +9943,59 @@ 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:867 -#, c-format -msgid "'%s' is not a commit" -msgstr "\"%s\" är inte en incheckning" - -#: builtin/merge.c:908 +#: builtin/merge.c:890 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:910 +#: builtin/merge.c:892 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:912 +#: builtin/merge.c:894 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:917 +#: builtin/merge.c:899 #, 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:964 +#: builtin/merge.c:946 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1038 +#: builtin/merge.c:1020 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: builtin/merge.c:1065 +#: builtin/merge.c:1047 #, 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:1099 +#: builtin/merge.c:1081 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1167 +#: builtin/merge.c:1146 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1171 +#: builtin/merge.c:1150 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1183 +#: builtin/merge.c:1162 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1187 +#: builtin/merge.c:1166 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1203 +#: builtin/merge.c:1182 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9762,7 +10003,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1210 +#: builtin/merge.c:1189 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9770,114 +10011,114 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1213 +#: builtin/merge.c:1192 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:1222 +#: builtin/merge.c:1201 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1230 +#: builtin/merge.c:1209 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1247 +#: builtin/merge.c:1226 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1249 +#: builtin/merge.c:1228 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:1254 +#: builtin/merge.c:1233 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1256 +#: builtin/merge.c:1235 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:1312 +#: builtin/merge.c:1269 #, 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:1315 +#: builtin/merge.c:1272 #, 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:1318 +#: builtin/merge.c:1275 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: builtin/merge.c:1321 +#: builtin/merge.c:1278 #, 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:1383 +#: builtin/merge.c:1340 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1392 +#: builtin/merge.c:1349 msgid "Already up-to-date." msgstr "Redan à jour." -#: builtin/merge.c:1402 +#: builtin/merge.c:1359 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1443 +#: builtin/merge.c:1400 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1450 +#: builtin/merge.c:1407 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1475 +#: builtin/merge.c:1432 msgid "Already up-to-date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1481 +#: builtin/merge.c:1438 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1504 builtin/merge.c:1583 +#: builtin/merge.c:1461 builtin/merge.c:1540 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1508 +#: builtin/merge.c:1465 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1574 +#: builtin/merge.c:1531 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1576 +#: builtin/merge.c:1533 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1542 #, 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:1597 +#: builtin/merge.c:1554 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -9931,35 +10172,35 @@ msgstr "" "git merge-file [<alternativ>] [-L <namn1> [-L <orig> [-L <namn2>]]] <fil1> " "<origfil> <fil2>" -#: builtin/merge-file.c:33 +#: builtin/merge-file.c:32 msgid "send results to standard output" msgstr "sänd resultat till standard ut" -#: builtin/merge-file.c:34 +#: builtin/merge-file.c:33 msgid "use a diff3 based merge" msgstr "använd diff3-baserad sammanslagning" -#: builtin/merge-file.c:35 +#: builtin/merge-file.c:34 msgid "for conflicts, use our version" msgstr "för konflikter, använd vår version" -#: builtin/merge-file.c:37 +#: builtin/merge-file.c:36 msgid "for conflicts, use their version" msgstr "för konflikter, använd deras version" -#: builtin/merge-file.c:39 +#: builtin/merge-file.c:38 msgid "for conflicts, use a union version" msgstr "för konflikter, använd en förenad version" -#: builtin/merge-file.c:42 +#: builtin/merge-file.c:41 msgid "for conflicts, use this marker size" msgstr "för konflikter, använd denna markörstorlek" -#: builtin/merge-file.c:43 +#: builtin/merge-file.c:42 msgid "do not warn about conflicts" msgstr "varna inte om konflikter" -#: builtin/merge-file.c:45 +#: builtin/merge-file.c:44 msgid "set labels for file1/orig-file/file2" msgstr "sätt etiketter för fil1/origfil/fil2" @@ -10103,43 +10344,47 @@ msgstr "Byter namn på %s till %s\n" msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/name-rev.c:257 +#: builtin/name-rev.c:289 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<flaggor>] <incheckning>..." -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:290 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<flaggor>] --all" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:291 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<flaggor>] --stdin" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:346 msgid "print only names (no SHA-1)" msgstr "skriv endast namn (ingen SHA-1)" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:347 msgid "only use tags to name the commits" msgstr "använd endast taggar för att namnge incheckningar" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:349 msgid "only use refs matching <pattern>" msgstr "använd endast referenser som motsvarar <mönster>" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:351 +msgid "ignore refs matching <pattern>" +msgstr "ignorera referenser som motsvarar <mönster>" + +#: builtin/name-rev.c:353 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:354 msgid "read from stdin" msgstr "läs från standard in" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:355 msgid "allow to print `undefined` names (default)" msgstr "tillåt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:324 +#: builtin/name-rev.c:361 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" @@ -10286,19 +10531,19 @@ msgstr "kunde inte skriva anteckningsobjekt" msgid "the note contents have been left in %s" msgstr "anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:233 builtin/tag.c:460 +#: builtin/notes.c:233 builtin/tag.c:516 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:235 builtin/tag.c:463 +#: builtin/notes.c:235 builtin/tag.c:519 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" #: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 #: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 -#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659 +#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "kunde inte slå upp \"%s\" som en giltig referens." @@ -10331,12 +10576,12 @@ msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)" #: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 -#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652 -#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970 +#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651 +#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969 msgid "too many parameters" msgstr "för många parametrar" -#: builtin/notes.c:378 builtin/notes.c:665 +#: builtin/notes.c:378 builtin/notes.c:664 #, c-format msgid "no note found for object %s." msgstr "inga anteckningar hittades för objektet %s." @@ -10379,7 +10624,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889 +#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" @@ -10419,52 +10664,52 @@ msgstr "" "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" -#: builtin/notes.c:685 +#: builtin/notes.c:684 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL" -#: builtin/notes.c:687 +#: builtin/notes.c:686 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "misslyckades ta bort referensen NOTES_MERGE_REF" -#: builtin/notes.c:689 +#: builtin/notes.c:688 msgid "failed to remove 'git notes merge' worktree" msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\"" -#: builtin/notes.c:709 +#: builtin/notes.c:708 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL" -#: builtin/notes.c:711 +#: builtin/notes.c:710 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL." -#: builtin/notes.c:713 +#: builtin/notes.c:712 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL." -#: builtin/notes.c:726 +#: builtin/notes.c:725 msgid "failed to resolve NOTES_MERGE_REF" msgstr "misslyckades bestämma NOTES_MERGE_REF" -#: builtin/notes.c:729 +#: builtin/notes.c:728 msgid "failed to finalize notes merge" msgstr "misslyckades färdigställa sammanslagning av anteckningar" -#: builtin/notes.c:755 +#: builtin/notes.c:754 #, c-format msgid "unknown notes merge strategy %s" msgstr "okänd sammanslagningsstrategi för anteckningar: %s" -#: builtin/notes.c:771 +#: builtin/notes.c:770 msgid "General options" msgstr "Allmänna flaggor" -#: builtin/notes.c:773 +#: builtin/notes.c:772 msgid "Merge options" msgstr "Flaggor för sammanslagning" -#: builtin/notes.c:775 +#: builtin/notes.c:774 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -10472,48 +10717,48 @@ msgstr "" "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:777 +#: builtin/notes.c:776 msgid "Committing unmerged notes" msgstr "Checkar in ej sammanslagna anteckningar" -#: builtin/notes.c:779 +#: builtin/notes.c:778 msgid "finalize notes merge by committing unmerged notes" msgstr "" "färdigställ sammanslagning av anteckningar genom att checka in ej " "sammanslagna anteckningar" -#: builtin/notes.c:781 +#: builtin/notes.c:780 msgid "Aborting notes merge resolution" msgstr "Avbryt lösning av sammanslagning av anteckningar" -#: builtin/notes.c:783 +#: builtin/notes.c:782 msgid "abort notes merge" msgstr "avbryt sammanslagning av anteckningar" -#: builtin/notes.c:794 +#: builtin/notes.c:793 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "kan inte blanda --commit, --abort eller -s/--strategy" -#: builtin/notes.c:799 +#: builtin/notes.c:798 msgid "must specify a notes ref to merge" msgstr "måste ange en antecknings-referens att slå ihop" -#: builtin/notes.c:823 +#: builtin/notes.c:822 #, c-format msgid "unknown -s/--strategy: %s" msgstr "okänd -s/--strategy: %s" -#: builtin/notes.c:860 +#: builtin/notes.c:859 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "sammanslagning av anteckningar till %s är redan igångsatt på %s" -#: builtin/notes.c:863 +#: builtin/notes.c:862 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)" -#: builtin/notes.c:865 +#: builtin/notes.c:864 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -10524,36 +10769,36 @@ msgstr "" "%s och checka in resultatet med \"git notes merge --commit\", eller avbryt " "sammanslagningen med \"git notes merge --abort\".\n" -#: builtin/notes.c:887 +#: builtin/notes.c:886 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:899 +#: builtin/notes.c:898 msgid "attempt to remove non-existent note is not an error" msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" -#: builtin/notes.c:902 +#: builtin/notes.c:901 msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127 +#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" -#: builtin/notes.c:941 +#: builtin/notes.c:940 msgid "report pruned notes" msgstr "rapportera borttagna anteckningar" -#: builtin/notes.c:983 +#: builtin/notes.c:982 msgid "notes-ref" msgstr "anteckningar-ref" -#: builtin/notes.c:984 +#: builtin/notes.c:983 msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1019 +#: builtin/notes.c:1018 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" @@ -10575,170 +10820,170 @@ msgstr "" msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:766 +#: builtin/pack-objects.c:770 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:779 +#: builtin/pack-objects.c:783 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1068 +#: builtin/pack-objects.c:1063 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:2344 +#: builtin/pack-objects.c:2426 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2747 +#: builtin/pack-objects.c:2829 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2751 +#: builtin/pack-objects.c:2833 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2781 +#: builtin/pack-objects.c:2863 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2783 +#: builtin/pack-objects.c:2865 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2785 +#: builtin/pack-objects.c:2867 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2788 +#: builtin/pack-objects.c:2870 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/pack-objects.c:2789 +#: builtin/pack-objects.c:2871 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2790 +#: builtin/pack-objects.c:2872 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2793 +#: builtin/pack-objects.c:2875 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2877 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2797 +#: builtin/pack-objects.c:2879 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2799 +#: builtin/pack-objects.c:2881 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2883 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:2803 +#: builtin/pack-objects.c:2885 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:2805 +#: builtin/pack-objects.c:2887 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2889 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2809 +#: builtin/pack-objects.c:2891 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2811 +#: builtin/pack-objects.c:2893 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:2813 +#: builtin/pack-objects.c:2895 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2815 +#: builtin/pack-objects.c:2897 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2817 +#: builtin/pack-objects.c:2899 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:2820 +#: builtin/pack-objects.c:2902 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2823 +#: builtin/pack-objects.c:2905 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2826 +#: builtin/pack-objects.c:2908 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2911 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2831 +#: builtin/pack-objects.c:2913 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2833 +#: builtin/pack-objects.c:2915 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2835 +#: builtin/pack-objects.c:2917 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:2837 +#: builtin/pack-objects.c:2919 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2840 +#: builtin/pack-objects.c:2922 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2842 +#: builtin/pack-objects.c:2924 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:2844 +#: builtin/pack-objects.c:2926 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2846 +#: builtin/pack-objects.c:2928 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2848 +#: builtin/pack-objects.c:2930 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2850 +#: builtin/pack-objects.c:2932 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:2852 +#: builtin/pack-objects.c:2934 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:2979 +#: builtin/pack-objects.c:3061 msgid "Counting objects" msgstr "Räknar objekt" @@ -10795,7 +11040,7 @@ msgstr "Alternativ gällande sammanslagning" msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:148 builtin/revert.c:101 +#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120 msgid "allow fast-forward" msgstr "tillåt snabbspolning" @@ -10871,7 +11116,7 @@ msgstr "Se git-pull(1) för detaljer." msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" @@ -11160,11 +11405,11 @@ msgstr "--all och --mirror är inkompatibla" msgid "repository" msgstr "arkiv" -#: builtin/push.c:519 builtin/send-pack.c:161 +#: builtin/push.c:519 builtin/send-pack.c:162 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:520 builtin/send-pack.c:163 +#: builtin/push.c:520 builtin/send-pack.c:164 msgid "mirror all refs" msgstr "spegla alla referenser" @@ -11176,15 +11421,15 @@ msgstr "ta bort referenser" msgid "push tags (can't be used with --all or --mirror)" msgstr "sänd taggar (kan inte användas med --all eller --mirror)" -#: builtin/push.c:526 builtin/send-pack.c:164 +#: builtin/push.c:526 builtin/send-pack.c:165 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:528 builtin/send-pack.c:175 +#: builtin/push.c:528 builtin/send-pack.c:179 msgid "refname>:<expect" msgstr "refnamn>:<förvänta" -#: builtin/push.c:529 builtin/send-pack.c:176 +#: builtin/push.c:529 builtin/send-pack.c:180 msgid "require old value of ref to be at this value" msgstr "kräv att ref:s tidigare värde är detta" @@ -11192,12 +11437,12 @@ msgstr "kräv att ref:s tidigare värde är detta" msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:534 builtin/send-pack.c:169 +#: builtin/push.c:534 builtin/send-pack.c:173 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158 -#: builtin/send-pack.c:159 +#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159 +#: builtin/send-pack.c:160 msgid "receive pack program" msgstr "program för att ta emot paket" @@ -11217,19 +11462,19 @@ msgstr "förbigå pre-push-krok" msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:546 builtin/send-pack.c:166 +#: builtin/push.c:546 builtin/send-pack.c:167 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:548 builtin/send-pack.c:170 +#: builtin/push.c:548 builtin/send-pack.c:174 msgid "request atomic transaction on remote side" msgstr "begär atomiska transaktioner på fjärrsidan" -#: builtin/push.c:549 +#: builtin/push.c:549 builtin/send-pack.c:170 msgid "server-specific" msgstr "serverspecifik" -#: builtin/push.c:549 +#: builtin/push.c:549 builtin/send-pack.c:171 msgid "option to transmit" msgstr "" "inget att checka in\n" @@ -11247,7 +11492,7 @@ msgstr "--delete kan inte användas utan referenser" msgid "push options must not have new line characters" msgstr "push-flaggor kan inte innehålla radbrytning" -#: builtin/read-tree.c:37 +#: builtin/read-tree.c:40 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -11257,75 +11502,87 @@ msgstr "" "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])" -#: builtin/read-tree.c:110 +#: builtin/read-tree.c:130 msgid "write resulting index to <file>" msgstr "skriv resulterande index till <fil>" -#: builtin/read-tree.c:113 +#: builtin/read-tree.c:133 msgid "only empty the index" msgstr "töm bara indexet" -#: builtin/read-tree.c:115 +#: builtin/read-tree.c:135 msgid "Merging" msgstr "Sammanslagning" -#: builtin/read-tree.c:117 +#: builtin/read-tree.c:137 msgid "perform a merge in addition to a read" msgstr "utför en sammanslagning i tillägg till en läsning" -#: builtin/read-tree.c:119 +#: builtin/read-tree.c:139 msgid "3-way merge if no file level merging required" msgstr "3-vägssammanslagning om sammanslagning på filnivå ej krävs" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:141 msgid "3-way merge in presence of adds and removes" msgstr "3-vägssammanslagning när det finns tillägg och borttagningar" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:143 msgid "same as -m, but discard unmerged entries" msgstr "som -m, men kasta bort ej sammanslagna poster" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:144 msgid "<subdirectory>/" msgstr "<underkatalog>/" -#: builtin/read-tree.c:125 +#: builtin/read-tree.c:145 msgid "read the tree into the index under <subdirectory>/" msgstr "läs in trädet i indexet under <underkatalog>/" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:148 msgid "update working tree with merge result" msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:150 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:131 +#: builtin/read-tree.c:151 msgid "allow explicitly ignored files to be overwritten" msgstr "tillåt explicit ignorerade filer att skrivas över" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:154 msgid "don't check the working tree after merging" msgstr "kontrollera inte arbetskatalogen efter sammanslagning" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:155 msgid "don't update the index or the work tree" msgstr "uppdatera inte indexet eller arbetskatalogen" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:157 msgid "skip applying sparse checkout filter" msgstr "hoppa över att applicera filter för gles utcheckning" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:159 msgid "debug unpack-trees" msgstr "felsök unpack-trees" -#: builtin/receive-pack.c:26 +#: builtin/rebase--helper.c:7 +msgid "git rebase--helper [<options>]" +msgstr "git rebase--helper [<flaggor>]" + +#: builtin/rebase--helper.c:19 +msgid "continue rebase" +msgstr "fortsätt ombasering" + +#: builtin/rebase--helper.c:21 +msgid "abort rebase" +msgstr "avbryt ombasering" + +#: builtin/receive-pack.c:27 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:793 +#: builtin/receive-pack.c:795 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" @@ -11355,7 +11612,7 @@ msgstr "" "För att undvika detta meddelande och fortfarande behålla det\n" "normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"." -#: builtin/receive-pack.c:813 +#: builtin/receive-pack.c:815 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" @@ -11376,11 +11633,11 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:1883 +#: builtin/receive-pack.c:1888 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:1897 +#: builtin/receive-pack.c:1902 msgid "You must specify a directory." msgstr "Du måste ange en katalog." @@ -11558,7 +11815,7 @@ msgstr "(matchande)" msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854 +#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856 #, c-format msgid "No such remote: %s" msgstr "Inget sådant fjärrarkiv: %s" @@ -11589,7 +11846,7 @@ msgstr "misslyckades ta bort \"%s\"" msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:792 +#: builtin/remote.c:794 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -11603,296 +11860,296 @@ msgstr[1] "" "Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n" "för att ta bort dem, använd:" -#: builtin/remote.c:806 +#: builtin/remote.c:808 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:907 +#: builtin/remote.c:909 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:910 +#: builtin/remote.c:912 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:912 +#: builtin/remote.c:914 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:914 +#: builtin/remote.c:916 msgid " ???" msgstr " ???" -#: builtin/remote.c:955 +#: builtin/remote.c:957 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren" -#: builtin/remote.c:963 +#: builtin/remote.c:965 #, c-format msgid "rebases interactively onto remote %s" msgstr "ombaseras interaktivt på fjärren %s" -#: builtin/remote.c:964 +#: builtin/remote.c:966 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:967 +#: builtin/remote.c:969 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:970 +#: builtin/remote.c:972 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:973 +#: builtin/remote.c:975 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s och med fjärren %s\n" -#: builtin/remote.c:1016 +#: builtin/remote.c:1018 msgid "create" msgstr "skapa" -#: builtin/remote.c:1019 +#: builtin/remote.c:1021 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1023 +#: builtin/remote.c:1025 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1026 +#: builtin/remote.c:1028 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1029 +#: builtin/remote.c:1031 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1036 +#: builtin/remote.c:1038 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1039 +#: builtin/remote.c:1041 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1043 +#: builtin/remote.c:1045 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1046 +#: builtin/remote.c:1048 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1114 +#: builtin/remote.c:1116 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1141 +#: builtin/remote.c:1143 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1142 +#: builtin/remote.c:1144 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295 +#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297 msgid "(no URL)" msgstr "(ingen URL)" #. TRANSLATORS: the colon ':' should align with #. the one in " Fetch URL: %s" translation -#: builtin/remote.c:1154 builtin/remote.c:1156 +#: builtin/remote.c:1156 builtin/remote.c:1158 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162 +#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1160 msgid "(not queried)" msgstr "(inte förfrågad)" -#: builtin/remote.c:1160 +#: builtin/remote.c:1162 msgid "(unknown)" msgstr "(okänd)" -#: builtin/remote.c:1164 +#: builtin/remote.c:1166 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n" -#: builtin/remote.c:1176 +#: builtin/remote.c:1178 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1179 builtin/remote.c:1205 +#: builtin/remote.c:1181 builtin/remote.c:1207 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1188 +#: builtin/remote.c:1190 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokal gren konfigurerad för \"git pull\":" msgstr[1] " Lokala grenar konfigurerade för \"git pull\":" -#: builtin/remote.c:1196 +#: builtin/remote.c:1198 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1202 +#: builtin/remote.c:1204 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:" msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:" -#: builtin/remote.c:1223 +#: builtin/remote.c:1225 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1225 +#: builtin/remote.c:1227 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1240 +#: builtin/remote.c:1242 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1242 +#: builtin/remote.c:1244 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:" -#: builtin/remote.c:1252 +#: builtin/remote.c:1254 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1260 +#: builtin/remote.c:1262 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1262 +#: builtin/remote.c:1264 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1280 +#: builtin/remote.c:1282 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1281 +#: builtin/remote.c:1283 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1291 +#: builtin/remote.c:1293 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1292 +#: builtin/remote.c:1294 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1308 +#: builtin/remote.c:1310 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1313 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1356 +#: builtin/remote.c:1358 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541 +#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1435 +#: builtin/remote.c:1437 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1442 +#: builtin/remote.c:1444 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1459 +#: builtin/remote.c:1461 msgid "query push URLs rather than fetch URLs" msgstr "fråga sänd-URL:er istället för hämta-URL:er" -#: builtin/remote.c:1461 +#: builtin/remote.c:1463 msgid "return all URLs" msgstr "returnera alla URL:er" -#: builtin/remote.c:1489 +#: builtin/remote.c:1491 #, c-format msgid "no URLs configured for remote '%s'" msgstr "ingen URL:er angivna för fjärren \"%s\"" -#: builtin/remote.c:1515 +#: builtin/remote.c:1517 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1517 +#: builtin/remote.c:1519 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1526 +#: builtin/remote.c:1528 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1567 +#: builtin/remote.c:1569 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1575 +#: builtin/remote.c:1577 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1577 +#: builtin/remote.c:1579 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/remote.c:1591 +#: builtin/remote.c:1593 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" -#: builtin/remote.c:1622 +#: builtin/remote.c:1624 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" @@ -12011,22 +12268,22 @@ msgstr "git replace -d <objekt>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<mönster>]]" -#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 +#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396 #, c-format msgid "Not a valid object name: '%s'" msgstr "Objektnamnet är inte giltigt: \"%s\"" -#: builtin/replace.c:355 +#: builtin/replace.c:360 #, c-format msgid "bad mergetag in commit '%s'" msgstr "felaktig sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:357 +#: builtin/replace.c:362 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "felformad sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:368 +#: builtin/replace.c:373 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -12035,45 +12292,45 @@ msgstr "" "den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s" "\" som har förkastats; använd --edit istället för --graft" -#: builtin/replace.c:401 +#: builtin/replace.c:406 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur." -#: builtin/replace.c:402 +#: builtin/replace.c:407 msgid "the signature will be removed in the replacement commit!" msgstr "signaturen kommer att tas bort i ersättningsincheckningen!" -#: builtin/replace.c:408 +#: builtin/replace.c:413 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "kunde inte skriva ersättningsincheckning för: \"%s\"" -#: builtin/replace.c:432 +#: builtin/replace.c:437 msgid "list replace refs" msgstr "visa ersättningsreferenser" -#: builtin/replace.c:433 +#: builtin/replace.c:438 msgid "delete replace refs" msgstr "ta bort ersättningsreferenser" -#: builtin/replace.c:434 +#: builtin/replace.c:439 msgid "edit existing object" msgstr "redigera befintligt objekt" -#: builtin/replace.c:435 +#: builtin/replace.c:440 msgid "change a commit's parents" msgstr "ändra en inchecknings föräldrar" -#: builtin/replace.c:436 +#: builtin/replace.c:441 msgid "replace the ref if it exists" msgstr "ersätt referensen om den finns" -#: builtin/replace.c:437 +#: builtin/replace.c:442 msgid "do not pretty-print contents for --edit" msgstr "använd inte snygg visning av innehåll för --edit" -#: builtin/replace.c:438 +#: builtin/replace.c:443 msgid "use this format" msgstr "använd detta format" @@ -12216,23 +12473,23 @@ msgstr "Kunde inte skriva ny indexfil." msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-parse.c:391 +#: builtin/rev-parse.c:393 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]" -#: builtin/rev-parse.c:396 +#: builtin/rev-parse.c:398 msgid "keep the `--` passed as an arg" msgstr "behåll \"--\" sänt som argument" -#: builtin/rev-parse.c:398 +#: builtin/rev-parse.c:400 msgid "stop parsing after the first non-option argument" msgstr "sluta tolka efter första argument som inte är flagga" -#: builtin/rev-parse.c:401 +#: builtin/rev-parse.c:403 msgid "output in stuck long form" msgstr "utdata fast i lång form" -#: builtin/rev-parse.c:532 +#: builtin/rev-parse.c:534 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12263,68 +12520,72 @@ msgstr "git cherry-pick [<flaggor>] <incheckning-igt>..." msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <underkommando>" -#: builtin/revert.c:71 +#: builtin/revert.c:89 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s kan inte användas med %s" -#: builtin/revert.c:80 +#: builtin/revert.c:98 msgid "end revert or cherry-pick sequence" msgstr "avsluta revert- eller cherry-pick-sekvens" -#: builtin/revert.c:81 +#: builtin/revert.c:99 msgid "resume revert or cherry-pick sequence" msgstr "återuppta revert- eller cherry-pick-sekvens" -#: builtin/revert.c:82 +#: builtin/revert.c:100 msgid "cancel revert or cherry-pick sequence" msgstr "avbryt revert- eller cherry-pick-sekvens" -#: builtin/revert.c:83 +#: builtin/revert.c:101 msgid "don't automatically commit" msgstr "checka inte in automatiskt" -#: builtin/revert.c:84 +#: builtin/revert.c:102 msgid "edit the commit message" msgstr "redigera incheckningsmeddelandet" -#: builtin/revert.c:87 -msgid "parent number" -msgstr "nummer på förälder" +#: builtin/revert.c:105 +msgid "parent-number" +msgstr "nummer-på-förälder" -#: builtin/revert.c:89 +#: builtin/revert.c:106 +msgid "select mainline parent" +msgstr "välj förälder för huvudlinje" + +#: builtin/revert.c:108 msgid "merge strategy" msgstr "sammanslagningsstrategi" -#: builtin/revert.c:90 +#: builtin/revert.c:109 msgid "option" msgstr "alternativ" -#: builtin/revert.c:91 +#: builtin/revert.c:110 msgid "option for merge strategy" msgstr "alternativ för sammanslagningsstrategi" -#: builtin/revert.c:100 +#: builtin/revert.c:119 msgid "append commit name" msgstr "lägg till incheckningsnamn" -#: builtin/revert.c:102 +#: builtin/revert.c:121 msgid "preserve initially empty commits" msgstr "behåll incheckningar som börjar som tomma" -#: builtin/revert.c:103 +#: builtin/revert.c:122 msgid "allow commits with empty messages" msgstr "tillåt incheckningar med tomt meddelande" -#: builtin/revert.c:104 +#: builtin/revert.c:123 msgid "keep redundant, empty commits" msgstr "behåll redundanta, tomma incheckningar" -#: builtin/revert.c:192 +#: builtin/revert.c:211 msgid "revert failed" msgstr "\"revert\" misslyckades" -#: builtin/revert.c:205 +#: builtin/revert.c:224 msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" @@ -12419,19 +12680,19 @@ msgstr "" "[<ref>...]\n" " --all och explicit angiven <ref> är ömsesidigt uteslutande." -#: builtin/send-pack.c:160 +#: builtin/send-pack.c:161 msgid "remote name" msgstr "fjärrnamn" -#: builtin/send-pack.c:171 +#: builtin/send-pack.c:175 msgid "use stateless RPC protocol" msgstr "använd tillståndslöst RPC-protokoll" -#: builtin/send-pack.c:172 +#: builtin/send-pack.c:176 msgid "read refs from stdin" msgstr "läs referenser från standard in" -#: builtin/send-pack.c:173 +#: builtin/send-pack.c:177 msgid "print status from remote helper" msgstr "visa status från fjärrhjälpare" @@ -12439,27 +12700,27 @@ msgstr "visa status från fjärrhjälpare" msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/shortlog.c:249 +#: builtin/shortlog.c:248 msgid "Group by committer rather than author" msgstr "Gruppera efter incheckare istället för författare" -#: builtin/shortlog.c:251 +#: builtin/shortlog.c:250 msgid "sort output according to the number of commits per author" msgstr "sortera utdata enligt antal incheckningar per författare" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:252 msgid "Suppress commit descriptions, only provides commit count" msgstr "Undertryck beskrivningar, visa bara antal incheckningar" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:254 msgid "Show the email address of each author" msgstr "Visa e-postadress för varje författare" -#: builtin/shortlog.c:256 +#: builtin/shortlog.c:255 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:256 msgid "Linewrap output" msgstr "Radbryt utdata" @@ -12479,122 +12740,122 @@ msgstr "" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]" -#: builtin/show-branch.c:375 +#: builtin/show-branch.c:374 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "ignorerar %s; kan inte hantera mer än %d referens" msgstr[1] "ignorerar %s; kan inte hantera mer än %d referenser" -#: builtin/show-branch.c:541 +#: builtin/show-branch.c:536 #, c-format msgid "no matching refs with %s" msgstr "inga motsvarande referenser med %s" -#: builtin/show-branch.c:639 +#: builtin/show-branch.c:632 msgid "show remote-tracking and local branches" msgstr "visa fjärrspårande och lokala grenar" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:634 msgid "show remote-tracking branches" msgstr "visa fjärrspårande grenar" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:636 msgid "color '*!+-' corresponding to the branch" msgstr "färga \"*!+-\" enligt grenen" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:638 msgid "show <n> more commits after the common ancestor" msgstr "visa <n> ytterligare incheckningar efter gemensam anfader" -#: builtin/show-branch.c:647 +#: builtin/show-branch.c:640 msgid "synonym to more=-1" msgstr "synonym till more=-1" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:641 msgid "suppress naming strings" msgstr "undertyck namnsträngar" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:643 msgid "include the current branch" msgstr "inkludera aktuell gren" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:645 msgid "name commits with their object names" msgstr "namnge incheckningar med deras objektnamn" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:647 msgid "show possible merge bases" msgstr "visa möjliga sammanslagningsbaser" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:649 msgid "show refs unreachable from any other ref" msgstr "visa referenser som inte kan nås från någon annan referens" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:651 msgid "show commits in topological order" msgstr "visa incheckningar i topologisk ordning" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:654 msgid "show only commits not on the first branch" msgstr "visa endast incheckningar inte på den första grenen" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:656 msgid "show merges reachable from only one tip" msgstr "visa sammanslagningar som endast kan nås från en spets" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:658 msgid "topologically sort, maintaining date order where possible" msgstr "sortera topologiskt, behåll datumordning när möjligt" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:661 msgid "<n>[,<base>]" msgstr "<n>[,<bas>]" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:662 msgid "show <n> most recent ref-log entries starting at base" msgstr "visa <n> nyaste refloggposter med början på bas" -#: builtin/show-branch.c:703 +#: builtin/show-branch.c:696 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" "--reflog är inkompatibel med --all, --remotes, --independent eller --merge-" "base" -#: builtin/show-branch.c:727 +#: builtin/show-branch.c:720 msgid "no branches given, and HEAD is not valid" msgstr "inga grenar angavs, och HEAD är inte giltigt" -#: builtin/show-branch.c:730 +#: builtin/show-branch.c:723 msgid "--reflog option needs one branch name" msgstr "--reflog behöver ett namn på en gren" -#: builtin/show-branch.c:733 +#: builtin/show-branch.c:726 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "maximalt %d poster kan visas samtidigt." msgstr[1] "maximalt %d poster kan visas samtidigt." -#: builtin/show-branch.c:737 +#: builtin/show-branch.c:730 #, c-format msgid "no such ref %s" msgstr "ingen sådan referens %s" -#: builtin/show-branch.c:829 +#: builtin/show-branch.c:814 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "kan inte hantera mer än %d revision." msgstr[1] "kan inte hantera mer än %d revisioner." -#: builtin/show-branch.c:833 +#: builtin/show-branch.c:818 #, c-format msgid "'%s' is not a valid ref." msgstr "\"%s\" är inte en giltig referens." -#: builtin/show-branch.c:836 +#: builtin/show-branch.c:821 #, c-format msgid "cannot find commit %s (%s)" msgstr "hittar inte incheckning %s (%s)" @@ -12659,12 +12920,12 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" 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:24 builtin/submodule--helper.c:1062 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" @@ -12674,92 +12935,101 @@ msgstr "Förväntade fullt referensnamn, fick %s" msgid "cannot strip one component off url '%s'" msgstr "kan inte ta bort en komponent från url:en \"%s\"" -#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592 +#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" -#: builtin/submodule--helper.c:287 +#: builtin/submodule--helper.c:310 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347 +#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 #, 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:373 +#: builtin/submodule--helper.c:395 +#, c-format +msgid "" +"could not lookup configuration '%s'. Assuming this repository is its own " +"authoritative upstream." +msgstr "" +"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sn eget " +"officiella uppström." + +#: builtin/submodule--helper.c:406 #, 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:377 +#: builtin/submodule--helper.c:410 #, 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:387 +#: builtin/submodule--helper.c:420 #, 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:394 +#: builtin/submodule--helper.c:427 #, 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:410 +#: builtin/submodule--helper.c:443 msgid "Suppress output for initializing a submodule" msgstr "Dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:448 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<sökväg>]" -#: builtin/submodule--helper.c:436 +#: builtin/submodule--helper.c:476 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:442 +#: builtin/submodule--helper.c:482 #, 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:525 builtin/submodule--helper.c:528 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s" -#: builtin/submodule--helper.c:564 +#: builtin/submodule--helper.c:604 #, 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:571 +#: builtin/submodule--helper.c:611 #, 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:595 +#: builtin/submodule--helper.c:633 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen skall klonas till" -#: builtin/submodule--helper.c:598 +#: builtin/submodule--helper.c:636 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:601 +#: builtin/submodule--helper.c:639 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:607 +#: builtin/submodule--helper.c:645 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980 +#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:615 +#: builtin/submodule--helper.c:653 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -12767,92 +13037,82 @@ msgstr "" "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:646 +#: builtin/submodule--helper.c:684 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:662 -#, c-format -msgid "cannot open file '%s'" -msgstr "kan inte öppna filen \"%s\"" - -#: builtin/submodule--helper.c:667 -#, c-format -msgid "could not close file %s" -msgstr "kunde inte stänga filen %s" - -#: builtin/submodule--helper.c:674 +#: builtin/submodule--helper.c:699 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:742 +#: builtin/submodule--helper.c:764 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:746 +#: builtin/submodule--helper.c:768 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:772 +#: builtin/submodule--helper.c:793 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:793 +#: builtin/submodule--helper.c:814 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:929 +#: builtin/submodule--helper.c:942 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:940 +#: builtin/submodule--helper.c:953 #, 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:961 builtin/submodule--helper.c:1105 +#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:964 +#: builtin/submodule--helper.c:977 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:968 +#: builtin/submodule--helper.c:981 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:972 +#: builtin/submodule--helper.c:985 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:975 +#: builtin/submodule--helper.c:988 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:990 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:978 +#: builtin/submodule--helper.c:991 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:985 +#: builtin/submodule--helper.c:998 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:995 +#: builtin/submodule--helper.c:1008 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:1066 +#: builtin/submodule--helper.c:1079 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -12861,24 +13121,24 @@ msgstr "" "Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men " "huvudprojektet är inte på någon gren" -#: builtin/submodule--helper.c:1106 +#: builtin/submodule--helper.c:1163 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:1112 +#: builtin/submodule--helper.c:1169 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<sökväg>...]" -#: builtin/submodule--helper.c:1157 +#: builtin/submodule--helper.c:1226 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "underkommandot submodule--helper måste anropas med ett underkommando" -#: builtin/submodule--helper.c:1164 +#: builtin/submodule--helper.c:1233 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#: builtin/submodule--helper.c:1170 +#: builtin/submodule--helper.c:1239 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -12926,32 +13186,29 @@ msgstr "git tag -d <taggnamn>..." #: builtin/tag.c:25 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" +"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" +"points-at <object>]\n" "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" msgstr "" -"git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>]\n" +"git tag -l [-n[<antal>]] [--contains <incheckning>] [--no-contains " +"<incheckning>] [--points-at <objekt>]\n" "\t\t[--format=<format>] [--[no-]merged [<incheckning>]] [<mönster>...]" #: builtin/tag.c:27 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <taggnamn>..." -#: builtin/tag.c:82 -#, c-format -msgid "tag name too long: %.*s..." -msgstr "taggnamnet för långt: %.*s..." - -#: builtin/tag.c:87 +#: builtin/tag.c:83 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:102 +#: builtin/tag.c:99 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:131 +#: builtin/tag.c:128 #, c-format msgid "" "\n" @@ -12964,7 +13221,7 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:135 +#: builtin/tag.c:132 #, c-format msgid "" "\n" @@ -12979,138 +13236,142 @@ msgstr "" "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" "du vill.\n" -#: builtin/tag.c:213 +#: builtin/tag.c:210 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:215 +#: builtin/tag.c:212 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" -#: builtin/tag.c:240 +#: builtin/tag.c:236 msgid "bad object type." msgstr "felaktig objekttyp" -#: builtin/tag.c:253 -msgid "tag header too big." -msgstr "tagghuvud för stort." - -#: builtin/tag.c:289 +#: builtin/tag.c:282 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:295 +#: builtin/tag.c:289 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:354 +#: builtin/tag.c:397 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:356 +#: builtin/tag.c:399 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:358 +#: builtin/tag.c:401 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:359 +#: builtin/tag.c:402 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:361 +#: builtin/tag.c:404 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:363 +#: builtin/tag.c:406 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:365 +#: builtin/tag.c:408 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:367 +#: builtin/tag.c:410 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:371 +#: builtin/tag.c:414 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:372 +#: builtin/tag.c:415 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:373 builtin/update-ref.c:368 +#: builtin/tag.c:416 builtin/update-ref.c:368 msgid "create a reflog" msgstr "skapa en reflog" -#: builtin/tag.c:375 +#: builtin/tag.c:418 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:376 +#: builtin/tag.c:419 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:377 builtin/tag.c:378 +#: builtin/tag.c:420 builtin/tag.c:422 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:379 +#: builtin/tag.c:421 builtin/tag.c:423 +msgid "print only tags that don't contain the commit" +msgstr "visa endast taggar som inte innehåller incheckningen" + +#: builtin/tag.c:424 msgid "print only tags that are merged" msgstr "visa endast taggar som slagits samman" -#: builtin/tag.c:380 +#: builtin/tag.c:425 msgid "print only tags that are not merged" msgstr "visa endast taggar som ej slagits samman" -#: builtin/tag.c:385 +#: builtin/tag.c:430 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:415 +#: builtin/tag.c:469 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:437 -msgid "-n option is only allowed with -l." -msgstr "Flaggan -n är endast tillåten tillsammans med -l." +#: builtin/tag.c:491 +msgid "-n option is only allowed in list mode" +msgstr "Flaggan -n är endast tillåten i listläge" + +#: builtin/tag.c:493 +msgid "--contains option is only allowed in list mode" +msgstr "Flaggan --contains är endast tillåten i listläge" -#: builtin/tag.c:439 -msgid "--contains option is only allowed with -l." -msgstr "Flaggan --contains är endast tillåten tillsammans med -l" +#: builtin/tag.c:495 +msgid "--no-contains option is only allowed in list mode" +msgstr "Flaggan --no-contains är endast tillåten i listläge" -#: builtin/tag.c:441 -msgid "--points-at option is only allowed with -l." -msgstr "Flaggan --points-at är endast tillåten tillsammans med -l." +#: builtin/tag.c:497 +msgid "--points-at option is only allowed in list mode" +msgstr "Flaggan --points-at är endast tillåten i listläge" -#: builtin/tag.c:443 -msgid "--merged and --no-merged option are only allowed with -l" -msgstr "flaggorna --merged och --no-merged tillåts endast tillsammans med -l" +#: builtin/tag.c:499 +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:454 +#: builtin/tag.c:510 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:473 +#: builtin/tag.c:529 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:479 +#: builtin/tag.c:535 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:484 +#: builtin/tag.c:540 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:512 +#: builtin/tag.c:570 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" @@ -13139,168 +13400,184 @@ msgstr "misslyckades skapa filen %s" msgid "failed to delete file %s" msgstr "misslyckades ta bort filen %s" -#: builtin/update-index.c:110 builtin/update-index.c:212 +#: builtin/update-index.c:110 builtin/update-index.c:216 #, c-format msgid "failed to delete directory %s" msgstr "misslyckades ta bort katalogen %s" -#: builtin/update-index.c:133 +#: builtin/update-index.c:135 #, c-format msgid "Testing mtime in '%s' " msgstr "Testar mtime i \"%s\"" -#: builtin/update-index.c:145 +#: builtin/update-index.c:149 msgid "directory stat info does not change after adding a new file" msgstr "stat-informationen för en katalog ändras inte när nya filer läggs till" -#: builtin/update-index.c:158 +#: builtin/update-index.c:162 msgid "directory stat info does not change after adding a new directory" msgstr "" "stat-informationen för en katalog ändras inte när nya kataloger läggs till" -#: builtin/update-index.c:171 +#: builtin/update-index.c:175 msgid "directory stat info changes after updating a file" msgstr "stat-informationen för en katalog ändras när filer uppdateras" -#: builtin/update-index.c:182 +#: builtin/update-index.c:186 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "stat-informationen för en katalog ändras när filer läggs till i en " "underkatalog" -#: builtin/update-index.c:193 +#: builtin/update-index.c:197 msgid "directory stat info does not change after deleting a file" msgstr "stat-informationen för en katalog ändras inte när en fil tas bort" -#: builtin/update-index.c:206 +#: builtin/update-index.c:210 msgid "directory stat info does not change after deleting a directory" msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort" -#: builtin/update-index.c:213 +#: builtin/update-index.c:217 msgid " OK" msgstr " OK" -#: builtin/update-index.c:564 +#: builtin/update-index.c:568 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:919 +#: builtin/update-index.c:923 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:922 +#: builtin/update-index.c:926 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:925 +#: builtin/update-index.c:929 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:927 +#: builtin/update-index.c:931 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:929 +#: builtin/update-index.c:933 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:931 +#: builtin/update-index.c:935 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:934 +#: builtin/update-index.c:938 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:938 +#: builtin/update-index.c:942 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:942 +#: builtin/update-index.c:946 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:943 +#: builtin/update-index.c:947 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:952 +#: builtin/update-index.c:956 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:955 +#: builtin/update-index.c:959 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:958 +#: builtin/update-index.c:962 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:961 +#: builtin/update-index.c:965 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:964 +#: builtin/update-index.c:968 msgid "add to index only; do not add content to object database" msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen" -#: builtin/update-index.c:966 +#: builtin/update-index.c:970 msgid "remove named paths even if present in worktree" msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen" -#: builtin/update-index.c:968 +#: builtin/update-index.c:972 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:970 +#: builtin/update-index.c:974 msgid "read list of paths to be updated from standard input" msgstr "läs lista över sökvägar att uppdatera från standard in" -#: builtin/update-index.c:974 +#: builtin/update-index.c:978 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:978 +#: builtin/update-index.c:982 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "återfyll etapp 2 och 3 från angivna sökvägar" -#: builtin/update-index.c:982 +#: builtin/update-index.c:986 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:986 +#: builtin/update-index.c:990 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:989 +#: builtin/update-index.c:993 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:991 +#: builtin/update-index.c:995 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:995 +#: builtin/update-index.c:999 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:997 +#: builtin/update-index.c:1001 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:999 +#: builtin/update-index.c:1003 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospårad cache" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:1005 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stöder ospårad cache" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1007 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1120 +#: builtin/update-index.c:1107 +msgid "" +"core.splitIndex is set to false; remove or change it, if you really want to " +"enable split index" +msgstr "" +"core.splitIndex är satt till false; ta bort eller ändra det om du verkligen " +"vill aktivera delat index" + +#: builtin/update-index.c:1116 +msgid "" +"core.splitIndex is set to true; remove or change it, if you really want to " +"disable split index" +msgstr "" +"core.splitIndex är satt till true; ta bort eller ändra det om du verkligen " +"vill inaktivera delat index" + +#: builtin/update-index.c:1127 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -13308,11 +13585,11 @@ msgstr "" "core.untrackedCache är satt till true; ta bort eller ändra det om du " "verkligen vill inaktivera den ospårade cachen" -#: builtin/update-index.c:1124 +#: builtin/update-index.c:1131 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1132 +#: builtin/update-index.c:1139 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -13320,7 +13597,7 @@ msgstr "" "core.untrackedCache är satt till false; ta bort eller ändra det om du " "verkligen vill aktivera den ospårade cachen" -#: builtin/update-index.c:1136 +#: builtin/update-index.c:1143 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" @@ -13413,27 +13690,27 @@ msgstr "git worktree prune [<flaggor>]" msgid "git worktree unlock <path>" msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:42 +#: builtin/worktree.c:43 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Tar bort worktrees/%s: inte en giltig katalog" -#: builtin/worktree.c:48 +#: builtin/worktree.c:49 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" -#: builtin/worktree.c:53 +#: builtin/worktree.c:54 #, 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:64 +#: builtin/worktree.c:65 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" -#: builtin/worktree.c:80 +#: builtin/worktree.c:81 #, 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" @@ -13451,61 +13728,65 @@ msgstr "låt tid gå ut för arbetskataloger äldre än <tid>" msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:236 +#: builtin/worktree.c:235 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:272 +#: builtin/worktree.c:274 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Förbereder %s (identifieraren %s)" -#: builtin/worktree.c:323 +#: builtin/worktree.c:328 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:325 +#: builtin/worktree.c:330 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:327 +#: builtin/worktree.c:332 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:329 +#: builtin/worktree.c:334 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:337 +#: builtin/worktree.c:335 +msgid "keep the new working tree locked" +msgstr "låt arbetskatalogen förbli låst" + +#: builtin/worktree.c:343 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:472 +#: builtin/worktree.c:478 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:484 builtin/worktree.c:517 +#: builtin/worktree.c:490 builtin/worktree.c:523 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:486 builtin/worktree.c:519 +#: builtin/worktree.c:492 builtin/worktree.c:525 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:491 +#: builtin/worktree.c:497 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:493 +#: builtin/worktree.c:499 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:521 +#: builtin/worktree.c:527 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" @@ -13530,19 +13811,19 @@ msgstr "endast användbart vid felsökning" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<flaggor>] <katalog>" -#: upload-pack.c:1036 +#: upload-pack.c:1040 msgid "quit after a single request/response exchange" msgstr "avsluta omedelbart efter första anrop/svar-utväxling" -#: upload-pack.c:1038 +#: upload-pack.c:1042 msgid "exit immediately after initial ref advertisement" msgstr "avsluta omedelbart efter inledande kungörelse av referenser" -#: upload-pack.c:1040 +#: upload-pack.c:1044 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:1042 +#: upload-pack.c:1046 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "avbryt överföringen efter <n> sekunders inaktivitet" @@ -13573,15 +13854,20 @@ msgstr "" "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:344 +#: http.c:336 +#, 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:357 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegerad styrning stöds inte av cURL < 7.22.0" -#: http.c:353 +#: http.c:366 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:1713 +#: http.c:1766 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -13592,7 +13878,7 @@ msgstr "" " bad om: %s\n" " omdirigering: %s" -#: remote-curl.c:319 +#: remote-curl.c:323 #, c-format msgid "redirecting to %s" msgstr "omdirigerar till %s" @@ -13969,7 +14255,7 @@ msgstr "Försök enkel sammanslagning med $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning." -#: git-rebase.sh:57 +#: git-rebase.sh:58 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -13980,37 +14266,37 @@ msgstr "" "Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n" "För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"." -#: git-rebase.sh:157 git-rebase.sh:396 +#: git-rebase.sh:158 git-rebase.sh:397 #, 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:172 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kan inte spara $stash_sha1" -#: git-rebase.sh:211 +#: git-rebase.sh:212 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: git-rebase.sh:216 +#: git-rebase.sh:217 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:357 +#: git-rebase.sh:358 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: git-rebase.sh:368 +#: git-rebase.sh:369 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:375 +#: git-rebase.sh:376 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: git-rebase.sh:378 +#: git-rebase.sh:379 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -14018,7 +14304,7 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: git-rebase.sh:418 +#: git-rebase.sh:419 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -14039,102 +14325,102 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där." -#: git-rebase.sh:469 +#: git-rebase.sh:470 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ogiltig uppström $upstream_name" -#: git-rebase.sh:493 +#: git-rebase.sh:494 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: mer än en sammanslagningsbas finns" -#: git-rebase.sh:496 git-rebase.sh:500 +#: git-rebase.sh:497 git-rebase.sh:501 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ingen sammanslagningsbas finns" -#: git-rebase.sh:505 +#: git-rebase.sh:506 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Peka på en giltig incheckning: $onto_name" -#: git-rebase.sh:528 +#: git-rebase.sh:529 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ödesdigert: ingen sådan gren: $branch_name" -#: git-rebase.sh:561 +#: git-rebase.sh:562 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: git-rebase.sh:566 +#: git-rebase.sh:567 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Skapade autostash: $stash_abbrev" -#: git-rebase.sh:570 +#: git-rebase.sh:571 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: git-rebase.sh:590 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name är à jour." -#: git-rebase.sh:594 +#: git-rebase.sh:595 #, 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:605 +#: git-rebase.sh:606 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Ändringar från $mb till $onto:" -#: git-rebase.sh:614 +#: git-rebase.sh:615 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:624 +#: git-rebase.sh:625 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." -#: git-stash.sh:50 +#: git-stash.sh:53 msgid "git stash clear with parameters is unimplemented" msgstr "\"git stash clear\" med parametrar har inte implementerats" -#: git-stash.sh:73 +#: git-stash.sh:94 msgid "You do not have the initial commit yet" msgstr "Du har inte den första incheckningen ännu" -#: git-stash.sh:88 +#: git-stash.sh:109 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: git-stash.sh:103 +#: git-stash.sh:124 msgid "Cannot save the untracked files" msgstr "Kan inte spara ospårade filer" -#: git-stash.sh:123 git-stash.sh:136 +#: git-stash.sh:144 git-stash.sh:157 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: git-stash.sh:140 +#: git-stash.sh:161 msgid "No changes selected" msgstr "Inga ändringar valda" -#: git-stash.sh:143 +#: git-stash.sh:164 msgid "Cannot remove temporary index (can't happen)" msgstr "Kan inte ta bort temporärt index (kan inte inträffa)" -#: git-stash.sh:156 +#: git-stash.sh:177 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: git-stash.sh:188 +#: git-stash.sh:209 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Kan inte uppdatera $ref_stash med $w_commit" @@ -14149,7 +14435,7 @@ msgstr "Kan inte uppdatera $ref_stash med $w_commit" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:238 +#: git-stash.sh:265 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -14158,108 +14444,108 @@ msgstr "" "fel: felaktig flagga för \"stash save\": $option\n" " För att ange ett meddelande, använd git stash save -- \"$option\"" -#: git-stash.sh:251 +#: git-stash.sh:278 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Kan inte använda --patch och --include-untracked eller --all samtidigt." -#: git-stash.sh:259 +#: git-stash.sh:286 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: git-stash.sh:263 +#: git-stash.sh:291 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: git-stash.sh:267 +#: git-stash.sh:295 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: git-stash.sh:268 +#: git-stash.sh:296 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Sparade arbetskatalogen och indexstatus $stash_msg" -#: git-stash.sh:285 +#: git-stash.sh:323 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: git-stash.sh:403 +#: git-stash.sh:471 #, sh-format msgid "unknown option: $opt" msgstr "okänd flagga: $opt" -#: git-stash.sh:416 +#: git-stash.sh:484 msgid "No stash found." msgstr "Ingen \"stash\" hittades." -#: git-stash.sh:423 +#: git-stash.sh:491 #, sh-format msgid "Too many revisions specified: $REV" msgstr "För många revisioner angivna: $REV" -#: git-stash.sh:438 +#: git-stash.sh:506 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference är inte en giltig referens" -#: git-stash.sh:466 +#: git-stash.sh:534 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" -#: git-stash.sh:477 +#: git-stash.sh:545 #, sh-format msgid "'$args' is not a stash reference" msgstr "\"$args\" är inte en \"stash\"-referens" -#: git-stash.sh:485 +#: git-stash.sh:553 msgid "unable to refresh index" msgstr "kan inte uppdatera indexet" -#: git-stash.sh:489 +#: git-stash.sh:557 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:497 +#: git-stash.sh:565 msgid "Conflicts in index. Try without --index." msgstr "Konflikter i indexet. Testa utan --index." -#: git-stash.sh:499 +#: git-stash.sh:567 msgid "Could not save index tree" msgstr "Kunde inte spara indexträd" -#: git-stash.sh:508 +#: git-stash.sh:576 msgid "Could not restore untracked files from stash" msgstr "Kunde inte återställa ospårade filer från stash" -#: git-stash.sh:533 +#: git-stash.sh:601 msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-stash.sh:548 +#: git-stash.sh:616 msgid "Index was not unstashed." msgstr "Indexet har inte tagits ur kön." -#: git-stash.sh:562 +#: git-stash.sh:630 msgid "The stash is kept in case you need it again." msgstr "\"Stash\":en behålls ifall du behöver den igen." -#: git-stash.sh:571 +#: git-stash.sh:639 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-stash.sh:572 +#: git-stash.sh:640 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:580 +#: git-stash.sh:648 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: git-stash.sh:652 +#: git-stash.sh:727 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" @@ -14346,28 +14632,28 @@ msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:327 +#: git-submodule.sh:341 #, sh-format msgid "Entering '$displaypath'" msgstr "Går in i \"$displaypath\"" -#: git-submodule.sh:347 +#: git-submodule.sh:361 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" "Stoppar på \"$displaypath\"; skriptet returnerade en status skild från noll." -#: git-submodule.sh:418 +#: git-submodule.sh:432 #, sh-format msgid "pathspec and --all are incompatible" msgstr "sökvägsangivelse och --all är inkompatibla" -#: git-submodule.sh:423 +#: git-submodule.sh:437 #, 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:443 +#: git-submodule.sh:457 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -14376,7 +14662,7 @@ 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:451 +#: git-submodule.sh:465 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -14385,38 +14671,38 @@ msgstr "" "Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" " "kastar bort dem" -#: git-submodule.sh:454 +#: git-submodule.sh:468 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Rensade katalogen \"$displaypath\"" -#: git-submodule.sh:455 +#: git-submodule.sh:469 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\"" -#: git-submodule.sh:458 +#: git-submodule.sh:472 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\"" -#: git-submodule.sh:467 +#: git-submodule.sh:481 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\"" -#: git-submodule.sh:623 +#: git-submodule.sh:637 #, 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:633 +#: git-submodule.sh:647 #, 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:638 +#: git-submodule.sh:652 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -14425,12 +14711,12 @@ msgstr "" "Kan inte hitta aktuell revision för ${remote_name}/${branch} i " "undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:656 +#: git-submodule.sh:670 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\"" -#: git-submodule.sh:662 +#: git-submodule.sh:676 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -14439,84 +14725,84 @@ msgstr "" "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. " "Direkt hämtning av incheckningen misslyckades." -#: git-submodule.sh:669 +#: git-submodule.sh:683 #, 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:670 +#: git-submodule.sh:684 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:674 +#: git-submodule.sh:688 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:675 +#: git-submodule.sh:689 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:680 +#: git-submodule.sh:694 #, 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:681 +#: git-submodule.sh:695 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:686 +#: git-submodule.sh:700 #, 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:687 +#: git-submodule.sh:701 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:718 +#: git-submodule.sh:732 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:826 +#: git-submodule.sh:840 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" -#: git-submodule.sh:878 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:898 +#: git-submodule.sh:912 #, 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:901 +#: git-submodule.sh:915 #, 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:904 +#: git-submodule.sh:918 #, 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:1051 +#: git-submodule.sh:1064 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:1118 +#: git-submodule.sh:1136 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" @@ -14818,11 +15104,11 @@ msgstr "" msgid "Or you can abort the rebase with 'git rebase --abort'." msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"." -#: git-rebase--interactive.sh:1079 +#: git-rebase--interactive.sh:1083 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Kunde inte ta bort CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:1084 +#: git-rebase--interactive.sh:1088 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -14853,11 +15139,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1101 +#: git-rebase--interactive.sh:1105 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:1106 +#: git-rebase--interactive.sh:1110 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -14865,11 +15151,11 @@ msgstr "" "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:1111 git-rebase--interactive.sh:1115 +#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119 msgid "Could not commit staged changes." msgstr "Kunde inte checka in köade ändringar." -#: git-rebase--interactive.sh:1139 +#: git-rebase--interactive.sh:1147 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -14883,40 +15169,40 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305 +#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313 msgid "Could not execute editor" msgstr "Kunde inte starta textredigerare" -#: git-rebase--interactive.sh:1160 +#: git-rebase--interactive.sh:1168 #, sh-format msgid "Could not checkout $switch_to" msgstr "Kunde inte checka ut $switch_to" -#: git-rebase--interactive.sh:1165 +#: git-rebase--interactive.sh:1173 msgid "No HEAD?" msgstr "Inget HEAD?" -#: git-rebase--interactive.sh:1166 +#: git-rebase--interactive.sh:1174 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Kunde inte skapa temporär $state_dir" -#: git-rebase--interactive.sh:1168 +#: git-rebase--interactive.sh:1176 msgid "Could not mark as interactive" msgstr "Kunde inte markera som interaktiv" -#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183 +#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191 msgid "Could not init rewritten commits" msgstr "Kunde inte initiera omskrivna incheckningar" -#: git-rebase--interactive.sh:1283 +#: git-rebase--interactive.sh:1291 #, 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:1288 +#: git-rebase--interactive.sh:1296 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -14926,7 +15212,7 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: git-rebase--interactive.sh:1295 +#: git-rebase--interactive.sh:1303 msgid "Note that empty commits are commented out" msgstr "Observera att tomma incheckningar är utkommenterade" @@ -15004,68 +15290,68 @@ msgstr "köad" msgid "unstaged" msgstr "ej köad" -#: git-add--interactive.perl:297 git-add--interactive.perl:322 +#: git-add--interactive.perl:288 git-add--interactive.perl:313 msgid "binary" msgstr "binär" -#: git-add--interactive.perl:306 git-add--interactive.perl:360 +#: git-add--interactive.perl:297 git-add--interactive.perl:351 msgid "nothing" msgstr "ingenting" -#: git-add--interactive.perl:342 git-add--interactive.perl:357 +#: git-add--interactive.perl:333 git-add--interactive.perl:348 msgid "unchanged" msgstr "oändrad" -#: git-add--interactive.perl:653 +#: git-add--interactive.perl:644 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "lade till %d sökväg\n" msgstr[1] "lade till %d sökvägar\n" -#: git-add--interactive.perl:656 +#: git-add--interactive.perl:647 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "uppdaterade %d sökväg\n" msgstr[1] "uppdaterade %d sökvägar\n" -#: git-add--interactive.perl:659 +#: git-add--interactive.perl:650 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "återställde %d sökväg\n" msgstr[1] "återställde %d sökvägar\n" -#: git-add--interactive.perl:662 +#: git-add--interactive.perl:653 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "rörde %d sökväg\n" msgstr[1] "rörde %d sökvägar\n" -#: git-add--interactive.perl:671 +#: git-add--interactive.perl:662 msgid "Update" msgstr "Uppdatera" -#: git-add--interactive.perl:683 +#: git-add--interactive.perl:674 msgid "Revert" msgstr "Återställ" -#: git-add--interactive.perl:706 +#: git-add--interactive.perl:697 #, perl-format msgid "note: %s is untracked now.\n" msgstr "observera: %s spåras inte längre.\n" -#: git-add--interactive.perl:717 +#: git-add--interactive.perl:708 msgid "Add untracked" msgstr "Lägg till ospårad" -#: git-add--interactive.perl:723 +#: git-add--interactive.perl:714 msgid "No untracked files.\n" msgstr "Inga ospårade filer.\n" -#: git-add--interactive.perl:1039 +#: git-add--interactive.perl:1030 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -15073,7 +15359,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "köas omedelbart." -#: git-add--interactive.perl:1042 +#: git-add--interactive.perl:1033 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -15081,7 +15367,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "läggas till i \"stash\" omedelbart." -#: git-add--interactive.perl:1045 +#: git-add--interactive.perl:1036 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -15089,7 +15375,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "tas bort från kön omedelbart." -#: git-add--interactive.perl:1048 git-add--interactive.perl:1057 +#: git-add--interactive.perl:1039 git-add--interactive.perl:1048 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -15097,15 +15383,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "markeras för applicering omedelbart." -#: git-add--interactive.perl:1051 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding" -msgstr "" -"Om patchen kan appliceras rent kommer det redigerade stycket att\n" -"markeras för kasta omedelbart" - -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:1042 git-add--interactive.perl:1045 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -15113,16 +15391,16 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "markeras för kasta omedelbart." -#: git-add--interactive.perl:1067 +#: git-add--interactive.perl:1058 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s" -#: git-add--interactive.perl:1068 +#: git-add--interactive.perl:1059 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:1074 +#: git-add--interactive.perl:1065 #, perl-format msgid "" "---\n" @@ -15136,7 +15414,7 @@ msgstr "" "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:1082 +#: git-add--interactive.perl:1073 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" @@ -15146,7 +15424,7 @@ msgstr "" "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:1096 +#: git-add--interactive.perl:1087 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s" @@ -15157,14 +15435,14 @@ 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:1187 +#: git-add--interactive.perl:1178 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:1196 +#: git-add--interactive.perl:1187 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -15178,7 +15456,7 @@ msgstr "" "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:1202 +#: git-add--interactive.perl:1193 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -15192,7 +15470,7 @@ msgstr "" "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:1208 +#: git-add--interactive.perl:1199 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -15206,7 +15484,7 @@ msgstr "" "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:1214 +#: git-add--interactive.perl:1205 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -15220,7 +15498,7 @@ msgstr "" "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:1220 +#: git-add--interactive.perl:1211 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -15234,7 +15512,7 @@ msgstr "" "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:1226 +#: git-add--interactive.perl:1217 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -15248,7 +15526,7 @@ msgstr "" "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:1232 +#: git-add--interactive.perl:1223 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -15262,7 +15540,7 @@ msgstr "" "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:1241 +#: git-add--interactive.perl:1232 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -15284,203 +15562,203 @@ msgstr "" "e - redigera aktuellt stycke manuellt\n" "? - visa hjälp\n" -#: git-add--interactive.perl:1272 +#: git-add--interactive.perl:1263 msgid "The selected hunks do not apply to the index!\n" msgstr "Markerade stycken kan inte appliceras på indexet!\n" -#: git-add--interactive.perl:1273 +#: git-add--interactive.perl:1264 msgid "Apply them to the worktree anyway? " msgstr "Applicera dem på arbetskatalogen trots det? " -#: git-add--interactive.perl:1276 +#: git-add--interactive.perl:1267 msgid "Nothing was applied.\n" msgstr "Ingenting applicerades.\n" -#: git-add--interactive.perl:1287 +#: git-add--interactive.perl:1278 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorerar ej sammanslagen: %s\n" -#: git-add--interactive.perl:1296 +#: git-add--interactive.perl:1287 msgid "Only binary files changed.\n" msgstr "Endast binära filer ändrade.\n" -#: git-add--interactive.perl:1298 +#: git-add--interactive.perl:1289 msgid "No changes.\n" msgstr "Inga ändringar.\n" -#: git-add--interactive.perl:1306 +#: git-add--interactive.perl:1297 msgid "Patch update" msgstr "Uppdatera patch" -#: git-add--interactive.perl:1358 +#: git-add--interactive.perl:1349 #, perl-format 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:1359 +#: git-add--interactive.perl:1350 #, perl-format msgid "Stage deletion [y,n,q,a,d,/%s,?]? " msgstr "Köa borttagning [y,n,q,a,d,/%s,?]?" -#: git-add--interactive.perl:1360 +#: git-add--interactive.perl:1351 #, perl-format msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " msgstr "Köa stycket [y,n,q,a,d,/%s,?]?" -#: git-add--interactive.perl:1363 +#: git-add--interactive.perl:1354 #, perl-format 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:1364 +#: git-add--interactive.perl:1355 #, perl-format msgid "Stash deletion [y,n,q,a,d,/%s,?]? " msgstr "Stash:a borttagning [y,n,q,a,d,/%s,?]?" -#: git-add--interactive.perl:1365 +#: git-add--interactive.perl:1356 #, perl-format msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " msgstr "Stash:a stycket [y,n,q,a,d,/%s,?]?" -#: git-add--interactive.perl:1368 +#: git-add--interactive.perl:1359 #, 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,?]?" -#: git-add--interactive.perl:1369 +#: git-add--interactive.perl:1360 #, 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,?]?" -#: git-add--interactive.perl:1370 +#: git-add--interactive.perl:1361 #, 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,?]?" -#: git-add--interactive.perl:1373 +#: git-add--interactive.perl:1364 #, 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,?]?" -#: git-add--interactive.perl:1374 +#: git-add--interactive.perl:1365 #, perl-format 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:1375 +#: git-add--interactive.perl:1366 #, 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,?]?" -#: git-add--interactive.perl:1378 +#: git-add--interactive.perl:1369 #, 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,?]?" -#: git-add--interactive.perl:1379 +#: git-add--interactive.perl:1370 #, 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,?]?" -#: git-add--interactive.perl:1380 +#: git-add--interactive.perl:1371 #, 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,?]?" -#: git-add--interactive.perl:1383 +#: git-add--interactive.perl:1374 #, 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,?]?" -#: git-add--interactive.perl:1384 +#: git-add--interactive.perl:1375 #, 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,?]?" -#: git-add--interactive.perl:1385 +#: git-add--interactive.perl:1376 #, 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,?]?" -#: git-add--interactive.perl:1388 +#: git-add--interactive.perl:1379 #, 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,?]?" -#: git-add--interactive.perl:1389 +#: git-add--interactive.perl:1380 #, 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,?]?" -#: git-add--interactive.perl:1390 +#: git-add--interactive.perl:1381 #, 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,?]?" -#: git-add--interactive.perl:1493 +#: git-add--interactive.perl:1484 msgid "go to which hunk (<ret> to see more)? " msgstr "gå till vilket stycke (<ret> för att se fler)?" -#: git-add--interactive.perl:1495 +#: git-add--interactive.perl:1486 msgid "go to which hunk? " msgstr "gå till vilket stycke?" -#: git-add--interactive.perl:1504 +#: git-add--interactive.perl:1495 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Ogiltigt siffervärde: \"%s\"\n" -#: git-add--interactive.perl:1509 +#: git-add--interactive.perl:1500 #, 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:1535 +#: git-add--interactive.perl:1526 msgid "search for regex? " msgstr "sök efter reguljärt uttryck? " -#: git-add--interactive.perl:1548 +#: git-add--interactive.perl:1539 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n" -#: git-add--interactive.perl:1558 +#: git-add--interactive.perl:1549 msgid "No hunk matches the given pattern\n" msgstr "Inga stycken motsvarar givet mönster\n" -#: git-add--interactive.perl:1570 git-add--interactive.perl:1592 +#: git-add--interactive.perl:1561 git-add--interactive.perl:1583 msgid "No previous hunk\n" msgstr "Inget föregående stycke\n" -#: git-add--interactive.perl:1579 git-add--interactive.perl:1598 +#: git-add--interactive.perl:1570 git-add--interactive.perl:1589 msgid "No next hunk\n" msgstr "Inget följande stycke\n" -#: git-add--interactive.perl:1606 +#: git-add--interactive.perl:1597 #, 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:1658 +#: git-add--interactive.perl:1649 msgid "Review diff" msgstr "Granska diff" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1677 +#: git-add--interactive.perl:1668 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" "revert - revert staged set of changes back to the HEAD version\n" "patch - pick hunks and update selectively\n" -"diff\t - view diff between HEAD and index\n" +"diff - view diff between HEAD and index\n" "add untracked - add contents of untracked files to the staged set of " "changes\n" msgstr "" @@ -15488,21 +15766,21 @@ msgstr "" "update - lägg arbetskatalogens tillstånd till köade ändringar\n" "revert - återställ köade ändringar till HEAD-versionen\n" "patch - välj och uppdatera valda stycken\n" -"diff\t - visa diff mellan HEAD och index\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:1694 git-add--interactive.perl:1699 -#: git-add--interactive.perl:1702 git-add--interactive.perl:1709 -#: git-add--interactive.perl:1713 git-add--interactive.perl:1719 +#: git-add--interactive.perl:1685 git-add--interactive.perl:1690 +#: git-add--interactive.perl:1693 git-add--interactive.perl:1700 +#: git-add--interactive.perl:1704 git-add--interactive.perl:1710 msgid "missing --" msgstr "saknad --" -#: git-add--interactive.perl:1715 +#: git-add--interactive.perl:1706 #, perl-format msgid "unknown --patch mode: %s" msgstr "okänt läge för --patch: %s" -#: git-add--interactive.perl:1721 git-add--interactive.perl:1727 +#: git-add--interactive.perl:1712 git-add--interactive.perl:1718 #, perl-format msgid "invalid argument %s, expecting --" msgstr "felaktigt argument %s, förväntar --" @@ -15863,6 +16141,92 @@ msgstr "" msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "could not stat '%s" +#~ msgstr "kunde inte ta status på \"%s\"" + +#~ msgid "tag: tagging " +#~ msgstr "tag: taggar" + +#~ msgid "object of unknown type" +#~ msgstr "objekt av okänd typ" + +#~ msgid "commit object" +#~ msgstr "incheckningsobjekt" + +#~ msgid "tree object" +#~ msgstr "trädobjekt" + +#~ msgid "blob object" +#~ msgstr "blob-objekt" + +#~ msgid "other tag object" +#~ msgstr "annat taggobjekt" + +#~ msgid "" +#~ "There is nothing to exclude from by :(exclude) patterns.\n" +#~ "Perhaps you forgot to add either ':/' or '.' ?" +#~ msgstr "" +#~ "Ingenting att exkludera från med :(exkludera)-mönster.\n" +#~ "Glömde du kanske att antingen lägga till \":/\" eller \".\"?" + +#~ msgid "unrecognized format: %%(%s)" +#~ msgstr "okänt format: %%(%s)" + +#~ msgid ":strip= requires a positive integer argument" +#~ msgstr ":strip= kräver ett positivt heltalsargument" + +#~ msgid "ref '%s' does not have %ld components to :strip" +#~ msgstr "referensen \"%s\" har inte %ld komponenter för :strip" + +#~ msgid "unknown %.*s format %s" +#~ msgstr "okänt \"%.*s\"-format %s" + +#~ msgid "[%s: gone]" +#~ msgstr "[%s: försvunnen]" + +#~ msgid "[%s]" +#~ msgstr "[%s]" + +#~ msgid "[%s: behind %d]" +#~ msgstr "[%s: bakom %d] " + +#~ msgid "[%s: ahead %d]" +#~ msgstr "[%s: före %d] " + +#~ msgid "[%s: ahead %d, behind %d]" +#~ msgstr "[%s: före %d, bakom %d] " + +#~ msgid " **** invalid ref ****" +#~ msgstr " **** ogiltig ref ****" + +#~ msgid "insanely long object directory %.*s" +#~ msgstr "tokigt lång objektkatalog %.*s" + +#~ msgid "git merge [<options>] <msg> HEAD <commit>" +#~ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>" + +#~ msgid "'%s' is not a commit" +#~ msgstr "\"%s\" är inte en incheckning" + +#~ msgid "cannot open file '%s'" +#~ msgstr "kan inte öppna filen \"%s\"" + +#~ msgid "could not close file %s" +#~ msgstr "kunde inte stänga filen %s" + +#~ msgid "tag name too long: %.*s..." +#~ msgstr "taggnamnet för långt: %.*s..." + +#~ msgid "tag header too big." +#~ msgstr "tagghuvud för stort." + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for discarding" +#~ msgstr "" +#~ "Om patchen kan appliceras rent kommer det redigerade stycket att\n" +#~ "markeras för kasta omedelbart" + #~ msgid "Use an experimental blank-line-based heuristic to improve diffs" #~ msgstr "" #~ "Använd en experimentell algoritm baserad på tomma rader för att förbättra " @@ -16437,9 +16801,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "cannot update HEAD ref" #~ msgstr "kunde inte uppdatera HEAD-referens" -#~ msgid "cannot tell cwd" -#~ msgstr "kan inte läsa aktuell katalog (cwd)" - #~ msgid "%s: cannot lock the ref" #~ msgstr "%s: kan inte låsa referensen" |