diff options
author | Peter Krefting <peter@softwolves.pp.se> | 2022-11-30 00:46:18 +0300 |
---|---|---|
committer | Peter Krefting <peter@softwolves.pp.se> | 2022-11-30 00:51:11 +0300 |
commit | c80046d63d64d0c1dec0d0dad6f61adf16e126f0 (patch) | |
tree | 675f3e2ab35f7d5d2833de4b9d5a018897ceca43 /po | |
parent | c000d916380bb59db69c78546928eadd076b9c7d (diff) |
l10n: sv.po: Update Swedish translation (5501t0f0)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Diffstat (limited to 'po')
-rw-r--r-- | po/sv.po | 766 |
1 files changed, 460 insertions, 306 deletions
@@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.38.0\n" +"Project-Id-Version: git 2.39.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-09-26 06:34+0100\n" -"PO-Revision-Date: 2022-09-26 06:35+0100\n" +"POT-Creation-Date: 2022-11-29 04:57+0000\n" +"PO-Revision-Date: 2022-11-29 22:50+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -764,6 +764,9 @@ msgstr "kommandorad avslutas med \\" msgid "unclosed quote" msgstr "citat ej stängt" +msgid "too many arguments" +msgstr "för många argument" + #, c-format msgid "unrecognized whitespace option '%s'" msgstr "okänt alternativ för whitespace: \"%s\"" @@ -2523,42 +2526,6 @@ msgstr "" "\"bisect\"-körningen misslyckades: \"git bisect--helper --bisect-state %s\" " "avslutades med felkoden %d" -msgid "reset the bisection state" -msgstr "återställ bisect-tillstånd" - -msgid "check whether bad or good terms exist" -msgstr "se efter om termer för rätt och fel finns" - -msgid "print out the bisect terms" -msgstr "skriv ut termer för bisect" - -msgid "start the bisect session" -msgstr "påbörja bisect-körningen" - -msgid "find the next bisection commit" -msgstr "hitta nästa incheckning i bisect" - -msgid "mark the state of ref (or refs)" -msgstr "markera tillståndet för en eller flera referenser" - -msgid "list the bisection steps so far" -msgstr "lista \"bisect\"-stegen som utförts så långt" - -msgid "replay the bisection process from the given file" -msgstr "spela upp \"bisect\"-processen från angiven fil" - -msgid "skip some commits for checkout" -msgstr "hoppa över ett par incheckningar" - -msgid "visualize the bisection" -msgstr "visualisera \"bisect\"-körningen" - -msgid "use <cmd>... to automatically bisect" -msgstr "använd <kommando>... för att utföra \"bisect\" automatiskt" - -msgid "no log for BISECT_WRITE" -msgstr "ingen logg för BISECT_WRITE" - msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset kräver antingen inget argument eller en incheckning" @@ -2577,6 +2544,9 @@ msgstr "ingen loggfil angiven" msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" +msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" +msgstr "git annotate [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" + msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" @@ -2763,9 +2733,6 @@ msgstr "Misslyckades uppdatera konfigurationsfil" msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -msgid "Couldn't look up commit object for HEAD" -msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" - #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\"" @@ -2804,17 +2771,18 @@ msgstr "Grenen %s ombaseras på %s" msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -msgid "cannot copy the current branch while not on any." -msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon." - -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." - #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Inga incheckningar på grenen \"%s\" ännu." + +#, c-format +msgid "No branch named '%s'." +msgstr "Ingen gren vid namnet \"%s\"." + msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" @@ -2962,7 +2930,7 @@ msgstr "" "propagateBranches har aktiverats" msgid "--recurse-submodules can only be used to create branches" -msgstr "--recurse-submodules jan endast användas för att skapa grenar" +msgstr "--recurse-submodules kan endast användas för att skapa grenar" msgid "branch name required" msgstr "grennamn krävs" @@ -2973,13 +2941,12 @@ msgstr "Kan inte beskriva frånkopplad HEAD" msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#, c-format -msgid "No commit on branch '%s' yet." -msgstr "Inga incheckningar på grenen \"%s\" ännu." +msgid "cannot copy the current branch while not on any." +msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon." -#, c-format -msgid "No branch named '%s'." -msgstr "Ingen gren vid namnet \"%s\"." +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." msgid "too many branches for a copy operation" msgstr "för många grenar för kopiering" @@ -3046,11 +3013,11 @@ msgid "not run from a git repository - no hooks to show\n" msgstr "körs inte från ett git-arkiv - inga krokar att visa\n" msgid "" -"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--" -"diagnose[=<mode>]" +"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--diagnose[=<mode>]]" msgstr "" -"git bugreport [-o|--output-directory <fil>] [-s|--suffix <format>] [--" -"diagnose[=<läge>]" +"git bugreport [(-o | --output-directory) <fil>] [(-s | --suffix) <format>]\n" +" [--diagnose[=<läge>]" msgid "" "Thank you for filling out a Git bug report!\n" @@ -3124,17 +3091,23 @@ msgstr "kunde inte skriva till %s" msgid "Created new report at '%s'.\n" msgstr "Skapade ny rapport på \"%s\"\n" -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<flaggor>] <fil> <git-rev-list-flaggor>" +msgid "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<version>] <file> <git-rev-list-args>" +msgstr "" +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-" +"progress-implied]\n" +" [--version=<version>] <fil> <git-rev-list-flaggor>" -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<flaggor>] <fil>" +msgid "git bundle verify [-q | --quiet] <file>" +msgstr "git bundle verify [-q | --quiet] <fil>" msgid "git bundle list-heads <file> [<refname>...]" msgstr "git bundle list-heads <fil> [<refnamn>...]" -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <fil> [<refnamn>...]" +msgid "git bundle unbundle [--progress] <file> [<refname>...]" +msgstr "git bundle unbundle [--progress] <fil> [<refnamn>...]" msgid "do not show progress meter" msgstr "visa inte förloppsindikator" @@ -3209,12 +3182,12 @@ msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgid "" "git cat-file (--textconv | --filters)\n" @@ -3323,9 +3296,6 @@ msgstr "<rev> krävs med \"%s\"" msgid "<object> required with '-%c'" msgstr "<objekt> krävs med \"-%c\"" -msgid "too many arguments" -msgstr "för många argument" - #, c-format msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "endast två argument krävs i <typ> <objekt>-läge, inte %d" @@ -3858,10 +3828,10 @@ msgid "use overlay mode" msgstr "använd överläggsläge" msgid "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] " +"[<pathspec>...]" msgstr "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <mönster>] [-x | -X] [--] " -"<sökvägar>..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e <mönster>] [-x | -X] [--] <sökväg>..." #, c-format msgid "Removing %s\n" @@ -4151,6 +4121,10 @@ msgid "failed to start iterator over '%s'" msgstr "misslyckades starta iterator över \"%s\"" #, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "symbolisk länk \"%s\" finns redan, vägrar klona med --local" + +#, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -4214,10 +4188,6 @@ msgstr "För många argument." msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#, c-format -msgid "options '%s' and '%s %s' cannot be used together" -msgstr "flaggorna \"%s\" och \"%s %s\" kan inte användas samtidigt" - msgid "" "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" "exclude" @@ -4338,18 +4308,24 @@ msgid "--command must be the first argument" msgstr "--command måste vara första argument" msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]" msgstr "" -"git commit-graph verify [--object-dir <objkat>] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir <kat>] [--shallow] [--[no-]progress]" msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--" -"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +"git commit-graph write [--object-dir <dir>] [--append]\n" +" [--split[=<strategy>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <split options>" msgstr "" -"git commit-graph write [--object-dir <objkat>] [--append] [--" -"split[=<strategi>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <delnings-flaggor>" +"git commit-graph write [--object-dir <kat>] [--append]\n" +" [--split[=<strategi>]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters <n>] [--" +"[no-]progress]\n" +" <delnings-flaggor>" msgid "dir" msgstr "kat" @@ -4417,12 +4393,16 @@ msgstr "använd som mest en av --reachable, --stdin-commits och --stdin-packs" msgid "Collecting commits from input" msgstr "Hämtar incheckningar från indata" +msgid "git commit-tree <tree> [(-p <parent>)...]" +msgstr "git commit-tree <träd> [(-p <förälder>)...]" + msgid "" -"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " -"<file>)...] <tree>" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n" +" [(-F <file>)...] <tree>" msgstr "" -"git commit-tree [(-p <föräldrer>)...] [-S[<nyckelid>]] [(-m " -"<meddelande>)...] [(-F <fil>)...] <träd>" +"git commit-tree [(-p <förälder>)...] [-S[<nyckelid>]] [(-m " +"<meddelande>)...]\n" +" [(-F <fil>)...] <träd>" #, c-format msgid "duplicate parent %s ignored" @@ -4464,10 +4444,29 @@ msgstr "måste ange exakt ett träd" msgid "git commit-tree: failed to read" msgstr "git commit-tree: misslyckades läsa" -msgid "git commit [<options>] [--] <pathspec>..." -msgstr "git commit [<flaggor>] [--] <sökväg>..." - -msgid "git status [<options>] [--] <pathspec>..." +msgid "" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" +" [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|" +"reword):]<commit>)]\n" +" [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n" +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u<läge>] [--amend]\n" +" [--dry-run] [(-c | -C | --squash) <incheckning> | --fixup [(amend|" +"reword):]<incheckning>)]\n" +" [-F <fil> | -m <medd>] [--reset-author] [--allow-empty]\n" +" [--allow-empty-message] [--no-verify] [-e] [--" +"author=<författare>]\n" +" [--date=<datum>] [--cleanup=<läge>] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n" +" [(--trailer <symbol>[(=|:)<värde>])...] [-S[<nyckel-id>]]\n" +" [--] [<sökväg>...]" + +msgid "git status [<options>] [--] [<pathspec>...]" msgstr "git status [<flaggor>] [--] <sökväg>..." msgid "" @@ -5233,11 +5232,19 @@ msgstr "\"credential-cache\" ej tillgänglig; stöd för unix-uttag saknas" msgid "unable to get credential storage lock in %d ms" msgstr "kunde inte erhålla låset för lagring av inlogginsuppgifter på %d ms" -msgid "git describe [<options>] [<commit-ish>...]" -msgstr "git describe [<flaggor>] [<incheckning-igt>...]" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]" +msgstr "" +"git describe [--all] [--tag] [--contains] [--abbrev=<n>] [<incheckning-" +"igt>...]" + +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]" +msgstr "" +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<märke>]" -msgid "git describe [<options>] --dirty" -msgstr "git describe [<flaggor>] --dirty" +msgid "git describe <blob>" +msgstr "git describe <objekt>" msgid "head" msgstr "huvud" @@ -5359,11 +5366,12 @@ msgid "option '%s' and commit-ishes cannot be used together" msgstr "flaggorna \"%s\" och incheckning-igter kan inte användas samtidigt" msgid "" -"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--" -"mode=<mode>]" +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" +" [--mode=<mode>]" msgstr "" -"git diagnose [-o|--output-directory <sökväg>] [-s|--suffix <format>] [--" -"mode=<läge>]" +"git diagnose [(-o | --output-directory) <sökväg>] [(-s | --suffix) " +"<format>]\n" +" [--mode=<läge>]" msgid "specify a destination for the diagnostics archive" msgstr "ange mål för diagnostikarkivet" @@ -5381,6 +5389,9 @@ msgstr "--merge-base fungerar endast med två incheckningar" msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" +msgid "no merge given, only parents." +msgstr "ingen sammanslagning angiven, endast föräldrar." + #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" @@ -6013,8 +6024,8 @@ msgstr "visa endast referenser som innehåller incheckningen" msgid "print only refs which don't contain the commit" msgstr "visa endast referenser som inte innehåller incheckningen" -msgid "git for-each-repo --config=<config> <command-args>" -msgstr "git for-each-repo --config=<konfig> <kommandoargument>" +msgid "git for-each-repo --config=<config> [--] <arguments>" +msgstr "git for-each-repo --config=<konfig> [--] <argument>" msgid "config" msgstr "konfig" @@ -6189,8 +6200,16 @@ msgstr "icke-träd i cacheträd" msgid "%s: invalid sha1 pointer in resolve-undo" msgstr "%s: ogiltig sha1-pekare i resolve-undo" -msgid "git fsck [<options>] [<object>...]" -msgstr "git fsck [<flaggor>] [<objekt>...]" +msgid "" +"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" +" [--[no-]full] [--strict] [--verbose] [--lost-found]\n" +" [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" +" [--[no-]name-objects] [<object>...]" +msgstr "" +"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" +" [--[no-]full] [--strict] [--verbose] [--lost-found]\n" +" [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" +" [--[no-]name-objects] [<objekt>...]" msgid "show unreachable objects" msgstr "visa onåbara objekt" @@ -6247,12 +6266,6 @@ msgstr "git fsmonitor--daemon start [<flaggor>]" msgid "git fsmonitor--daemon run [<options>]" msgstr "git fsmonitor--daemon run [<flaggor>]" -msgid "git fsmonitor--daemon stop" -msgstr "git fsmonitor--daemon stop" - -msgid "git fsmonitor--daemon status" -msgstr "git fsmonitor--daemon status" - #, c-format msgid "value of '%s' out of range: %d" msgstr "värdet för \"%s\" utanför intervallet: %d" @@ -6494,8 +6507,20 @@ msgstr "utför en specifik uppgift" msgid "use at most one of --auto and --schedule=<frequency>" msgstr "använd som mest en av --auto och --schedule=<frekvens>" -msgid "failed to run 'git config'" -msgstr "misslyckades köra \"git config\"" +#, c-format +msgid "unable to add '%s' value of '%s'" +msgstr "kan inte lägga till \"%s\"-värdet för \"%s\"" + +msgid "return success even if repository was not registered" +msgstr "returnera framgång även om arkivet inte var registrerat" + +#, c-format +msgid "unable to unset '%s' value of '%s'" +msgstr "kan inte ta bort \"%s\"-värdet för \"%s\"" + +#, c-format +msgid "repository '%s' is not registered" +msgstr "arkivet \"%s\" har inte registrerats" #, c-format msgid "failed to expand path '%s'" @@ -6783,11 +6808,14 @@ msgid "both --cached and trees are given" msgstr "både --cached och träd angavs" msgid "" -"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " -"[--] <file>..." +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n" +" [--stdin [--literally]] [--] <file>..." msgstr "" -"git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] " -"<fil>..." +"git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters]\n" +" [--stdin [--literally]] [--] <fil>..." + +msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]" +msgstr "git hash-object [-t <typ>] [-w] --stdin-paths [--no-filters]" msgid "object type" msgstr "objekttyp" @@ -7211,11 +7239,15 @@ msgid "Initialized empty Git repository in %s%s\n" msgstr "Initierade tomt Git-arkiv i %s%s\n" msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [<directory>]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n" +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n" +" [-b <branch-name> | --initial-branch=<branch-name>]\n" +" [--shared[=<permissions>]] [<directory>]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" -"shared[=<behörigheter>]] [<katalog>]" +"git init [-q | --quiet] [--bare] [--template=<mallkatalog>]\n" +" [--separate-git-dir <git-kat>] [--object-format=<format>]\n" +" [-b <grennamn> | --initial-branch=<grennamn>]\n" +" [--shared[=<behörigheter>]] [<katalog>]" msgid "permissions" msgstr "behörigheter" @@ -7256,11 +7288,13 @@ msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir är inkompatibelt med naket arkiv" msgid "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<token>[(=|:)<value>])...] [<file>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <token>[(=|:)<value>])...]\n" +" [--parse] [<file>...]" msgstr "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<symbol>[(=|:)<värde>])...] [<fil>...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer <symbol>[(=|:)<värde>])...]\n" +" [--parse] [<fil>...]" msgid "edit files in place" msgstr "redigera filer på plats" @@ -7735,11 +7769,11 @@ msgstr "" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" " [--symref] [<repository> [<refs>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<nyckel>]\n" " [--symref] [<arkiv> [<referenser>...]]" msgid "do not print remote URL" @@ -7868,12 +7902,12 @@ msgstr "git merge-base [-a | --all] <incheckning> <incheckning>..." msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <incheckning>..." -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <incheckning>..." - msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <incheckning> <incheckning>" +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <incheckning>..." + msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <ref> [<incheckning>]" @@ -7981,9 +8015,20 @@ msgstr "lista filnamn utan lägen/oid/köer" msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" +msgid "perform multiple merges, one per line of input" +msgstr "utför flera sammanslagningar, en per indatarad" + msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge är inkompatibelt med andra flaggor" +#, c-format +msgid "malformed input line: '%s'." +msgstr "felaktig indatarad: \"%s\"." + +#, c-format +msgid "merging cannot continue; got unclean result of %d" +msgstr "sammanslagning kan inte fortsätta; fick inte rent resultat från %d" + msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<flaggor>] [<incheckning>...]" @@ -8600,10 +8645,6 @@ msgid "cannot read note data from non-blob object '%s'." msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"." #, c-format -msgid "malformed input line: '%s'." -msgstr "felaktig indatarad: \"%s\"." - -#, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\"" @@ -8794,15 +8835,13 @@ msgstr "använd anteckningar från <anteckningsref>" msgid "unknown subcommand: `%s'" msgstr "okänt underkommando: \"%s\"" -msgid "" -"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" -msgstr "" -"git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]" +msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]" +msgstr "git pack-objects --stdout [<flaggor>] [< <reflista> | < <objektlista>]" msgid "" -"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" +"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -"git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" +"git pack-objects [<flaggor>] <basnamn> [< <reflista> | < <objektlista>]" #, c-format msgid "" @@ -9176,8 +9215,8 @@ msgstr "" "oss att du fortfarande använder det på e-post till\n" "<git@vger.kernel.org>. Tack.\n" -msgid "git pack-refs [<options>]" -msgstr "git pack-refs [<flaggor>]" +msgid "git pack-refs [--all] [--no-prune]" +msgstr "git pack-refs [--all] [--no-prune]" msgid "pack everything" msgstr "packa allt" @@ -9185,6 +9224,18 @@ msgstr "packa allt" msgid "prune loose refs (default)" msgstr "ta bort lösa referenser (standard)" +msgid "git patch-id [--stable | --unstable | --verbatim]" +msgstr "git patch-id [--stable | --unstable | --verbatim]" + +msgid "use the unstable patch-id algorithm" +msgstr "använd den instabila patch-id-algoritmen" + +msgid "use the stable patch-id algorithm" +msgstr "använd den stabila patch-id-algoritmen" + +msgid "don't strip whitespace from the patch" +msgstr "ta inte bort blanksteg från patchen" + msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]" @@ -9397,14 +9448,13 @@ msgstr "" msgid "" "\n" -"To avoid automatically configuring upstream branches when their name\n" -"doesn't match the local branch, see option 'simple' of branch." -"autoSetupMerge\n" +"To avoid automatically configuring an upstream branch when its name\n" +"won't match the local branch, see option 'simple' of branch.autoSetupMerge\n" "in 'git help config'.\n" msgstr "" "\n" -"För att undvika att uppströmsgrenar automatiskt konfigureras när deras\n" -"namn inte motsvarar en lokal gren, se värdet \"simple\" i branch." +"För att undvika att en uppströmsgren automatiskt konfigureras när dess namn\n" +"inte motsvarar den lokala grenen, se värdet \"simple\" i branch." "autoSetupMerge\n" "i \"git help config\".\n" @@ -9556,6 +9606,13 @@ msgstr "Sänder till %s\n" msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" +msgid "" +"recursing into submodule with push.recurseSubmodules=only; using on-demand " +"instead" +msgstr "" +"rekurserar in i undermoduler med push.recurseSubmodules=only; använder " +"istället vid behov" + #, c-format msgid "invalid value for '%s'" msgstr "ogiltigt värde för \"%s\"" @@ -9691,13 +9748,15 @@ msgid "need two commit ranges" msgstr "behöver två incheckningsintervall" msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" -"ish1> [<tree-ish2> [<tree-ish3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefix>)\n" +" [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n" +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u | -i]] [--no-sparse-checkout] [--index-output=<fil>] (--empty | <träd-" -"igt1> [<träd-igt2> [<träd-igt3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefix>)\n" +" [-u | -i]] [--index-output=<fil>] [--no-sparse-checkout]\n" +" (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])" msgid "write resulting index to <file>" msgstr "skriv resulterande index till <fil>" @@ -9787,12 +9846,12 @@ msgid "%s requires the merge backend" msgstr "%s kräver \"merge\"-bakändan" #, c-format -msgid "could not get 'onto': '%s'" -msgstr "kunde inte hämta \"onto\": \"%s\"" +msgid "invalid onto: '%s'" +msgstr "ogiltig \"onto\": \"%s\"" #, c-format msgid "invalid orig-head: '%s'" -msgstr "ogiltigt orig-head: \"%s\"" +msgstr "ogiltig \"orig-head\": \"%s\"" #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" @@ -10091,8 +10150,8 @@ msgstr "ingen sådan gren/incheckning: \"%s\"" msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -msgid "Could not resolve HEAD to a revision" -msgstr "Kunde inte bestämma HEAD:s incheckning" +msgid "Could not resolve HEAD to a commit" +msgstr "Kunde inte bestämma en incheckning för HEAD" #, c-format msgid "'%s': need exactly one merge base with branch" @@ -10746,6 +10805,10 @@ msgstr "kunde inte öppna temporär fil %s för skrivning" msgid "could not close refs snapshot tempfile" msgstr "kunde inte stänga temporär fil för refs-ögonblicksbild" +#, c-format +msgid "could not remove stale bitmap: %s" +msgstr "kunde inte ta bort gammal bitkarta: %s" + msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" @@ -10818,6 +10881,9 @@ msgstr "hitta ett geometrisk förlopp med faktor <N>" msgid "write a multi-pack index of the resulting packs" msgstr "skriv ett flerpaketsindex för de skapade paketen" +msgid "pack prefix to store a pack containing pruned objects" +msgstr "paketprefix att lagra ett paket som innehåller bortrensade objekt" + msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" @@ -10829,8 +10895,12 @@ msgid "pack prefix %s does not begin with objdir %s" msgstr "paketprefixet %s börjar inte med objkat %s" #, c-format -msgid "missing required file: %s" -msgstr "nödvändig fil saknas: %s" +msgid "renaming pack to '%s' failed" +msgstr "misslyckades byta namn på paket till \"%s\"" + +#, c-format +msgid "pack-objects did not write a '%s' file for pack %s-%s" +msgstr "pack-objects skrev inte en \"%s\"-fil för paketet %s-%s" #, c-format msgid "could not unlink: %s" @@ -11024,8 +11094,10 @@ msgstr "--convert-graft-file tar inga argument" msgid "only one pattern can be given with -l" msgstr "endast ett mönster kan anges med -l" -msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget <path>... | status | remaining | diff | gc]" +msgid "" +"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]" +msgstr "" +"git rerere [clear | forget <sökväg>... | diff | status | remaining | gc]" msgid "register clean resolutions in index" msgstr "registrera rena lösningar i indexet" @@ -11229,6 +11301,15 @@ msgstr "--prefix kräver ett argument" msgid "unknown mode for --abbrev-ref: %s" msgstr "okänt läge för --abbrev-ref: %s" +msgid "--exclude-hidden cannot be used together with --branches" +msgstr "--exclude-hidden kan endast användas tillsammans med --branches" + +msgid "--exclude-hidden cannot be used together with --tags" +msgstr "--exclude-hidden kan kan inte användas tillsammans med --tags" + +msgid "--exclude-hidden cannot be used together with --remotes" +msgstr "--exclude-hidden kan kan inte användas tillsammans med --remotes" + msgid "this operation must be run in a work tree" msgstr "funktionen måste köras i en arbetskatalog" @@ -11236,17 +11317,25 @@ msgstr "funktionen måste köras i en arbetskatalog" msgid "unknown mode for --show-object-format: %s" msgstr "okänt läge för --show-object-format: %s" -msgid "git revert [<options>] <commit-ish>..." -msgstr "git revert [<flaggor>] <incheckning-igt>..." +msgid "" +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] " +"<commit>..." +msgstr "" +"git revert [--[no-]edit] [-n] [-m <förälder-nummer>] [-s] [-S[<nyckelid>]] " +"<incheckning>..." -msgid "git revert <subcommand>" -msgstr "git revert <underkommando>" +msgid "git revert (--continue | --skip | --abort | --quit)" +msgstr "git revert (--continue | --skip | --abort | --quit)" -msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "git cherry-pick [<flaggor>] <incheckning-igt>..." +msgid "" +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" +" [-S[<keyid>]] <commit>..." +msgstr "" +"git cherry-pick [--edit] [-n] [-m <förälder-nummer>] [-s] [-x] [--ff]\n" +" [-S[<nyckelid>]] <incheckning>..." -msgid "git cherry-pick <subcommand>" -msgstr "git cherry-pick <underkommando>" +msgid "git cherry-pick (--continue | --skip | --abort | --quit)" +msgstr "git cherry-pick (--continue | --skip | --abort | --quit)" #, c-format msgid "option `%s' expects a number greater than zero" @@ -11307,8 +11396,14 @@ msgstr "\"revert\" misslyckades" msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" -msgid "git rm [<options>] [--] <file>..." -msgstr "git rm [<flaggor>] [--] <fil>..." +msgid "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +" [--] [<pathspec>...]" +msgstr "" +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n" +" [--quiet] [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n" +" [--] [<sökväg>...]" msgid "" "the following file has staged content different from both the\n" @@ -11379,11 +11474,13 @@ msgid "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<host>:]<directory> (--all | <ref>...)" msgstr "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" " [--verbose] [--thin] [--atomic]\n" +" [--[no-]signed | --signed=(true|false|if-asked)]\n" " [<värd>:]<katalog> (--all | <ref>...)" msgid "remote name" @@ -11407,8 +11504,9 @@ msgstr "git log --pretty=short | git shortlog [<flaggor>]" msgid "using multiple --group options with stdin is not supported" msgstr "mer än en \"--group\"-flagga stöds inte med standard in" -msgid "using --group=trailer with stdin is not supported" -msgstr "att använda --group=trailer stöds inte med standard in" +#, c-format +msgid "using %s with stdin is not supported" +msgstr "använda %s med standard in stöds inte" #, c-format msgid "unknown group type: %s" @@ -11445,12 +11543,14 @@ msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<when>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <glob>)...]" msgstr "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<när>] | --no-color] [--sparse]\n" " [--more=<n> | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]" +" [--no-name | --sha1-name] [--topics]\n" +" [(<rev> | <mönster>)...]" msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]" @@ -11550,11 +11650,13 @@ msgid "Unknown hash algorithm" msgstr "okänd hashningsalgoritm" msgid "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<pattern>...]" msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mönster>...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n" +" [--heads] [--] [<mönster>...]" msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<mönster>]" @@ -11583,8 +11685,10 @@ msgstr "visa inte resultat på standard ut (användbart med --verify)" msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser från standard in som inte finns i lokalt arkiv" -msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <flaggor>" +msgid "" +"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]" +msgstr "" +"git sparse-checkout (init | list | set | add | reapply | disable) <flaggor>" msgid "this worktree is not sparse" msgstr "arbetskatalogen är inte gren" @@ -11707,67 +11811,58 @@ msgstr "" msgid "error while refreshing working directory" msgstr "fel vid uppdatering av arbetskatalog" -msgid "git stash list [<options>]" -msgstr "git stash list [<flaggor>]" +msgid "git stash list [<log-options>]" +msgstr "git stash list [<\"log\"-flaggor>]" + +msgid "" +"git stash show [-u | --include-untracked | --only-untracked] [<diff-" +"options>] [<stash>]" +msgstr "" +"git stash show [-u | --include-untracked | --only-untracked] [<\"diff\"-" +"flaggor>] [<stash>]" -msgid "git stash show [<options>] [<stash>]" -msgstr "git stash show [<flaggor>] [<stash>]" +msgid "git stash drop [-q | --quiet] [<stash>]" +msgstr "git stash drop [-q | --quiet] [<stash>]" -msgid "git stash drop [-q|--quiet] [<stash>]" -msgstr "git stash drop [-q|--quiet] [<stash>]" +msgid "git stash pop [--index] [-q | --quiet] [<stash>]" +msgstr "git stash pop [--index] [-q | --quiet] [<stash>]" -msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +msgid "git stash apply [--index] [-q | --quiet] [<stash>]" +msgstr "git stash apply [--index] [-q | --quiet] [<stash>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <grennamn> [<stash>]" +msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>" +msgstr "" +"git stash store [(-m | --message) <meddelande>] [-q | --quiet] <incheckning>" + msgid "" -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q " +"| --quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message) " +"<message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -"git stash [push [-p|--patch] [S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n" +"git stash [push [-p | --patch] [S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [(-m | --message " +"<meddelande>]\n" " [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n" " [--] [<sökväg>...]]" msgid "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<message>]" msgstr "" -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" -"quiet]\n" -" [-u|--include-untracked] [-a|--all] [<meddelande>]" +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | " +"--quiet]\n" +" [-u | --include-untracked] [-a | --all] [<meddelande>]" -msgid "git stash pop [--index] [-q|--quiet] [<stash>]" -msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" - -msgid "git stash apply [--index] [-q|--quiet] [<stash>]" -msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" - -msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" -msgstr "git stash store [-m|--message <meddelande>] [-q|--quiet] <incheckning>" - -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n" -" [--] [<sökväg>...]]" - -msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" -msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<meddelande>]" +msgid "git stash create [<message>]" +msgstr "git stash create [<meddelande>]" #, c-format msgid "'%s' is not a stash-like commit" @@ -12327,9 +12422,6 @@ msgstr "traversera undermoduler rekursivt" msgid "don't fetch new objects from the remote site" msgstr "hämta inte nya objekt från fjärrplatsen" -msgid "path into the working tree" -msgstr "sökväg inuti arbetskatalogen" - msgid "use the 'checkout' update strategy (default)" msgstr "använd uppdateringsstrategin \"checkout\" (utcheckning; förval)" @@ -12365,27 +12457,9 @@ msgstr "" "[no-]recommend-shallow] [--reference <arkiv>] [--recursive] [--[no-]single-" "branch] [--] [<sökväg>...]" -msgid "recurse into submodules" -msgstr "rekursera ner i undermoduler" - msgid "git submodule absorbgitdirs [<options>] [<path>...]" msgstr "git submodule absorbgitdirs [<flaggor>] [<sökväg>...]" -msgid "check if it is safe to write to the .gitmodules file" -msgstr "se om det är säkert att skriva till .gitmodules-filen" - -msgid "unset the config in the .gitmodules file" -msgstr "ta bort konfigurationen från .gitmodules-filen" - -msgid "git submodule--helper config <name> [<value>]" -msgstr "git submodule--helper config <namn> [<värde>]" - -msgid "git submodule--helper config --unset <name>" -msgstr "git submodule--helper config --unset <namn>" - -msgid "please make sure that the .gitmodules file is in the working tree" -msgstr "se till att .gitmodules finns i arbetskatalogen" - msgid "suppress output for setting url of a submodule" msgstr "dölj utdata från inställning av url för undermodul" @@ -12464,6 +12538,9 @@ msgstr "Aktiverar lokal git-katalog för undermodulen \"%s\" på nytt.\n" msgid "unable to checkout submodule '%s'" msgstr "Kan inte checka ut undermodulen \"%s\"" +msgid "please make sure that the .gitmodules file is in the working tree" +msgstr "se till att .gitmodules finns i arbetskatalogen" + #, c-format msgid "Failed to add submodule '%s'" msgstr "Misslyckades lägga till undermodulen \"%s\"" @@ -12514,19 +12591,21 @@ msgstr "arkiv-URL: \"%s\" måste vara absolut eller börja med ./|../" msgid "'%s' is not a valid submodule name" msgstr "\"%s\" är inte ett giltigt namn på undermodul" +msgid "git submodule--helper <command>" +msgstr "git submodule--helper <kommando>" + #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#, c-format -msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" +msgid "git symbolic-ref [-m <reason>] <name> <ref>" +msgstr "git symbolic-ref [-m <orsak>] <namn> <ref>" -msgid "git symbolic-ref [<options>] <name> [<ref>]" -msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]" +msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>" +msgstr "git symbolic-ref [-q] [--short] [--no-recurse] <namn>" -msgid "git symbolic-ref -d [-q] <name>" -msgstr "git symbolic-ref -d [-q] <namn>" +msgid "git symbolic-ref --delete [-q] <name>" +msgstr "git symbolic-ref --delete [-q] <namn>" msgid "suppress error message for non-symbolic (detached) refs" msgstr "" @@ -12538,6 +12617,9 @@ msgstr "ta bort symbolisk referens" msgid "shorten ref output" msgstr "förkorta ref-utdata" +msgid "recursively dereference (default)" +msgstr "avreferera rekursivt (standard)" + msgid "reason" msgstr "skäl" @@ -12545,25 +12627,26 @@ msgid "reason of the update" msgstr "skäl till uppdateringen" msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" -" <tagname> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n" +" <tagname> [<commit> | <object>]" msgstr "" -"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>]\n" -" <taggnamn> [<huvud>]" +"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>] [-e]\n" +" <taggnamn> [<incheckning> | <objekt>]" msgid "git tag -d <tagname>..." msgstr "git tag -d <taggnamn>..." msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" -"points-at <object>]\n" -" [--format=<format>] [--merged <commit>] [--no-merged <commit>] " -"[<pattern>...]" +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n" +" [--points-at <object>] [--column[=<options>] | --no-column]\n" +" [--create-reflog] [--sort=<key>] [--format=<format>]\n" +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]" msgstr "" -"git tag -l [-n[<antal>]] [--contains <incheckning>] [--no-contains " -"<incheckning>] [--points-at <objekt>]\n" -" [--format=<format>] [--merged <incheckning>] [--no-merged " -"<incheckning>] [<mönster>...]" +"git tag [-n[<antal>]] -l [--contains <incheckning>] [--no-contains " +"<incheckning>\n" +" [--points-at <objekt>] [--column[=<flaggor>] | --no-column]\n" +" [--create-reflog] [--sort=<nyckel>] [--format=<format>]\n" +" [--merged <incheckning>] [--no-merged <incheckning>] [<mönster>...]" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <taggnamn>..." @@ -12938,8 +13021,12 @@ msgstr "läs uppdateringar från standard in" msgid "update the info files from scratch" msgstr "uppdatera informationsfilerna från grunden" -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<flaggor>] <katalog>" +msgid "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <directory>" +msgstr "" +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n" +" [--advertise-refs] <katalog>" msgid "quit after a single request/response exchange" msgstr "avsluta omedelbart efter första anrop/svar-utväxling" @@ -12953,8 +13040,8 @@ msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "avbryt överföringen efter <n> sekunders inaktivitet" -msgid "git verify-commit [-v | --verbose] <commit>..." -msgstr "git verify-commit [-v | --verbose] <incheckning>..." +msgid "git verify-commit [-v | --verbose] [--raw] <commit>..." +msgstr "git verify-commit [-v | --verbose] [--raw] <incheckning>..." msgid "print commit contents" msgstr "visa innehåll för incheckning" @@ -12962,8 +13049,9 @@ msgstr "visa innehåll för incheckning" msgid "print raw gpg status output" msgstr "visa råa gpg-statusdata" -msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..." +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..." +msgstr "" +"git verify-pack [-v | --verbose] [-s | --stat-only] [--] <paket>.idx..." msgid "verbose" msgstr "pratsam" @@ -12971,35 +13059,39 @@ msgstr "pratsam" msgid "show statistics only" msgstr "visa endast statistik" -msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." -msgstr "git verify-tag [-v | --verbose] [--format=<format>] <tagg>..." +msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tagg>..." msgid "print tag contents" msgstr "visa innehåll för tag" -msgid "git worktree add [<options>] <path> [<commit-ish>]" -msgstr "git worktree add [<flaggor>] <sökväg> [<incheckning-igt>]" +msgid "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n" +" [-b <new-branch>] <path> [<commit-ish>]" +msgstr "" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <sträng>]]\n" +" [-b <ny-gren>] <sökväg> [<incheckning-igt>]" -msgid "git worktree list [<options>]" -msgstr "git worktree list [<flaggor>]" +msgid "git worktree list [-v | --porcelain [-z]]" +msgstr "git worktree list [-v | --porcelain [-z]]" -msgid "git worktree lock [<options>] <path>" -msgstr "git worktree lock [<flaggor>] <sökväg>" +msgid "git worktree lock [--reason <string>] <worktree>" +msgstr "git worktree lock [--reason <sträng>] <arbetskatalog>" msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbetskatalog> <ny-sökväg>" -msgid "git worktree prune [<options>]" -msgstr "git worktree prune [<flaggor>]" +msgid "git worktree prune [-n] [-v] [--expire <expire>]" +msgstr "git worktree prune [-n] [-v] [--expire <utgår>]" -msgid "git worktree remove [<options>] <worktree>" -msgstr "git worktree remove [<flaggor>] <arbetskatalog>" +msgid "git worktree remove [-f] <worktree>" +msgstr "git worktree remove [-f] <arbetskatalog>" msgid "git worktree repair [<path>...]" msgstr "git worktree repair [<sökväg>...]" -msgid "git worktree unlock <path>" -msgstr "git worktree unlock <sökväg>" +msgid "git worktree unlock <worktree>" +msgstr "git worktree unlock <arbetskatalog>" #, c-format msgid "Removing %s/%s: %s" @@ -13235,6 +13327,10 @@ msgstr "endast användbart vid felsökning" msgid "core.fsyncMethod = batch is unsupported on this platform" msgstr "core.fsyncMethod = batch stöds inte på denna plattform" +#, c-format +msgid "bundle list at '%s' has no mode" +msgstr "buntlistan på \"%s\" har inget läge" + msgid "failed to create temporary file" msgstr "misslyckades skapa temporär fil" @@ -13242,16 +13338,29 @@ msgid "insufficient capabilities" msgstr "otillräckliga kapabiliteter" #, c-format +msgid "unrecognized bundle mode from URI '%s'" +msgstr "okänt buntlägre från URI:en \"%s\"" + +#, c-format +msgid "exceeded bundle URI recursion limit (%d)" +msgstr "överskred buntens URI-rekursionsgräns (%d)" + +#, c-format msgid "failed to download bundle from URI '%s'" msgstr "kunde inte hämta bunt från URI:en \"%s\"" #, c-format -msgid "file at URI '%s' is not a bundle" -msgstr "filen på URI \"%s\" är inte en bunt" +msgid "file at URI '%s' is not a bundle or bundle list" +msgstr "filen på URI:en \"%s\" är inte en bunt eller buntlista" -#, c-format -msgid "failed to unbundle bundle from URI '%s'" -msgstr "misslyckades packa upp bunten från URI:en \"%s\"" +msgid "bundle-uri: got an empty line" +msgstr "bunt-uri: fick en tom rad" + +msgid "bundle-uri: line is not of the form 'key=value'" +msgstr "bunt-uri: raden är inte på formen \"nyckel=värde\"" + +msgid "bundle-uri: line has empty key or value" +msgstr "bunt-uri: raden har tom nyckel eller värde" #, c-format msgid "unrecognized bundle hash algorithm: %s" @@ -13822,7 +13931,7 @@ msgstr "Filformat för bunt" msgid "Chunk-based file formats" msgstr "Styckebaserade filformat" -msgid "Git commit graph format" +msgid "Git commit-graph format" msgstr "Format för Git-incheckningsgraf" msgid "Git index format" @@ -14175,6 +14284,10 @@ msgstr "ohanterat fall i \"has_worktree_moved\": %d" msgid "health thread wait failed [GLE %ld]" msgstr "misslyckades vänta på hälsotråden [GLE %ld]" +#, c-format +msgid "Invalid path: %s" +msgstr "ogiltig sökväg: %s" + msgid "Unable to create FSEventStream." msgstr "kunde inte skapa FSEventStream." @@ -14206,6 +14319,22 @@ msgid "could not read directory changes [GLE %ld]" msgstr "kunde inte läsa katalogändringar [GLE %ld]" #, c-format +msgid "opendir('%s') failed" +msgstr "opendir('%s') misslyckades" + +#, c-format +msgid "lstat('%s') failed" +msgstr "lstat('%s') misslyckades" + +#, c-format +msgid "strbuf_readlink('%s') failed" +msgstr "strbuf_readlink('%s') misslyckades" + +#, c-format +msgid "closedir('%s') failed" +msgstr "closedir('%s') misslyckades" + +#, c-format msgid "[GLE %ld] unable to open for read '%ls'" msgstr "[GLE %ld] kunde inte öppna \"%ls\" för läsning" @@ -15804,10 +15933,11 @@ msgstr "det virtuella arkivet \"%s\" är inkompatibelt med fsmonitor" #, c-format msgid "" -"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets" +"socket directory '%s' is incompatible with fsmonitor due to lack of Unix " +"sockets support" msgstr "" -"arkivet \"%s\" är inkompatibelt med fsmonitor på grund av avsaknad av Unix-" -"uttag" +"uttagskatalogen \"%s\" är inkompatibelt med fsmonitor på grund av avsaknad " +"av Unix-uttag" msgid "" "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" @@ -16128,8 +16258,8 @@ msgstr[1] "" "\n" "Mest lika kommandon är" -msgid "git version [<options>]" -msgstr "git version [<flaggor>]" +msgid "git version [--build-options]" +msgstr "git version [--build-options]" #, c-format msgid "%s: %s - %s" @@ -17041,10 +17171,6 @@ msgstr "kunde inte normalisera supplerande objektsökväg: %s" msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignorerar supplerande objektlager, för djup nästling" -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "kan inte normalisera objektkatalogen: %s" - msgid "unable to fdopen alternates lockfile" msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil" @@ -17867,6 +17993,10 @@ msgstr "" msgid "promisor remote name cannot begin with '/': %s" msgstr "kontraktsfjärr kan inte börja med \"/\": %s" +#, c-format +msgid "could not fetch %s from promisor remote" +msgstr "kunde inte hämta %s från kontraktsfjärr" + msgid "object-info: expected flush after arguments" msgstr "object-info: förväntade \"flush\" efter argument" @@ -18937,6 +19067,13 @@ msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." #, c-format +msgid "unsupported section for hidden refs: %s" +msgstr "sktionen för dolda referenser stöds ej: %s" + +msgid "--exclude-hidden= passed more than once" +msgstr "--exclude-hidden= angavs mer än en gång" + +#, c-format msgid "resolve-undo records `%s` which is missing" msgstr "resolve-undo registrerar \"%s\" som saknas" @@ -19080,6 +19217,14 @@ msgid "--all or <enlistment>, but not both" msgstr "--all eller <enrollering>, men inte bägge" #, c-format +msgid "could not remove stale scalar.repo '%s'" +msgstr "kunde inte ta bort gammal scalar.repo \"%s\"" + +#, c-format +msgid "removing stale scalar.repo '%s'" +msgstr "tar bort gammal scalar.repo \"%s\"" + +#, c-format msgid "git repository gone in '%s'" msgstr "git-arkiv försvunnet i \"%s\"" @@ -19702,16 +19847,16 @@ msgstr "" msgid "illegal label name: '%.*s'" msgstr "ogiltigt etikettnamn: \"%.*s\"" +#, c-format +msgid "could not resolve '%s'" +msgstr "kunde inte upplösa \"%s\"" + msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" msgid "writing squash-onto" msgstr "skriver squash-onto" -#, c-format -msgid "could not resolve '%s'" -msgstr "kunde inte upplösa \"%s\"" - msgid "cannot merge without a current revision" msgstr "kan inte slå ihop utan en aktuell incheckning" @@ -20308,6 +20453,15 @@ msgstr "ls-tree returnerade en oväntad returkod %d" msgid "failed to lstat '%s'" msgstr "misslyckades ta status (lstat) på \"%s\"" +msgid "test-tool cache-tree <options> (control|prime|update)" +msgstr "test-tool cache-tree <flaggor> (control|prime|update)" + +msgid "clear the cache tree before each iteration" +msgstr "töm cacheträdet före varje iteration" + +msgid "number of entries in the cache tree to invalidate (default 0)" +msgstr "antal poster i cacheträdet att ogiltigförklara (förval är 0)" + msgid "unhandled options" msgstr "flaggor som inte hanterats" |