diff options
Diffstat (limited to 'po/sv.po')
| -rw-r--r-- | po/sv.po | 3225 |
1 files changed, 1736 insertions, 1489 deletions
@@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: git 2.0.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2014-08-04 14:48+0800\n" -"PO-Revision-Date: 2014-08-05 13:44+0100\n" +"POT-Creation-Date: 2014-11-20 09:42+0800\n" +"PO-Revision-Date: 2014-11-20 16:10+0800\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -25,106 +25,104 @@ msgstr "tips: %.*s\n" #: advice.c:88 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" -"as appropriate to mark resolution and make a commit, or use\n" -"'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n" -"som lämpligt för att ange lösning och checka in, eller använd\n" -"\"git commit -a\"." +"som lämpligt för att ange lösning och checka in." -#: archive.c:10 +#: archive.c:11 msgid "git archive [options] <tree-ish> [<path>...]" msgstr "git archive [flaggor] <träd-igt> [<sökväg>...]" -#: archive.c:11 +#: archive.c:12 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:12 +#: archive.c:13 msgid "" "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" msgstr "" "git archive --remote <arkiv> [--exec <kmd>] [flaggor] <träd-igt> " "[<sökväg>...]" -#: archive.c:13 +#: archive.c:14 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328 +#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: archive.c:328 +#: archive.c:419 msgid "fmt" msgstr "fmt" -#: archive.c:328 +#: archive.c:419 msgid "archive format" msgstr "arkivformat" -#: archive.c:329 builtin/log.c:1201 +#: archive.c:420 builtin/log.c:1204 msgid "prefix" msgstr "prefix" -#: archive.c:330 +#: archive.c:421 msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709 -#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412 -#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151 +#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411 +#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151 msgid "file" msgstr "fil" -#: archive.c:332 builtin/archive.c:89 +#: archive.c:423 builtin/archive.c:89 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:334 +#: archive.c:425 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:335 +#: archive.c:426 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:336 +#: archive.c:427 msgid "store only" msgstr "endast spara" -#: archive.c:337 +#: archive.c:428 msgid "compress faster" msgstr "komprimera snabbare" -#: archive.c:345 +#: archive.c:436 msgid "compress better" msgstr "komprimera bättre" -#: archive.c:348 +#: archive.c:439 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84 +#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85 msgid "repo" msgstr "arkiv" -#: archive.c:351 builtin/archive.c:91 +#: archive.c:442 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491 +#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490 msgid "command" msgstr "kommando" -#: archive.c:353 builtin/archive.c:93 +#: archive.c:444 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" -#: attr.c:259 +#: attr.c:258 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -184,31 +182,31 @@ msgstr "Grenen %s ställdes in att spåra den lokala referensen %s." msgid "Not tracking: ambiguous information for ref %s" msgstr "Spårar inte: tvetydig information för referensen %s" -#: branch.c:178 +#: branch.c:162 #, c-format msgid "'%s' is not a valid branch name." msgstr "\"%s\" är inte ett giltigt grennamn." -#: branch.c:183 +#: branch.c:167 #, c-format msgid "A branch named '%s' already exists." msgstr "Det finns redan en gren som heter \"%s\"" -#: branch.c:191 +#: branch.c:175 msgid "Cannot force update the current branch." msgstr "Kan inte tvinga uppdatering av aktuell gren." -#: branch.c:211 +#: branch.c:195 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren." -#: branch.c:213 +#: branch.c:197 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte" -#: branch.c:215 +#: branch.c:199 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -228,107 +226,105 @@ msgstr "" "spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n" "för att ställa in uppströmskonfigurationen när du sänder in." -#: branch.c:260 +#: branch.c:243 #, c-format msgid "Not a valid object name: '%s'." msgstr "Objektnamnet är inte giltigt: \"%s\"." -#: branch.c:280 +#: branch.c:263 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Objektnamnet är tvetydigt: \"%s\"." -#: branch.c:285 +#: branch.c:268 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten är inte giltig: \"%s\"" -#: branch.c:291 -msgid "Failed to lock ref for update" -msgstr "Misslyckades låsa referens för uppdatering" - -#: branch.c:309 -msgid "Failed to write ref" -msgstr "Misslyckades skriva referens" - -#: bundle.c:33 +#: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ser inte ut som en v2-bundle-fil" -#: bundle.c:60 +#: bundle.c:61 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:86 builtin/commit.c:755 +#: bundle.c:87 builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" -#: bundle.c:138 +#: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330 -#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357 +#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706 +#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" -#: bundle.c:184 +#: bundle.c:185 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Paketet (bundlen) innehåller denna referens:" msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:" -#: bundle.c:191 +#: bundle.c:192 msgid "The bundle records a complete history." msgstr "Paketet (bundlen) beskriver en komplett historik." -#: bundle.c:193 +#: bundle.c:194 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Paketet (bundlen) kräver denna referens:" msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:" -#: bundle.c:289 +#: bundle.c:251 +msgid "Could not spawn pack-objects" +msgstr "Kunde inte starta pack-objects" + +#: bundle.c:269 +msgid "pack-objects died" +msgstr "pack-objects misslyckades" + +#: bundle.c:309 msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261 -#, c-format -msgid "unrecognized argument: %s" -msgstr "okänt argument: %s" - -#: bundle.c:330 +#: bundle.c:358 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:375 +#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#, c-format +msgid "unrecognized argument: %s" +msgstr "okänt argument: %s" + +#: bundle.c:444 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." -#: bundle.c:390 -msgid "Could not spawn pack-objects" -msgstr "Kunde inte starta pack-objects" - -#: bundle.c:408 -msgid "pack-objects died" -msgstr "pack-objects misslyckades" - -#: bundle.c:411 +#: bundle.c:454 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:433 +#: bundle.c:475 msgid "index-pack died" msgstr "index-pack dog" +#: color.c:157 +#, c-format +msgid "invalid color value: %.*s" +msgstr "felaktigt färgvärde: %.*s" + #: commit.c:40 #, c-format msgid "could not parse %s" @@ -343,16 +339,69 @@ msgstr "%s %s är inte en incheckning!" msgid "memory exhausted" msgstr "minnet slut" -#: connected.c:70 +#: config.c:469 config.c:471 +#, c-format +msgid "bad config file line %d in %s" +msgstr "felaktig konfigurationsfil rad %d i %s" + +#: config.c:587 +#, 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:589 +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" + +#: config.c:674 +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "misslyckades expandera användarkatalog i: \"%s\"" + +#: config.c:752 config.c:763 +#, c-format +msgid "bad zlib compression level %d" +msgstr "felaktigt zlib-komprimeringsgrad %d" + +#: config.c:885 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "felaktigt läge för skapande av objekt: %s" + +#: config.c:1201 +msgid "unable to parse command-line config" +msgstr "kan inte tolka kommandoradskonfiguration" + +#: config.c:1262 +msgid "unknown error occured while reading the configuration files" +msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" + +#: config.c:1586 +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" + +#: config.c:1588 +#, 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:1647 +#, c-format +msgid "%s has multiple values" +msgstr "%s har flera värden" + +#: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:90 +#: connected.c:89 #, c-format msgid "failed write to rev-list: %s" msgstr "kunde inte skriva till rev-list: %s" -#: connected.c:98 +#: connected.c:97 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "kunde inte stänga rev-list:s standard in: %s" @@ -430,7 +479,7 @@ msgstr[1] "%lu år sedan" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:514 +#: diffcore-rename.c:516 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" @@ -449,7 +498,7 @@ msgstr " Okänd dirstat-parameter \"%s\"\n" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:267 +#: diff.c:266 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -458,16 +507,16 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:2934 +#: diff.c:2957 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:3329 +#: diff.c:3352 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:3492 +#: diff.c:3515 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -476,44 +525,44 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3506 +#: diff.c:3529 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: gpg-interface.c:73 gpg-interface.c:145 +#: gpg-interface.c:129 gpg-interface.c:200 msgid "could not run gpg." msgstr "kunde inte köra gpg." -#: gpg-interface.c:85 +#: gpg-interface.c:141 msgid "gpg did not accept the data" msgstr "gpg godtog inte data" -#: gpg-interface.c:96 +#: gpg-interface.c:152 msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" -#: gpg-interface.c:129 +#: gpg-interface.c:185 #, c-format msgid "could not create temporary file '%s': %s" msgstr "kunde inte skapa temporära filen \"%s\": %s" -#: gpg-interface.c:132 +#: gpg-interface.c:188 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "misslyckades skriva fristående signatur till \"%s\": %s" -#: grep.c:1703 +#: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1720 +#: grep.c:1735 #, c-format msgid "'%s': %s" msgstr "\"%s\": %s" -#: grep.c:1731 +#: grep.c:1746 #, c-format msgid "'%s': short read %s" msgstr "\"%s\": kort läsning %s" @@ -582,87 +631,95 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: merge.c:40 +#: lockfile.c:275 +msgid "BUG: reopen a lockfile that is still open" +msgstr "FEL: återöppna en låsfil som fortfarande är öppen" + +#: lockfile.c:277 +msgid "BUG: reopen a lockfile that has been committed" +msgstr "FEL: återöppna en låsfil som har överlämnats" + +#: merge.c:41 msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556 -#: builtin/clone.c:661 +#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562 +#: builtin/clone.c:659 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: merge-recursive.c:190 +#: merge-recursive.c:189 #, c-format msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" -#: merge-recursive.c:210 +#: merge-recursive.c:209 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "addinfo_cache misslyckades för sökvägen \"%s\"" -#: merge-recursive.c:271 +#: merge-recursive.c:270 msgid "error building trees" msgstr "fel vid byggande av träd" -#: merge-recursive.c:692 +#: merge-recursive.c:691 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:703 +#: merge-recursive.c:702 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Tar bort %s för att göra plats för underkatalog\n" -#: merge-recursive.c:717 merge-recursive.c:738 +#: merge-recursive.c:716 merge-recursive.c:737 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:728 +#: merge-recursive.c:727 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:768 +#: merge-recursive.c:767 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:770 +#: merge-recursive.c:769 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:793 builtin/clone.c:317 +#: merge-recursive.c:792 builtin/clone.c:318 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: merge-recursive.c:801 +#: merge-recursive.c:800 #, c-format msgid "failed to symlink '%s'" msgstr "misslyckades skapa symboliska länken \"%s\"" -#: merge-recursive.c:804 +#: merge-recursive.c:803 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" skall hanteras" -#: merge-recursive.c:942 +#: merge-recursive.c:941 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:946 +#: merge-recursive.c:945 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:962 +#: merge-recursive.c:961 msgid "unsupported object type in the tree" msgstr "objekttyp som ej stöds upptäcktes i trädet" -#: merge-recursive.c:1037 merge-recursive.c:1051 +#: merge-recursive.c:1036 merge-recursive.c:1050 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -671,7 +728,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet." -#: merge-recursive.c:1043 merge-recursive.c:1056 +#: merge-recursive.c:1042 merge-recursive.c:1055 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -680,20 +737,20 @@ 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:1097 +#: merge-recursive.c:1096 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1097 +#: merge-recursive.c:1096 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1153 +#: merge-recursive.c:1152 #, 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:1175 +#: merge-recursive.c:1174 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -702,144 +759,144 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1180 +#: merge-recursive.c:1179 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1234 +#: merge-recursive.c:1233 #, 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:1264 +#: merge-recursive.c:1263 #, 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:1463 +#: merge-recursive.c:1462 #, 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:1473 +#: merge-recursive.c:1472 #, c-format msgid "Adding merged %s" msgstr "Lägger till sammanslagen %s" -#: merge-recursive.c:1478 merge-recursive.c:1676 +#: merge-recursive.c:1477 merge-recursive.c:1675 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:1529 +#: merge-recursive.c:1528 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:1532 +#: merge-recursive.c:1531 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modify" msgstr "ändra" -#: merge-recursive.c:1580 +#: merge-recursive.c:1579 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:1590 +#: merge-recursive.c:1589 msgid "content" msgstr "innehåll" -#: merge-recursive.c:1597 +#: merge-recursive.c:1596 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:1631 +#: merge-recursive.c:1630 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:1645 +#: merge-recursive.c:1644 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1649 git-submodule.sh:1150 +#: merge-recursive.c:1648 git-submodule.sh:1150 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:1650 +#: merge-recursive.c:1649 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:1740 +#: merge-recursive.c:1735 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:1765 +#: merge-recursive.c:1760 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:1771 +#: merge-recursive.c:1766 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:1776 +#: merge-recursive.c:1771 #, 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:1786 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1803 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa." -#: merge-recursive.c:1822 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Redan à jour!" -#: merge-recursive.c:1831 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:1861 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "Obehandlad sökväg??? %s" -#: merge-recursive.c:1906 +#: merge-recursive.c:1901 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:1919 +#: merge-recursive.c:1914 #, 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:1956 +#: merge-recursive.c:1951 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2013 +#: merge-recursive.c:2008 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2024 builtin/merge.c:666 +#: merge-recursive.c:2019 builtin/merge.c:666 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -864,33 +921,33 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" -#: object.c:234 +#: object.c:241 #, c-format msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" -#: parse-options.c:534 +#: parse-options.c:546 msgid "..." msgstr "..." -#: parse-options.c:552 +#: parse-options.c:564 #, c-format msgid "usage: %s" msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:556 +#: parse-options.c:568 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:559 +#: parse-options.c:571 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:593 +#: parse-options.c:605 msgid "-NUM" msgstr "-TAL" @@ -959,11 +1016,15 @@ msgstr "" "Ingenting att exkludera från med :(exkludera)-mönster.\n" "Glömde du kanske att antingen lägga till \":/\" eller \".\"?" +#: pretty.c:968 +msgid "unable to parse --pretty format" +msgstr "kunde inte tolka format för --pretty" + #: progress.c:225 msgid "done" msgstr "klart" -#: read-cache.c:1260 +#: read-cache.c:1261 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -972,7 +1033,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1270 +#: read-cache.c:1271 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -981,51 +1042,51 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: remote.c:753 +#: remote.c:782 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Kan inte hämta både %s och %s till %s" -#: remote.c:757 +#: remote.c:786 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:761 +#: remote.c:790 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:769 +#: remote.c:798 msgid "Internal error" msgstr "Internt fel" -#: remote.c:1943 +#: remote.c:1968 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n" -#: remote.c:1947 +#: remote.c:1972 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:1950 +#: remote.c:1975 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:1954 +#: remote.c:1979 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n" msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n" -#: remote.c:1960 +#: remote.c:1985 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n" -#: remote.c:1963 +#: remote.c:1988 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1035,11 +1096,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:1971 +#: remote.c:1996 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n" -#: remote.c:1974 +#: remote.c:1999 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1054,32 +1115,40 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:1984 +#: remote.c:2009 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n" -#: run-command.c:80 +#: run-command.c:87 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:82 +#: run-command.c:89 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) misslyckades" -#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893 -#: builtin/merge.c:1003 builtin/merge.c:1013 +#: send-pack.c:265 +msgid "failed to sign the push certificate" +msgstr "misslyckades underteckna push-certifikatet" + +#: send-pack.c:322 +msgid "the receiving end does not support --signed push" +msgstr "mottagarsidan stöder inte push med --signed" + +#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892 +#: builtin/merge.c:1002 builtin/merge.c:1012 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785 -#: builtin/merge.c:1005 builtin/merge.c:1018 +#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784 +#: builtin/merge.c:1004 builtin/merge.c:1017 #, c-format msgid "Could not write to '%s'" msgstr "Kunde inte skriva till \"%s\"" -#: sequencer.c:194 +#: sequencer.c:195 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -1087,7 +1156,7 @@ msgstr "" "efter att ha löst konflikterna, markera de rättade sökvägarna\n" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"" -#: sequencer.c:197 +#: sequencer.c:198 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -1097,228 +1166,224 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:210 sequencer.c:841 sequencer.c:924 +#: sequencer.c:211 sequencer.c:852 sequencer.c:935 #, c-format msgid "Could not write to %s" msgstr "Kunde inte skriva till %s" -#: sequencer.c:213 +#: sequencer.c:214 #, c-format msgid "Error wrapping up %s" msgstr "Fel vid ombrytning av %s" -#: sequencer.c:228 +#: sequencer.c:229 msgid "Your local changes would be overwritten by cherry-pick." msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"." -#: sequencer.c:230 +#: sequencer.c:231 msgid "Your local changes would be overwritten by revert." msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"." -#: sequencer.c:233 +#: sequencer.c:234 msgid "Commit your changes or stash them to proceed." msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta." -#: sequencer.c:250 -msgid "Failed to lock HEAD during fast_forward_to" -msgstr "Misslyckades låsa HEAD under \"fast_forward_to\"" - #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:293 +#: sequencer.c:304 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:324 +#: sequencer.c:335 msgid "Could not resolve HEAD commit\n" msgstr "Kunde inte bestämma HEAD:s incheckning\n" -#: sequencer.c:344 +#: sequencer.c:355 msgid "Unable to update cache tree\n" msgstr "Kan inte uppdatera cacheträd\n" -#: sequencer.c:391 +#: sequencer.c:402 #, c-format msgid "Could not parse commit %s\n" msgstr "Kunde inte tolka incheckningen %s\n" -#: sequencer.c:396 +#: sequencer.c:407 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:462 +#: sequencer.c:473 msgid "Your index file is unmerged." msgstr "Din indexfil har inte slagits ihop." -#: sequencer.c:481 +#: sequencer.c:492 #, 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:489 +#: sequencer.c:500 #, c-format msgid "Commit %s does not have parent %d" msgstr "Incheckning %s har inte förälder %d" -#: sequencer.c:493 +#: sequencer.c:504 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:506 +#: sequencer.c:517 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:510 +#: sequencer.c:521 #, c-format msgid "Cannot get commit message for %s" msgstr "Kan inte hämta incheckningsmeddelande för %s" -#: sequencer.c:596 +#: sequencer.c:607 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:597 +#: sequencer.c:608 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:633 +#: sequencer.c:644 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:641 +#: sequencer.c:652 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:645 +#: sequencer.c:656 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:705 +#: sequencer.c:716 #, c-format msgid "Cannot %s during a %s" msgstr "kan inte %s under en %s" -#: sequencer.c:727 +#: sequencer.c:738 #, c-format msgid "Could not parse line %d." msgstr "Kan inte tolka rad %d." -#: sequencer.c:732 +#: sequencer.c:743 msgid "No commits parsed." msgstr "Inga incheckningar lästes." -#: sequencer.c:745 +#: sequencer.c:756 #, c-format msgid "Could not open %s" msgstr "Kunde inte öppna %s" -#: sequencer.c:749 +#: sequencer.c:760 #, c-format msgid "Could not read %s." msgstr "kunde inte läsa %s." -#: sequencer.c:756 +#: sequencer.c:767 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Oanvändbart manus: %s" -#: sequencer.c:786 +#: sequencer.c:797 #, c-format msgid "Invalid key: %s" msgstr "Felaktig nyckel: %s" -#: sequencer.c:789 +#: sequencer.c:800 #, c-format msgid "Invalid value for %s: %s" msgstr "Felaktigt värde för %s: %s" -#: sequencer.c:801 +#: sequencer.c:812 #, c-format msgid "Malformed options sheet: %s" msgstr "Trasigt manus: %s" -#: sequencer.c:822 +#: sequencer.c:833 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:823 +#: sequencer.c:834 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:827 +#: sequencer.c:838 #, c-format msgid "Could not create sequencer directory %s" msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:843 sequencer.c:928 +#: sequencer.c:854 sequencer.c:939 #, c-format msgid "Error wrapping up %s." msgstr "Fel vid ombrytning av %s." -#: sequencer.c:862 sequencer.c:998 +#: sequencer.c:873 sequencer.c:1009 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:864 +#: sequencer.c:875 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:866 +#: sequencer.c:877 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:888 builtin/apply.c:4062 +#: sequencer.c:899 builtin/apply.c:4128 #, c-format msgid "cannot open %s: %s" msgstr "kan inte öppna %s: %s" -#: sequencer.c:891 +#: sequencer.c:902 #, c-format msgid "cannot read %s: %s" msgstr "kan inte läsa %s: %s" -#: sequencer.c:892 +#: sequencer.c:903 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:898 +#: sequencer.c:909 #, 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:921 +#: sequencer.c:932 #, c-format msgid "Could not format %s." msgstr "Kunde inte formatera %s." -#: sequencer.c:1066 +#: sequencer.c:1077 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:1069 +#: sequencer.c:1080 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:1103 +#: sequencer.c:1114 msgid "Can't revert as initial commit" msgstr "Kan inte ångra som första incheckning" -#: sequencer.c:1104 +#: sequencer.c:1115 msgid "Can't cherry-pick into empty head" msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" -#: sha1_name.c:439 +#: sha1_name.c:440 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" @@ -1340,21 +1405,21 @@ msgstr "" "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" "genom att köra \"git config advice.objectNameWarning false\"" -#: sha1_name.c:1060 +#: sha1_name.c:1068 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: sha1_name.c:1063 +#: sha1_name.c:1071 #, c-format msgid "No such branch: '%s'" msgstr "Okänd gren: \"%s\"" -#: sha1_name.c:1065 +#: sha1_name.c:1073 #, c-format msgid "No upstream configured for branch '%s'" msgstr "Ingen standarduppström angiven för grenen \"%s\"" -#: sha1_name.c:1069 +#: sha1_name.c:1077 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "Uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren" @@ -1384,16 +1449,41 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s" msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:1118 builtin/init-db.c:363 +#: submodule.c:1111 builtin/init-db.c:363 #, c-format msgid "Could not create git link %s" msgstr "Kunde inte skapa gitlänk %s" -#: submodule.c:1129 +#: submodule.c:1122 #, c-format msgid "Could not set core.worktree in %s" msgstr "Kunde inte sätta core.worktree i %s" +#: trailer.c:499 trailer.c:503 trailer.c:507 trailer.c:561 trailer.c:565 +#: trailer.c:569 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "okänt värde \"%s\" för nyckeln \"%s\"" + +#: trailer.c:551 trailer.c:556 builtin/remote.c:288 +#, c-format +msgid "more than one %s" +msgstr "mer än en %s" + +#: trailer.c:589 +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "tom släpradssymbol i släpraden \"%.*s\"" + +#: trailer.c:709 +#, c-format +msgid "could not read input file '%s'" +msgstr "kunde inte läsa indatafilen \"%s\"" + +#: trailer.c:712 +msgid "could not read from stdin" +msgstr "Kunde inte läsa från standard in" + #: unpack-trees.c:202 msgid "Checking out files" msgstr "Checkar ut filer" @@ -1427,25 +1517,29 @@ msgstr "felaktigt portnummer" msgid "invalid '..' path segment" msgstr "felaktigt \"..\"-sökvägssegment" -#: wrapper.c:460 +#: wrapper.c:509 #, c-format msgid "unable to access '%s': %s" msgstr "kan inte komma åt \"%s\": %s" -#: wrapper.c:481 +#: wrapper.c:530 #, c-format msgid "unable to access '%s'" msgstr "kan inte komma åt \"%s\"" -#: wrapper.c:492 +#: wrapper.c:541 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "kan inte slå upp aktuell användare i passwd-filen: %s" -#: wrapper.c:493 +#: wrapper.c:542 msgid "no such user" msgstr "okänd användare" +#: wrapper.c:550 +msgid "unable to get current working directory" +msgstr "kan inte hämta aktuell arbetskatalog" + #: wt-status.c:150 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" @@ -1589,15 +1683,15 @@ msgstr "ospårat innehåll, " msgid "bug: unhandled diff status %c" msgstr "programfel: diff-status %c ej hanterad" -#: wt-status.c:764 +#: wt-status.c:761 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:766 +#: wt-status.c:763 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:845 +#: wt-status.c:842 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1605,68 +1699,68 @@ msgstr "" "Rör inte raden ovan.\n" "Allt nedan kommer tas bort." -#: wt-status.c:936 +#: wt-status.c:933 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:939 +#: wt-status.c:936 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:942 +#: wt-status.c:939 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:945 +#: wt-status.c:942 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:955 +#: wt-status.c:952 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:958 +#: wt-status.c:955 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:962 +#: wt-status.c:959 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:964 +#: wt-status.c:961 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:966 +#: wt-status.c:963 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:1026 wt-status.c:1043 +#: wt-status.c:1023 wt-status.c:1040 #, 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:1031 wt-status.c:1048 +#: wt-status.c:1028 wt-status.c:1045 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1034 +#: wt-status.c:1031 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1036 +#: wt-status.c:1033 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1038 +#: wt-status.c:1035 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:1051 +#: wt-status.c:1048 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1055 +#: wt-status.c:1052 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1674,118 +1768,118 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1060 +#: wt-status.c:1057 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:1063 +#: wt-status.c:1060 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:1067 +#: wt-status.c:1064 #, 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:1072 +#: wt-status.c:1069 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:1075 +#: wt-status.c:1072 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:1077 +#: wt-status.c:1074 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:1087 +#: wt-status.c:1084 #, 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:1092 +#: wt-status.c:1089 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1095 +#: wt-status.c:1092 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1097 +#: wt-status.c:1094 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:1106 +#: wt-status.c:1103 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1111 +#: wt-status.c:1108 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1114 +#: wt-status.c:1111 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1116 +#: wt-status.c:1113 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1127 +#: wt-status.c:1124 #, 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:1131 +#: wt-status.c:1128 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1134 +#: wt-status.c:1131 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:1309 +#: wt-status.c:1306 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1316 +#: wt-status.c:1313 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå" -#: wt-status.c:1323 +#: wt-status.c:1320 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1325 +#: wt-status.c:1322 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1328 +#: wt-status.c:1325 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1345 +#: wt-status.c:1342 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1359 +#: wt-status.c:1356 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1361 +#: wt-status.c:1358 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1365 +#: wt-status.c:1362 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1797,32 +1891,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1371 +#: wt-status.c:1368 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1373 +#: wt-status.c:1370 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1379 +#: wt-status.c:1376 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1384 +#: wt-status.c:1381 #, 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:1387 +#: wt-status.c:1384 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1390 +#: wt-status.c:1387 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1831,93 +1925,93 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1393 +#: wt-status.c:1390 #, 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:1396 +#: wt-status.c:1393 #, 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:1399 wt-status.c:1404 +#: wt-status.c:1396 wt-status.c:1401 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1402 +#: wt-status.c:1399 #, 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:1406 +#: wt-status.c:1403 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1515 +#: wt-status.c:1512 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1521 +#: wt-status.c:1518 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1553 +#: wt-status.c:1550 msgid "gone" msgstr "försvunnen" -#: wt-status.c:1555 wt-status.c:1563 +#: wt-status.c:1552 wt-status.c:1560 msgid "behind " msgstr "efter " -#: compat/precompose_utf8.c:55 builtin/clone.c:356 +#: compat/precompose_utf8.c:55 builtin/clone.c:357 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" -#: builtin/add.c:21 +#: builtin/add.c:22 msgid "git add [options] [--] <pathspec>..." msgstr "git add [flaggor] [--] <sökväg>..." -#: builtin/add.c:64 +#: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:69 builtin/commit.c:261 +#: builtin/add.c:70 builtin/commit.c:275 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:79 +#: builtin/add.c:80 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:133 +#: builtin/add.c:134 msgid "Unstaged changes after refreshing the index:" msgstr "Ospårade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:193 builtin/rev-parse.c:781 +#: builtin/add.c:194 builtin/rev-parse.c:785 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:204 +#: builtin/add.c:205 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning" -#: builtin/add.c:208 +#: builtin/add.c:209 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:213 +#: builtin/add.c:214 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:215 +#: builtin/add.c:216 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." @@ -1930,15 +2024,15 @@ 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:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70 -#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375 #: builtin/rm.c:269 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19 -#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606 -#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113 +#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19 +#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608 +#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "var pratsam" @@ -1946,7 +2040,7 @@ msgstr "var pratsam" msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286 msgid "select hunks interactively" msgstr "välj stycken interaktivt" @@ -2018,74 +2112,74 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299 +#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431 +#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: builtin/apply.c:57 +#: builtin/apply.c:58 msgid "git apply [options] [<patch>...]" msgstr "git apply [flaggor] [<patch>...]" -#: builtin/apply.c:110 +#: builtin/apply.c:111 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "okänt alternativ för whitespace: \"%s\"" -#: builtin/apply.c:125 +#: builtin/apply.c:126 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: builtin/apply.c:825 +#: builtin/apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: builtin/apply.c:834 +#: builtin/apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: builtin/apply.c:915 +#: builtin/apply.c:916 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: builtin/apply.c:947 +#: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d" -#: builtin/apply.c:951 +#: builtin/apply.c:952 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d" -#: builtin/apply.c:952 +#: builtin/apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" -#: builtin/apply.c:959 +#: builtin/apply.c:960 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" -#: builtin/apply.c:1422 +#: builtin/apply.c:1423 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: builtin/apply.c:1479 +#: builtin/apply.c:1480 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: builtin/apply.c:1496 +#: builtin/apply.c:1497 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2101,77 +2195,77 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: builtin/apply.c:1656 +#: builtin/apply.c:1657 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: builtin/apply.c:1658 +#: builtin/apply.c:1659 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: builtin/apply.c:1684 +#: builtin/apply.c:1685 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: builtin/apply.c:1720 +#: builtin/apply.c:1721 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: builtin/apply.c:1722 +#: builtin/apply.c:1723 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: builtin/apply.c:1725 +#: builtin/apply.c:1726 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** varning: filen %s blir tom men har inte tagits bort" -#: builtin/apply.c:1871 +#: builtin/apply.c:1872 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: builtin/apply.c:1900 +#: builtin/apply.c:1901 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: builtin/apply.c:1986 +#: builtin/apply.c:2052 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: builtin/apply.c:2076 +#: builtin/apply.c:2142 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/apply.c:2080 +#: builtin/apply.c:2146 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: builtin/apply.c:2688 +#: builtin/apply.c:2754 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: builtin/apply.c:2806 +#: builtin/apply.c:2872 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Stycke %d lyckades på %d (offset %d rad)." msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." -#: builtin/apply.c:2818 +#: builtin/apply.c:2884 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" -#: builtin/apply.c:2824 +#: builtin/apply.c:2890 #, c-format msgid "" "while searching for:\n" @@ -2180,317 +2274,317 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: builtin/apply.c:2843 +#: builtin/apply.c:2909 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: builtin/apply.c:2944 +#: builtin/apply.c:3010 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: builtin/apply.c:2950 +#: builtin/apply.c:3016 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" -#: builtin/apply.c:2971 +#: builtin/apply.c:3037 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: builtin/apply.c:3095 +#: builtin/apply.c:3161 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194 +#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260 #, c-format msgid "read of %s failed" msgstr "misslyckades läsa %s" -#: builtin/apply.c:3174 builtin/apply.c:3396 +#: builtin/apply.c:3240 builtin/apply.c:3462 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: builtin/apply.c:3255 builtin/apply.c:3410 +#: builtin/apply.c:3321 builtin/apply.c:3476 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424 +#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3264 builtin/apply.c:3418 +#: builtin/apply.c:3330 builtin/apply.c:3484 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: builtin/apply.c:3366 +#: builtin/apply.c:3432 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: builtin/apply.c:3435 +#: builtin/apply.c:3501 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: builtin/apply.c:3437 +#: builtin/apply.c:3503 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: builtin/apply.c:3538 +#: builtin/apply.c:3604 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: builtin/apply.c:3541 +#: builtin/apply.c:3607 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: builtin/apply.c:3561 +#: builtin/apply.c:3627 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" -#: builtin/apply.c:3566 +#: builtin/apply.c:3632 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" -#: builtin/apply.c:3574 +#: builtin/apply.c:3640 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: builtin/apply.c:3587 +#: builtin/apply.c:3653 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134 +#: builtin/apply.c:3746 builtin/checkout.c:213 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\"" -#: builtin/apply.c:3823 +#: builtin/apply.c:3889 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: builtin/apply.c:3852 +#: builtin/apply.c:3918 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: builtin/apply.c:3856 +#: builtin/apply.c:3922 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: builtin/apply.c:3861 +#: builtin/apply.c:3927 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" -#: builtin/apply.c:3864 builtin/apply.c:3972 +#: builtin/apply.c:3930 builtin/apply.c:4038 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: builtin/apply.c:3897 +#: builtin/apply.c:3963 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: builtin/apply.c:3946 +#: builtin/apply.c:4012 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: builtin/apply.c:4033 +#: builtin/apply.c:4099 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: builtin/apply.c:4041 +#: builtin/apply.c:4107 msgid "internal error" msgstr "internt fel" -#: builtin/apply.c:4044 +#: builtin/apply.c:4110 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Tillämpade patchen %%s med %d refuserad..." msgstr[1] "Tillämpade patchen %%s med %d refuserade..." -#: builtin/apply.c:4054 +#: builtin/apply.c:4120 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: builtin/apply.c:4075 +#: builtin/apply.c:4141 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: builtin/apply.c:4078 +#: builtin/apply.c:4144 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: builtin/apply.c:4228 +#: builtin/apply.c:4234 msgid "unrecognized input" msgstr "indata känns inte igen" -#: builtin/apply.c:4239 +#: builtin/apply.c:4245 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91 #: builtin/fetch.c:93 msgid "path" msgstr "sökväg" -#: builtin/apply.c:4359 +#: builtin/apply.c:4363 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: builtin/apply.c:4362 +#: builtin/apply.c:4366 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: builtin/apply.c:4364 +#: builtin/apply.c:4368 msgid "num" msgstr "antal" -#: builtin/apply.c:4365 +#: builtin/apply.c:4369 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: builtin/apply.c:4368 +#: builtin/apply.c:4372 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: builtin/apply.c:4370 +#: builtin/apply.c:4374 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" -#: builtin/apply.c:4374 +#: builtin/apply.c:4378 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: builtin/apply.c:4376 +#: builtin/apply.c:4380 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" -#: builtin/apply.c:4378 +#: builtin/apply.c:4382 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" -#: builtin/apply.c:4380 +#: builtin/apply.c:4384 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: builtin/apply.c:4382 +#: builtin/apply.c:4386 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: builtin/apply.c:4384 +#: builtin/apply.c:4388 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: builtin/apply.c:4386 +#: builtin/apply.c:4390 msgid "attempt three-way merge if a patch does not apply" msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" -#: builtin/apply.c:4388 +#: builtin/apply.c:4392 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455 +#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: builtin/apply.c:4393 +#: builtin/apply.c:4397 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: builtin/apply.c:4394 +#: builtin/apply.c:4398 msgid "action" msgstr "åtgärd" -#: builtin/apply.c:4395 +#: builtin/apply.c:4399 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: builtin/apply.c:4398 builtin/apply.c:4401 +#: builtin/apply.c:4402 builtin/apply.c:4405 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: builtin/apply.c:4404 +#: builtin/apply.c:4408 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: builtin/apply.c:4406 +#: builtin/apply.c:4410 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: builtin/apply.c:4408 +#: builtin/apply.c:4412 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: builtin/apply.c:4410 +#: builtin/apply.c:4414 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: builtin/apply.c:4413 +#: builtin/apply.c:4417 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: builtin/apply.c:4416 +#: builtin/apply.c:4420 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: builtin/apply.c:4418 +#: builtin/apply.c:4422 msgid "root" msgstr "rot" -#: builtin/apply.c:4419 +#: builtin/apply.c:4423 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: builtin/apply.c:4441 +#: builtin/apply.c:4445 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: builtin/apply.c:4449 +#: builtin/apply.c:4453 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: builtin/apply.c:4452 +#: builtin/apply.c:4456 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: builtin/apply.c:4468 +#: builtin/apply.c:4472 #, c-format msgid "can't open patch '%s'" msgstr "kan inte öppna patchen \"%s\"" -#: builtin/apply.c:4482 +#: builtin/apply.c:4486 #, 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" -#: builtin/apply.c:4488 builtin/apply.c:4498 +#: builtin/apply.c:4492 builtin/apply.c:4502 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2650,7 +2744,7 @@ msgstr "Behandla endast radintervallet n,m, med början på 1" #. 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:2599 +#: builtin/blame.c:2602 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" @@ -2670,7 +2764,7 @@ msgstr "git branch [flaggor] [-r] (-d | -D) <grennamn>..." msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" msgstr "git branch [flaggor] (-m | -M) [<gammal_gren>] <ny_gren>" -#: builtin/branch.c:150 +#: builtin/branch.c:152 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -2679,7 +2773,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:154 +#: builtin/branch.c:156 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2688,12 +2782,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:168 +#: builtin/branch.c:170 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" -#: builtin/branch.c:172 +#: builtin/branch.c:174 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -2702,343 +2796,343 @@ 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:185 +#: builtin/branch.c:187 msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" -#: builtin/branch.c:213 +#: builtin/branch.c:215 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:219 +#: builtin/branch.c:221 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:227 +#: builtin/branch.c:229 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande." -#: builtin/branch.c:240 +#: builtin/branch.c:245 #, c-format msgid "remote branch '%s' not found." msgstr "fjärrgrenen \"%s\" hittades inte." -#: builtin/branch.c:241 +#: builtin/branch.c:246 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:255 +#: builtin/branch.c:260 #, c-format msgid "Error deleting remote branch '%s'" msgstr "Fel vid borttagning av fjärrgrenen \"%s\"" -#: builtin/branch.c:256 +#: builtin/branch.c:261 #, c-format msgid "Error deleting branch '%s'" msgstr "Fel vid borttagning av grenen \"%s\"" -#: builtin/branch.c:263 +#: builtin/branch.c:268 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "Tog bort fjärrgrenen %s (var %s).\n" -#: builtin/branch.c:264 +#: builtin/branch.c:269 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:366 +#: builtin/branch.c:370 #, c-format msgid "branch '%s' does not point at a commit" msgstr "grenen \"%s\" pekar inte på en incheckning" -#: builtin/branch.c:454 +#: builtin/branch.c:459 #, c-format msgid "[%s: gone]" msgstr "[%s: försvunnen]" -#: builtin/branch.c:459 +#: builtin/branch.c:464 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:464 +#: builtin/branch.c:469 #, c-format msgid "[%s: behind %d]" msgstr "[%s: bakom %d] " -#: builtin/branch.c:466 +#: builtin/branch.c:471 #, c-format msgid "[behind %d]" msgstr "[bakom %d] " -#: builtin/branch.c:470 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: före %d] " -#: builtin/branch.c:472 +#: builtin/branch.c:477 #, c-format msgid "[ahead %d]" msgstr "[före %d] " -#: builtin/branch.c:475 +#: builtin/branch.c:480 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: före %d, bakom %d] " -#: builtin/branch.c:478 +#: builtin/branch.c:483 #, c-format msgid "[ahead %d, behind %d]" msgstr "[före %d, bakom %d] " -#: builtin/branch.c:502 +#: builtin/branch.c:496 msgid " **** invalid ref ****" msgstr " **** ogiltig ref ****" -#: builtin/branch.c:594 +#: builtin/branch.c:587 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: builtin/branch.c:597 +#: builtin/branch.c:590 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" -#: builtin/branch.c:600 +#: builtin/branch.c:593 #, c-format msgid "(detached from %s)" msgstr "(frånkopplad från %s)" -#: builtin/branch.c:603 +#: builtin/branch.c:596 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:649 +#: builtin/branch.c:643 #, c-format msgid "object '%s' does not point to a commit" msgstr "objektet \"%s\" pekar på en incheckning" -#: builtin/branch.c:681 +#: builtin/branch.c:691 msgid "some refs could not be read" msgstr "vissa referenser kunde inte läsas" -#: builtin/branch.c:694 +#: builtin/branch.c:704 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:704 +#: builtin/branch.c:714 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:719 +#: builtin/branch.c:729 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:727 +#: builtin/branch.c:737 #, 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:734 +#: builtin/branch.c:744 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:749 +#: builtin/branch.c:759 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: builtin/branch.c:773 +#: builtin/branch.c:783 #, c-format msgid "could not write branch description template: %s" msgstr "kunde inte skriva grenbeskrivningsmall: %s" -#: builtin/branch.c:803 +#: builtin/branch.c:813 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:805 +#: builtin/branch.c:815 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:806 +#: builtin/branch.c:816 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:807 +#: builtin/branch.c:817 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:809 +#: builtin/branch.c:819 msgid "change upstream info" msgstr "ändra uppströmsinformation" -#: builtin/branch.c:813 +#: builtin/branch.c:823 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:814 +#: builtin/branch.c:824 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 -#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574 -#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615 -#: builtin/tag.c:621 +#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854 +#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623 +#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616 +#: builtin/tag.c:622 msgid "commit" msgstr "incheckning" -#: builtin/branch.c:818 builtin/branch.c:824 +#: builtin/branch.c:828 builtin/branch.c:834 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:830 +#: builtin/branch.c:840 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:831 +#: builtin/branch.c:841 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:833 +#: builtin/branch.c:843 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:834 +#: builtin/branch.c:844 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:835 +#: builtin/branch.c:845 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:836 +#: builtin/branch.c:846 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:837 +#: builtin/branch.c:847 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:838 +#: builtin/branch.c:848 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:840 +#: builtin/branch.c:850 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:841 +#: builtin/branch.c:851 msgid "force creation (when already exists)" msgstr "tvinga skapande (när den redan finns)" -#: builtin/branch.c:844 +#: builtin/branch.c:854 msgid "print only not merged branches" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:850 +#: builtin/branch.c:860 msgid "print only merged branches" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:854 +#: builtin/branch.c:864 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:867 +#: builtin/branch.c:877 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:872 builtin/clone.c:636 +#: builtin/branch.c:881 builtin/clone.c:634 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:896 +#: builtin/branch.c:903 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:902 builtin/branch.c:941 +#: builtin/branch.c:909 builtin/branch.c:948 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:917 +#: builtin/branch.c:924 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:922 +#: builtin/branch.c:929 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:929 +#: builtin/branch.c:936 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu" -#: builtin/branch.c:932 +#: builtin/branch.c:939 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:947 +#: builtin/branch.c:954 msgid "too many branches for a rename operation" msgstr "för många grenar för namnbyte" -#: builtin/branch.c:952 +#: builtin/branch.c:959 msgid "too many branches to set new upstream" msgstr "för många grenar för att byta uppström" -#: builtin/branch.c:956 +#: builtin/branch.c:963 #, 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:959 builtin/branch.c:981 builtin/branch.c:1002 +#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:963 +#: builtin/branch.c:970 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:975 +#: builtin/branch.c:982 msgid "too many branches to unset upstream" msgstr "för många grenar för att ta bort uppström" -#: builtin/branch.c:979 +#: builtin/branch.c:986 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:985 +#: builtin/branch.c:992 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:999 +#: builtin/branch.c:1006 msgid "it does not make sense to create 'HEAD' manually" msgstr "kan inte skapa \"HEAD\" manuellt" -#: builtin/branch.c:1005 +#: builtin/branch.c:1012 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:1008 +#: builtin/branch.c:1015 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3047,7 +3141,7 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to\n" -#: builtin/branch.c:1025 +#: builtin/branch.c:1032 #, c-format msgid "" "\n" @@ -3058,12 +3152,12 @@ msgstr "" "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" "\n" -#: builtin/branch.c:1026 +#: builtin/branch.c:1033 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1027 +#: builtin/branch.c:1034 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3081,43 +3175,43 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/cat-file.c:331 +#: builtin/cat-file.c:332 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "git cat-file (-t|-s|-e|-p|<typ>|--textconv) <objekt>" -#: builtin/cat-file.c:332 +#: builtin/cat-file.c:333 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <objektlista>" -#: builtin/cat-file.c:369 +#: builtin/cat-file.c:370 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:371 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:371 +#: builtin/cat-file.c:372 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:373 +#: builtin/cat-file.c:374 msgid "exit with zero when there's no error" msgstr "avsluta med noll när det inte uppstått något fel" -#: builtin/cat-file.c:374 +#: builtin/cat-file.c:375 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:376 +#: builtin/cat-file.c:377 msgid "for blob objects, run textconv on object's content" msgstr "för blob-objekt, kör textconv på objektets innehåll" -#: builtin/cat-file.c:378 +#: builtin/cat-file.c:379 msgid "show info and content of objects fed from the standard input" msgstr "visa information och innehåll för objekt som listas på standard in" -#: builtin/cat-file.c:381 +#: builtin/cat-file.c:382 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" @@ -3137,7 +3231,7 @@ msgstr "visa alla attribut som satts på filen" msgid "use .gitattributes only from the index" msgstr "använd .gitattributes endast från indexet" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" msgstr "läs filnamn från standard in" @@ -3145,7 +3239,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:1083 builtin/gc.c:285 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -3309,46 +3403,46 @@ msgstr "sökvägen \"%s\" har inte slagits ihop" msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:591 +#: builtin/checkout.c:597 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Kan inte skapa referenslog för \"%s\"\n" -#: builtin/checkout.c:629 +#: builtin/checkout.c:635 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:636 +#: builtin/checkout.c:642 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:639 +#: builtin/checkout.c:645 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:643 +#: builtin/checkout.c:649 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:645 builtin/checkout.c:1026 +#: builtin/checkout.c:651 builtin/checkout.c:1032 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:647 +#: builtin/checkout.c:653 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:699 +#: builtin/checkout.c:705 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:705 +#: builtin/checkout.c:711 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3371,7 +3465,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:723 +#: builtin/checkout.c:729 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -3386,139 +3480,139 @@ msgstr "" " git branch nytt_grennamn %s\n" "\n" -#: builtin/checkout.c:753 +#: builtin/checkout.c:759 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:757 +#: builtin/checkout.c:763 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:784 builtin/checkout.c:1021 +#: builtin/checkout.c:790 builtin/checkout.c:1027 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:928 +#: builtin/checkout.c:934 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:967 +#: builtin/checkout.c:973 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:996 +#: builtin/checkout.c:1002 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1035 +#: builtin/checkout.c:1041 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1038 builtin/checkout.c:1042 +#: builtin/checkout.c:1044 builtin/checkout.c:1048 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054 -#: builtin/checkout.c:1057 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060 +#: builtin/checkout.c:1063 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1068 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89 #: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1085 +#: builtin/checkout.c:1091 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1087 +#: builtin/checkout.c:1093 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1088 +#: builtin/checkout.c:1094 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1089 +#: builtin/checkout.c:1095 msgid "detach the HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1090 +#: builtin/checkout.c:1096 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1098 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1099 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1101 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1097 +#: builtin/checkout.c:1103 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1104 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:1099 builtin/merge.c:225 +#: builtin/checkout.c:1105 builtin/merge.c:226 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245 +#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245 msgid "style" msgstr "stil" -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1107 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1110 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1112 msgid "second guess 'git checkout no-such-branch'" msgstr "förutspå \"git checkout gren-saknas\"" -#: builtin/checkout.c:1129 +#: builtin/checkout.c:1135 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1152 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1157 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1190 +#: builtin/checkout.c:1194 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1197 +#: builtin/checkout.c:1201 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3527,12 +3621,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:1202 +#: builtin/checkout.c:1206 #, 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:1206 +#: builtin/checkout.c:1210 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3684,7 +3778,7 @@ msgstr "städa interaktivt" msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714 +#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185 msgid "pattern" msgstr "mönster" @@ -3721,145 +3815,145 @@ msgstr "" "clean.requireForce har standardvärdet true och varken -i, -n eller -f " "angavs; vägrar städa" -#: builtin/clone.c:36 +#: builtin/clone.c:37 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [flaggor] [--] <arkiv> [<kat>]" -#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222 -#: builtin/push.c:503 +#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223 +#: builtin/push.c:514 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/clone.c:66 +#: builtin/clone.c:67 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486 +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:71 +#: builtin/clone.c:72 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:73 +#: builtin/clone.c:74 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:75 +#: builtin/clone.c:76 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:77 +#: builtin/clone.c:78 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:79 builtin/clone.c:81 +#: builtin/clone.c:80 builtin/clone.c:82 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:82 builtin/init-db.c:483 +#: builtin/clone.c:83 builtin/init-db.c:485 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:83 builtin/init-db.c:484 +#: builtin/clone.c:84 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:85 +#: builtin/clone.c:86 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "namn" -#: builtin/clone.c:87 +#: builtin/clone.c:88 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:89 +#: builtin/clone.c:90 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:91 +#: builtin/clone.c:92 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659 msgid "depth" msgstr "djup" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:95 +#: builtin/clone.c:96 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:96 builtin/init-db.c:492 +#: builtin/clone.c:97 builtin/init-db.c:494 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:97 builtin/init-db.c:493 +#: builtin/clone.c:98 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:252 +#: builtin/clone.c:253 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: builtin/clone.c:256 +#: builtin/clone.c:257 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: builtin/clone.c:259 +#: builtin/clone.c:260 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: builtin/clone.c:321 +#: builtin/clone.c:322 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/clone.c:323 builtin/diff.c:83 +#: builtin/clone.c:324 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: builtin/clone.c:325 +#: builtin/clone.c:326 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:339 +#: builtin/clone.c:340 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:361 +#: builtin/clone.c:362 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:365 +#: builtin/clone.c:366 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:388 builtin/clone.c:565 +#: builtin/clone.c:389 builtin/clone.c:563 #, c-format msgid "done.\n" msgstr "klart.\n" @@ -3874,109 +3968,111 @@ 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:480 +#: builtin/clone.c:478 #, 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:560 +# Vague original, not networking-related, but rather related to the actual +# objects in the database. +#: builtin/clone.c:558 #, c-format msgid "Checking connectivity... " -msgstr "Kontrollerar anslutning..." +msgstr "Kontrollerar konnektivitet..." -#: builtin/clone.c:563 +#: builtin/clone.c:561 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: builtin/clone.c:627 +#: builtin/clone.c:625 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:658 +#: builtin/clone.c:656 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:768 +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:772 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:783 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:786 +#: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:799 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:805 builtin/fetch.c:1143 +#: builtin/clone.c:802 builtin/fetch.c:1155 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:815 +#: builtin/clone.c:812 #, 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:825 +#: builtin/clone.c:822 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:838 builtin/clone.c:850 +#: builtin/clone.c:835 builtin/clone.c:847 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:841 +#: builtin/clone.c:838 #, c-format msgid "could not create work tree dir '%s'." msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:860 +#: builtin/clone.c:857 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:862 +#: builtin/clone.c:859 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:898 +#: builtin/clone.c:895 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:901 +#: builtin/clone.c:898 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:906 +#: builtin/clone.c:903 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:910 +#: builtin/clone.c:907 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:961 builtin/clone.c:969 +#: builtin/clone.c:958 builtin/clone.c:966 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:972 +#: builtin/clone.c:969 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -4012,15 +4108,42 @@ msgstr "Spaltfyllnad mellan spalter" msgid "--command must be the first argument" msgstr "--command måste vara första argument" -#: builtin/commit.c:36 +#: builtin/commit.c:37 msgid "git commit [options] [--] <pathspec>..." msgstr "git commit [flaggor] [--] <sökväg>..." -#: builtin/commit.c:41 +#: builtin/commit.c:42 msgid "git status [options] [--] <pathspec>..." msgstr "git status [flaggor] [--] <sökväg>..." -#: builtin/commit.c:46 +#: builtin/commit.c:47 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n" +"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n" +"kan förhindra det här meddelandet genom att ställa dem explicit.\n" +"Kör följande kommandon och följ instruktionerna i textredigeraren\n" +"för att redigera din konfigurationsfil:\n" +"\n" +" git config --global --edit\n" +"\n" +"När du gjort det kan du rätta identiteten som användes för den här\n" +"incheckningen med:\n" +"\n" +" git commit --amend --reset-author\n" + +#: builtin/commit.c:60 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4045,7 +4168,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:58 +#: builtin/commit.c:72 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -4055,7 +4178,7 @@ msgstr "" "blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n" "så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n" -#: builtin/commit.c:63 +#: builtin/commit.c:77 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -4069,11 +4192,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:70 +#: builtin/commit.c:84 msgid "Otherwise, please use 'git reset'\n" msgstr "Använd annars \"git reset\"\n" -#: builtin/commit.c:73 +#: builtin/commit.c:87 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -4089,58 +4212,75 @@ msgstr "" "\"git cherry-pick --continue\" kommer därefter att återuppta\n" "cherry-pick för återstående incheckningar.\n" -#: builtin/commit.c:288 +#: builtin/commit.c:302 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:328 +#: builtin/commit.c:342 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:334 +#: builtin/commit.c:348 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435 +#: builtin/commit.c:359 +msgid "unable to write index file" +msgstr "kan inte skriva indexfil" + +#: builtin/commit.c:361 +msgid "unable to update temporary index" +msgstr "kan inte uppdatera temporärt index" + +#: builtin/commit.c:363 +msgid "Failed to update main cache tree" +msgstr "Misslyckades uppdatera huvud-cacheträdet" + +#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:418 +#: builtin/commit.c:443 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:420 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a cherry-pick." msgstr "kan inte utföra en delvis incheckning under en cherry-pick." -#: builtin/commit.c:429 +#: builtin/commit.c:454 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:447 +#: builtin/commit.c:473 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:557 builtin/commit.c:563 +#: builtin/commit.c:592 +#, c-format +msgid "commit '%s' lacks author header" +msgstr "incheckningen \"%s\" saknar författarhuvud" + +#: builtin/commit.c:594 #, c-format -msgid "invalid commit: %s" -msgstr "felaktig incheckning: %s" +msgid "commit '%s' has malformed author line" +msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:585 +#: builtin/commit.c:613 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:592 +#: builtin/commit.c:621 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: builtin/commit.c:609 +#: builtin/commit.c:642 #, c-format msgid "Malformed ident string: '%s'" msgstr "Felaktig indragningssträng: \"%s\"" -#: builtin/commit.c:642 +#: builtin/commit.c:675 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4148,43 +4288,43 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086 +#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:691 builtin/shortlog.c:273 +#: builtin/commit.c:724 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:693 +#: builtin/commit.c:726 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:697 +#: builtin/commit.c:730 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:719 +#: builtin/commit.c:752 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:723 +#: builtin/commit.c:756 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:727 +#: builtin/commit.c:760 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/commit.c:798 +#: builtin/commit.c:831 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:816 +#: builtin/commit.c:849 #, c-format msgid "" "\n" @@ -4199,7 +4339,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:854 #, c-format msgid "" "\n" @@ -4214,7 +4354,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:834 +#: builtin/commit.c:867 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4224,7 +4364,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:841 +#: builtin/commit.c:874 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4235,144 +4375,144 @@ msgstr "" "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:888 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:863 +#: builtin/commit.c:896 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:870 +#: builtin/commit.c:903 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:888 +#: builtin/commit.c:921 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:945 +#: builtin/commit.c:978 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:960 builtin/tag.c:495 +#: builtin/commit.c:993 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:1061 +#: builtin/commit.c:1095 #, c-format msgid "No existing author found with '%s'" msgstr "Hittade ingen befintlig författare med \"%s\"" -#: builtin/commit.c:1076 builtin/commit.c:1316 +#: builtin/commit.c:1110 builtin/commit.c:1350 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1113 +#: builtin/commit.c:1147 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1143 +#: builtin/commit.c:1177 msgid "Using both --reset-author and --author does not make sense" msgstr "Kan inte använda både --reset-author och --author" -#: builtin/commit.c:1152 +#: builtin/commit.c:1186 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1155 +#: builtin/commit.c:1189 msgid "You are in the middle of a merge -- cannot amend." msgstr "Du är i mitten av en sammanslagning -- kan inte utöka." -#: builtin/commit.c:1157 +#: builtin/commit.c:1191 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Du är i mitten av en cherry-pick -- kan inte utöka." -#: builtin/commit.c:1160 +#: builtin/commit.c:1194 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1170 +#: builtin/commit.c:1204 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Endast en av -c/-C/-F/--fixup kan användas." -#: builtin/commit.c:1172 +#: builtin/commit.c:1206 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup." -#: builtin/commit.c:1180 +#: builtin/commit.c:1214 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author kan endast användas med -C, -c eller --amend." -#: builtin/commit.c:1197 +#: builtin/commit.c:1231 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Endast en av --include/--only/--all/--interactive/--patch kan användas." -#: builtin/commit.c:1199 +#: builtin/commit.c:1233 msgid "No paths with --include/--only does not make sense." msgstr "Du måste ange sökvägar tillsammans med --include/--only." -#: builtin/commit.c:1201 +#: builtin/commit.c:1235 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:1203 +#: builtin/commit.c:1237 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:1215 builtin/tag.c:727 +#: builtin/commit.c:1249 builtin/tag.c:728 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1220 +#: builtin/commit.c:1254 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1330 builtin/commit.c:1595 +#: builtin/commit.c:1364 builtin/commit.c:1644 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1332 builtin/commit.c:1597 +#: builtin/commit.c:1366 builtin/commit.c:1646 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489 +#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1337 builtin/commit.c:1601 +#: builtin/commit.c:1371 builtin/commit.c:1650 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1340 builtin/commit.c:1604 +#: builtin/commit.c:1374 builtin/commit.c:1653 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703 -#: builtin/fast-export.c:706 builtin/tag.c:602 +#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980 +#: builtin/fast-export.c:983 builtin/tag.c:603 msgid "mode" msgstr "läge" -#: builtin/commit.c:1343 builtin/commit.c:1607 +#: builtin/commit.c:1377 builtin/commit.c:1656 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)" -#: builtin/commit.c:1346 +#: builtin/commit.c:1380 msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1347 parse-options.h:153 +#: builtin/commit.c:1381 parse-options.h:153 msgid "when" msgstr "när" -#: builtin/commit.c:1348 +#: builtin/commit.c:1382 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4380,220 +4520,212 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1350 +#: builtin/commit.c:1384 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1419 +#: builtin/commit.c:1471 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1421 +#: builtin/commit.c:1473 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1469 +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1471 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1565 +#: builtin/commit.c:1614 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1566 +#: builtin/commit.c:1615 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1568 +#: builtin/commit.c:1617 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1569 builtin/tag.c:600 +#: builtin/commit.c:1618 builtin/tag.c:601 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "author" msgstr "författare" -#: builtin/commit.c:1570 +#: builtin/commit.c:1619 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1571 builtin/gc.c:286 +#: builtin/commit.c:1620 builtin/gc.c:275 msgid "date" msgstr "datum" -#: builtin/commit.c:1571 +#: builtin/commit.c:1620 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409 -#: builtin/notes.c:566 builtin/tag.c:598 +#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408 +#: builtin/notes.c:565 builtin/tag.c:599 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1572 +#: builtin/commit.c:1621 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1573 +#: builtin/commit.c:1622 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1574 +#: builtin/commit.c:1623 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1575 +#: builtin/commit.c:1624 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1576 +#: builtin/commit.c:1625 msgid "use autosquash formatted message to squash specified commit" msgstr "" "använd autosquash-formaterat meddelande för att slå ihop med angiven " "incheckning" -#: builtin/commit.c:1577 +#: builtin/commit.c:1626 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:1578 builtin/log.c:1188 builtin/revert.c:86 +#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1579 +#: builtin/commit.c:1628 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1580 +#: builtin/commit.c:1629 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1581 +#: builtin/commit.c:1630 msgid "default" msgstr "standard" -#: builtin/commit.c:1581 builtin/tag.c:603 +#: builtin/commit.c:1630 builtin/tag.c:604 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" -#: builtin/commit.c:1582 +#: builtin/commit.c:1631 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92 -#: builtin/tag.c:604 +#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92 +#: builtin/tag.c:605 msgid "key-id" msgstr "nyckel-id" -#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93 +#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1587 +#: builtin/commit.c:1636 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1588 +#: builtin/commit.c:1637 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1589 +#: builtin/commit.c:1638 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1590 +#: builtin/commit.c:1639 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1591 +#: builtin/commit.c:1640 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1592 +#: builtin/commit.c:1641 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1593 +#: builtin/commit.c:1642 msgid "bypass pre-commit hook" msgstr "förbigå pre-commit-krok" -#: builtin/commit.c:1594 +#: builtin/commit.c:1643 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1605 +#: builtin/commit.c:1654 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1606 +#: builtin/commit.c:1655 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1611 +#: builtin/commit.c:1660 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1613 +#: builtin/commit.c:1662 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1641 +#: builtin/commit.c:1691 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1680 builtin/merge.c:518 +#: builtin/commit.c:1730 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: builtin/commit.c:1687 +#: builtin/commit.c:1737 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1694 +#: builtin/commit.c:1744 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1713 +#: builtin/commit.c:1763 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1724 +#: builtin/commit.c:1774 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1729 +#: builtin/commit.c:1779 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876 +#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/commit.c:1756 -msgid "cannot lock HEAD ref" -msgstr "kunde inte låsa HEAD-referens" - -#: builtin/commit.c:1769 -msgid "cannot update HEAD ref" -msgstr "kunde inte uppdatera HEAD-referens" - -#: builtin/commit.c:1780 +#: builtin/commit.c:1827 msgid "" "Repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full or quota is\n" +"new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" "Arkivet har uppdaterats, men kunde inte skriva filen\n" @@ -4729,63 +4861,87 @@ msgstr "terminera värden med NUL-byte" msgid "respect include directives on lookup" msgstr "respektera inkluderingsdirektiv vid uppslag" -#: builtin/count-objects.c:82 +#: builtin/config.c:315 +msgid "unable to parse default color value" +msgstr "kan inte tolka standardfärgvärde" + +#: builtin/config.c:455 +#, c-format +msgid "" +"# This is Git's per-user configuration file.\n" +"[core]\n" +"# Please adapt and uncomment the following lines:\n" +"#\tuser = %s\n" +"#\temail = %s\n" +msgstr "" +"# Detta är Gits användarspecifika konfigurationsfil\n" +"[core]\n" +"# Justera och ta bort kommenteringsmärket från följande rader:\n" +"#\tuser = %s\n" +"#\temail = %s\n" + +#: builtin/config.c:590 +#, c-format +msgid "cannot create configuration file %s" +msgstr "kan inte skapa konfigurationsfilen \"%s\"" + +#: builtin/count-objects.c:55 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:97 +#: builtin/count-objects.c:65 msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" -#: builtin/describe.c:16 +#: builtin/describe.c:17 msgid "git describe [options] <commit-ish>*" msgstr "git describe [flaggor] <incheckning-igt>*" -#: builtin/describe.c:17 +#: builtin/describe.c:18 msgid "git describe [options] --dirty" msgstr "git describe [flaggor] --dirty" -#: builtin/describe.c:216 +#: builtin/describe.c:217 #, c-format msgid "annotated tag %s not available" msgstr "den annoterade taggen %s inte tillgänglig" -#: builtin/describe.c:220 +#: builtin/describe.c:221 #, c-format msgid "annotated tag %s has no embedded name" msgstr "den annoterade taggen %s har inget inbäddat namn" -#: builtin/describe.c:222 +#: builtin/describe.c:223 #, c-format msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" är i verkligheten \"%s\" här" -#: builtin/describe.c:249 +#: builtin/describe.c:250 builtin/log.c:452 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" -#: builtin/describe.c:252 +#: builtin/describe.c:253 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: builtin/describe.c:269 +#: builtin/describe.c:270 #, c-format msgid "no tag exactly matches '%s'" msgstr "ingen tagg motsvarar \"%s\" exakt" -#: builtin/describe.c:271 +#: builtin/describe.c:272 #, c-format msgid "searching to describe %s\n" msgstr "söker för att beskriva %s\n" -#: builtin/describe.c:318 +#: builtin/describe.c:319 #, c-format msgid "finished search at %s\n" msgstr "avslutade sökning på %s\n" -#: builtin/describe.c:345 +#: builtin/describe.c:346 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -4794,7 +4950,7 @@ msgstr "" "Inga annoterade taggar kan beskriva \"%s\".\n" "Det finns dock oannoterade taggar: testa --tags." -#: builtin/describe.c:349 +#: builtin/describe.c:350 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -4803,12 +4959,12 @@ msgstr "" "Inga taggar kan beskriva \"%s\".\n" "Testa --always, eller skapa några taggar." -#: builtin/describe.c:370 +#: builtin/describe.c:371 #, c-format msgid "traversed %lu commits\n" msgstr "traverserade %lu incheckningar\n" -#: builtin/describe.c:373 +#: builtin/describe.c:374 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -4817,143 +4973,147 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" -#: builtin/describe.c:395 +#: builtin/describe.c:396 msgid "find the tag that comes after the commit" msgstr "hitta taggen som kommer efter incheckningen" -#: builtin/describe.c:396 +#: builtin/describe.c:397 msgid "debug search strategy on stderr" msgstr "felsök sökstrategin på standard fel" -#: builtin/describe.c:397 +#: builtin/describe.c:398 msgid "use any ref" msgstr "använd alla referenser" -#: builtin/describe.c:398 +#: builtin/describe.c:399 msgid "use any tag, even unannotated" msgstr "använd alla taggar, även oannoterade" -#: builtin/describe.c:399 +#: builtin/describe.c:400 msgid "always use long format" msgstr "använd alltid långt format" -#: builtin/describe.c:400 +#: builtin/describe.c:401 msgid "only follow first parent" msgstr "följ endast första föräldern" -#: builtin/describe.c:403 +#: builtin/describe.c:404 msgid "only output exact matches" msgstr "skriv endast ut exakta träffar" -#: builtin/describe.c:405 +#: builtin/describe.c:406 msgid "consider <n> most recent tags (default: 10)" msgstr "överväg de <n> nyaste taggarna (standard: 10)" -#: builtin/describe.c:407 +#: builtin/describe.c:408 msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: builtin/describe.c:409 builtin/name-rev.c:318 +#: builtin/describe.c:410 builtin/name-rev.c:318 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" -#: builtin/describe.c:410 +#: builtin/describe.c:411 msgid "mark" msgstr "märke" -#: builtin/describe.c:411 +#: builtin/describe.c:412 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")" -#: builtin/describe.c:429 +#: builtin/describe.c:430 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" -#: builtin/describe.c:455 +#: builtin/describe.c:456 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." -#: builtin/describe.c:475 +#: builtin/describe.c:476 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" -#: builtin/diff.c:85 +#: builtin/diff.c:86 #, c-format msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" -#: builtin/diff.c:236 +#: builtin/diff.c:237 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:357 +#: builtin/diff.c:358 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:400 +#: builtin/diff.c:401 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:409 +#: builtin/diff.c:410 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:416 +#: builtin/diff.c:417 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." -#: builtin/fast-export.c:23 +#: builtin/fast-export.c:24 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" -#: builtin/fast-export.c:702 +#: builtin/fast-export.c:979 msgid "show progress after <n> objects" msgstr "visa förlopp efter <n> objekt" -#: builtin/fast-export.c:704 +#: builtin/fast-export.c:981 msgid "select handling of signed tags" msgstr "välj hantering av signerade taggar" -#: builtin/fast-export.c:707 +#: builtin/fast-export.c:984 msgid "select handling of tags that tag filtered objects" msgstr "välj hantering av taggar som har taggfiltrerade objekt" -#: builtin/fast-export.c:710 +#: builtin/fast-export.c:987 msgid "Dump marks to this file" msgstr "Dump märken till filen" -#: builtin/fast-export.c:712 +#: builtin/fast-export.c:989 msgid "Import marks from this file" msgstr "Importera märken från filen" -#: builtin/fast-export.c:714 +#: builtin/fast-export.c:991 msgid "Fake a tagger when tags lack one" msgstr "Fejka taggare när taggen saknar en" -#: builtin/fast-export.c:716 +#: builtin/fast-export.c:993 msgid "Output full tree for each commit" msgstr "Skriv ut hela trädet för varje incheckning" -#: builtin/fast-export.c:718 +#: builtin/fast-export.c:995 msgid "Use the done feature to terminate the stream" msgstr "Använd done-funktionen för att avsluta strömmen" -#: builtin/fast-export.c:719 +#: builtin/fast-export.c:996 msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" -#: builtin/fast-export.c:720 +#: builtin/fast-export.c:997 msgid "refspec" msgstr "referensspecifikation" -#: builtin/fast-export.c:721 +#: builtin/fast-export.c:998 msgid "Apply refspec to exported refs" msgstr "Applicera referensspecifikation på exporterade referenser" +#: builtin/fast-export.c:999 +msgid "anonymize output" +msgstr "anonymisera utdata" + #: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" @@ -5026,7 +5186,7 @@ msgstr "fördjupa historik för grund klon" msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:118 builtin/log.c:1205 +#: builtin/fetch.c:118 builtin/log.c:1208 msgid "dir" msgstr "kat" @@ -5054,77 +5214,77 @@ msgstr "ange referenskarta för \"fetch\"" msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:440 +#: builtin/fetch.c:454 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:445 +#: builtin/fetch.c:459 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:459 +#: builtin/fetch.c:473 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)" -#: builtin/fetch.c:460 builtin/fetch.c:546 +#: builtin/fetch.c:474 builtin/fetch.c:560 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:471 +#: builtin/fetch.c:485 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526 +#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540 msgid " (unable to update local ref)" msgstr " (kunde inte uppdatera lokal ref)" -#: builtin/fetch.c:491 +#: builtin/fetch.c:505 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:494 +#: builtin/fetch.c:508 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:497 +#: builtin/fetch.c:511 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:542 +#: builtin/fetch.c:556 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:548 +#: builtin/fetch.c:562 msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:581 builtin/fetch.c:814 +#: builtin/fetch.c:595 builtin/fetch.c:828 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: builtin/fetch.c:590 +#: builtin/fetch.c:604 #, 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:608 +#: builtin/fetch.c:622 #, 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:696 builtin/fetch.c:779 +#: builtin/fetch.c:710 builtin/fetch.c:793 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:707 +#: builtin/fetch.c:721 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5133,55 +5293,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:759 +#: builtin/fetch.c:773 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:760 +#: builtin/fetch.c:774 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:784 +#: builtin/fetch.c:798 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:785 builtin/remote.c:1059 +#: builtin/fetch.c:799 builtin/remote.c:1063 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:804 +#: builtin/fetch.c:818 #, 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:823 +#: builtin/fetch.c:837 #, 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:826 +#: builtin/fetch.c:840 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:882 +#: builtin/fetch.c:896 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:1044 +#: builtin/fetch.c:1058 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1046 builtin/remote.c:90 +#: builtin/fetch.c:1060 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1064 +#: builtin/fetch.c:1078 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5189,32 +5349,32 @@ 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:1087 +#: builtin/fetch.c:1101 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1131 +#: builtin/fetch.c:1143 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1133 +#: builtin/fetch.c:1145 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1156 +#: builtin/fetch.c:1168 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1170 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1169 +#: builtin/fetch.c:1181 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1189 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -5224,8 +5384,8 @@ msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698 -#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589 +#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590 #: parse-options.h:132 parse-options.h:239 msgid "n" msgstr "n" @@ -5250,99 +5410,105 @@ msgstr "inled meddelande med <text>" msgid "file to read from" msgstr "fil att läsa från" -#: builtin/for-each-ref.c:1051 +#: builtin/for-each-ref.c:676 +msgid "unable to parse format" +msgstr "kan inte tolka formatet" + +#: builtin/for-each-ref.c:1057 msgid "git for-each-ref [options] [<pattern>]" msgstr "git for-each-ref [flaggor] [<mönster>]" -#: builtin/for-each-ref.c:1066 +#: builtin/for-each-ref.c:1072 msgid "quote placeholders suitably for shells" msgstr "citera platshållare passande för skal" -#: builtin/for-each-ref.c:1068 +#: builtin/for-each-ref.c:1074 msgid "quote placeholders suitably for perl" msgstr "citera platshållare passande för perl" -#: builtin/for-each-ref.c:1070 +#: builtin/for-each-ref.c:1076 msgid "quote placeholders suitably for python" msgstr "citera platshållare passande för python" -#: builtin/for-each-ref.c:1072 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for tcl" msgstr "citera platshållare passande för tcl" -#: builtin/for-each-ref.c:1075 +#: builtin/for-each-ref.c:1081 msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:1076 builtin/replace.c:435 +#: builtin/for-each-ref.c:1082 builtin/replace.c:438 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1076 +#: builtin/for-each-ref.c:1082 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/for-each-ref.c:1077 +#: builtin/for-each-ref.c:1083 msgid "key" msgstr "nyckel" -#: builtin/for-each-ref.c:1078 +#: builtin/for-each-ref.c:1084 msgid "field name to sort on" msgstr "fältnamn att sortera på" -#: builtin/fsck.c:147 builtin/prune.c:172 +# Vague original, not networking-related, but rather related to the actual +# objects in the database. +#: builtin/fsck.c:147 builtin/prune.c:136 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: builtin/fsck.c:538 +#: builtin/fsck.c:540 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:601 +#: builtin/fsck.c:603 msgid "git fsck [options] [<object>...]" msgstr "git fsck [flaggor] [<objekt>...]" -#: builtin/fsck.c:607 +#: builtin/fsck.c:609 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:608 +#: builtin/fsck.c:610 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:609 +#: builtin/fsck.c:611 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:610 +#: builtin/fsck.c:612 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:611 +#: builtin/fsck.c:613 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:612 +#: builtin/fsck.c:614 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:613 +#: builtin/fsck.c:615 msgid "also consider packs and alternate objects" msgstr "ta även hänsyn till paket och alternativa objekt" -#: builtin/fsck.c:614 +#: builtin/fsck.c:616 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:616 +#: builtin/fsck.c:618 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:617 builtin/prune.c:144 +#: builtin/fsck.c:619 builtin/prune.c:108 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:667 +#: builtin/fsck.c:669 msgid "Checking objects" msgstr "Kontrollerar objekt" @@ -5350,48 +5516,48 @@ msgstr "Kontrollerar objekt" msgid "git gc [options]" msgstr "git gc [flaggor]" -#: builtin/gc.c:91 +#: builtin/gc.c:79 #, c-format -msgid "Invalid %s: '%s'" -msgstr "Felaktigt %s: \"%s\"" +msgid "Invalid gc.pruneexpire: '%s'" +msgstr "Ogiltig gc.pruneexpire: '%s'" -#: builtin/gc.c:118 +#: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "tokigt lång objektkatalog %.*s" -#: builtin/gc.c:287 +#: builtin/gc.c:276 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:289 +#: builtin/gc.c:278 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:290 +#: builtin/gc.c:279 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:291 +#: builtin/gc.c:280 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:332 +#: builtin/gc.c:321 #, 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:334 +#: builtin/gc.c:323 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:335 +#: builtin/gc.c:324 #, 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:353 +#: builtin/gc.c:342 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5399,7 +5565,7 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:375 +#: builtin/gc.c:364 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5631,7 +5797,7 @@ msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll." msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." -#: builtin/hash-object.c:60 +#: builtin/hash-object.c:82 msgid "" "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " "<file>..." @@ -5639,31 +5805,37 @@ msgstr "" "git hash-object [-t <typ>] [-w] [--path=<fil>|--no-filters] [--stdin] [--] " "<fil>..." -#: builtin/hash-object.c:61 +#: builtin/hash-object.c:83 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <sökvägslista>" -#: builtin/hash-object.c:72 builtin/tag.c:609 +#: builtin/hash-object.c:94 builtin/tag.c:610 msgid "type" msgstr "typ" -#: builtin/hash-object.c:72 +#: builtin/hash-object.c:94 msgid "object type" msgstr "objekttyp" -#: builtin/hash-object.c:73 +#: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "skriv objektet till objektdatabasen" -#: builtin/hash-object.c:74 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "läs objektet från standard in" -#: builtin/hash-object.c:76 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "spara filen som den är utan filer" -#: builtin/hash-object.c:77 +#: builtin/hash-object.c:100 +msgid "" +"just hash any random garbage to create corrupt objects for debugging Git" +msgstr "" +"hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git" + +#: builtin/hash-object.c:101 msgid "process file as it were from this path" msgstr "hantera filen som om den kom från sökvägen" @@ -5696,25 +5868,25 @@ msgstr "git help [--all] [--guides] [--man|--web|--info] [kommando]" msgid "unrecognized help format '%s'" msgstr "okänt hjälpformat: %s" -#: builtin/help.c:92 +#: builtin/help.c:91 msgid "Failed to start emacsclient." msgstr "Misslyckades starta emacsclient." -#: builtin/help.c:105 +#: builtin/help.c:104 msgid "Failed to parse emacsclient version." msgstr "Kunde inte tolka emacsclient-version." -#: builtin/help.c:113 +#: builtin/help.c:112 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient version \"%d\" för gammal (< 22)." -#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 +#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 #, c-format msgid "failed to exec '%s': %s" msgstr "exec misslyckades för \"%s\": %s" -#: builtin/help.c:216 +#: builtin/help.c:215 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -5723,7 +5895,7 @@ msgstr "" "\"%s\": sökväg för man-visare som ej stöds.\n" "Använd \"man.<verktyg>.cmd\" istället." -#: builtin/help.c:228 +#: builtin/help.c:227 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -5732,23 +5904,27 @@ msgstr "" "\"%s\": kommando för man-visare som stöds.\n" "Använd \"man.<verktyg>.path\" istället." -#: builtin/help.c:353 +#: builtin/help.c:352 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:370 +#: builtin/help.c:369 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:378 +#: builtin/help.c:377 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:424 +#: builtin/help.c:423 msgid "Defining attributes per path" msgstr "Definierar attribut per sökväg" +#: builtin/help.c:424 +msgid "Everyday Git With 20 Commands Or So" +msgstr "Git för dagligt bruk i ungefär 20 kommandon" + #: builtin/help.c:425 msgid "A Git glossary" msgstr "En Git-ordlista" @@ -5787,291 +5963,291 @@ msgstr "användning: %s%s" msgid "`git %s' is aliased to `%s'" msgstr "\"git %s\" är ett alias för \"%s\"" -#: builtin/index-pack.c:145 +#: builtin/index-pack.c:150 #, c-format msgid "unable to open %s" msgstr "kunde inte öppna %s" -#: builtin/index-pack.c:191 +#: builtin/index-pack.c:200 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" -#: builtin/index-pack.c:211 +#: builtin/index-pack.c:220 #, c-format msgid "did not receive expected object %s" msgstr "emottog inte det förväntade objektet %s" -#: builtin/index-pack.c:214 +#: builtin/index-pack.c:223 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objektet %s: förväntad typ %s, såg %s" -#: builtin/index-pack.c:256 +#: builtin/index-pack.c:265 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "kan inte fylla %d byte" msgstr[1] "kan inte fylla %d byte" -#: builtin/index-pack.c:266 +#: builtin/index-pack.c:275 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:276 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:288 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:286 +#: builtin/index-pack.c:295 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" -#: builtin/index-pack.c:302 +#: builtin/index-pack.c:311 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: builtin/index-pack.c:307 +#: builtin/index-pack.c:316 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:321 +#: builtin/index-pack.c:330 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:323 +#: builtin/index-pack.c:332 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:341 +#: builtin/index-pack.c:350 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "paketet har felaktigt objekt vid index %lu: %s" -#: builtin/index-pack.c:462 +#: builtin/index-pack.c:471 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:511 +#: builtin/index-pack.c:520 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:519 +#: builtin/index-pack.c:528 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:527 +#: builtin/index-pack.c:536 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:558 +#: builtin/index-pack.c:567 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:560 +#: builtin/index-pack.c:569 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "för tidigt slut på paketfilen, %lu byte saknas" msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas" -#: builtin/index-pack.c:586 +#: builtin/index-pack.c:595 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706 -#: builtin/index-pack.c:740 builtin/index-pack.c:749 +#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715 +#: builtin/index-pack.c:749 builtin/index-pack.c:758 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:680 builtin/pack-objects.c:162 -#: builtin/pack-objects.c:254 +#: builtin/index-pack.c:689 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:746 +#: builtin/index-pack.c:755 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:760 +#: builtin/index-pack.c:769 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:774 +#: builtin/index-pack.c:783 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/index-pack.c:777 +#: builtin/index-pack.c:787 msgid "Error in object" msgstr "Fel i objekt" -#: builtin/index-pack.c:779 +#: builtin/index-pack.c:789 #, 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:851 builtin/index-pack.c:881 +#: builtin/index-pack.c:861 builtin/index-pack.c:890 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1022 +#: builtin/index-pack.c:1055 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1048 +#: builtin/index-pack.c:1081 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1053 +#: builtin/index-pack.c:1086 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1056 +#: builtin/index-pack.c:1089 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1067 +#: builtin/index-pack.c:1100 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1090 +#: builtin/index-pack.c:1123 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1100 +#: builtin/index-pack.c:1133 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1142 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1150 +#: builtin/index-pack.c:1181 #, c-format msgid "completed with %d local objects" msgstr "slutfördes med %d lokala objekt" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1191 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1164 +#: builtin/index-pack.c:1195 #, 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:1189 +#: builtin/index-pack.c:1220 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1299 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1323 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1336 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1313 +#: builtin/index-pack.c:1344 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1326 +#: builtin/index-pack.c:1357 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1337 +#: builtin/index-pack.c:1368 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1370 +#: builtin/index-pack.c:1401 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1376 +#: builtin/index-pack.c:1407 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/index-pack.c:1380 builtin/index-pack.c:1559 +#: builtin/index-pack.c:1411 builtin/index-pack.c:1590 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1469 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1471 #, 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:1487 +#: builtin/index-pack.c:1518 #, 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:1494 +#: builtin/index-pack.c:1525 #, 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:1523 +#: builtin/index-pack.c:1554 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1571 builtin/index-pack.c:1574 -#: builtin/index-pack.c:1586 builtin/index-pack.c:1590 +#: builtin/index-pack.c:1602 builtin/index-pack.c:1605 +#: builtin/index-pack.c:1617 builtin/index-pack.c:1621 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1604 +#: builtin/index-pack.c:1635 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1608 builtin/index-pack.c:1617 +#: builtin/index-pack.c:1639 builtin/index-pack.c:1648 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1625 +#: builtin/index-pack.c:1656 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -6180,41 +6356,37 @@ msgstr "Initierade tomt" msgid " shared" msgstr " delat" -#: builtin/init-db.c:439 -msgid "cannot tell cwd" -msgstr "kan inte läsa aktuell katalog (cwd)" - -#: builtin/init-db.c:465 +#: builtin/init-db.c:467 msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" -"[=<permissions>]] [directory]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" +"shared[=<permissions>]] [directory]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--shared" -"[=<behörigheter>]] [katalog]" +"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" +"shared[=<behörigheter>]] [katalog]" -#: builtin/init-db.c:488 +#: builtin/init-db.c:490 msgid "permissions" msgstr "behörigheter" -#: builtin/init-db.c:489 +#: builtin/init-db.c:491 msgid "specify that the git repository is to be shared amongst several users" msgstr "ange att git-arkivet skall delas bland flera användare" -#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172 +#: builtin/init-db.c:493 builtin/prune-packed.c:57 builtin/repack.c:172 msgid "be quiet" msgstr "var tyst" -#: builtin/init-db.c:523 builtin/init-db.c:528 +#: builtin/init-db.c:525 builtin/init-db.c:530 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:532 +#: builtin/init-db.c:534 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:554 +#: builtin/init-db.c:555 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6223,15 +6395,31 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:578 -msgid "Cannot access current working directory" -msgstr "Kan inte komma åt aktuell arbetskatalog" - -#: builtin/init-db.c:585 +#: builtin/init-db.c:583 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" +#: builtin/interpret-trailers.c:15 +msgid "" +"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " +"[<file>...]" +msgstr "" +"git interpret-trailers [--trim-empty] [(--trailer " +"<symbol>[(=|:)<värde>])...] [<fil>...]" + +#: builtin/interpret-trailers.c:25 +msgid "trim empty trailers" +msgstr "ta bort tomma släprader" + +#: builtin/interpret-trailers.c:26 +msgid "trailer" +msgstr "släprad" + +#: builtin/interpret-trailers.c:27 +msgid "trailer(s) to add" +msgstr "släprad(er) att lägga till" + #: builtin/log.c:41 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]\n" @@ -6240,6 +6428,11 @@ msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]\n" msgid " or: git show [options] <object>..." msgstr " eller: git show [flaggor] <objekt>..." +#: builtin/log.c:81 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "ogiltig flagga för --decorate: %s" + #: builtin/log.c:127 msgid "suppress diff output" msgstr "undertryck diff-utdata" @@ -6256,245 +6449,254 @@ msgstr "Använd e-postmappningsfil" msgid "decorate options" msgstr "dekoreringsflaggor" +#: builtin/log.c:133 +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:229 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:470 builtin/log.c:562 +#: builtin/log.c:458 +#, c-format +msgid "git show %s: bad file" +msgstr "git show %s: felaktig fil" + +#: builtin/log.c:472 builtin/log.c:564 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:586 +#: builtin/log.c:588 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:687 +#: builtin/log.c:689 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:771 +#: builtin/log.c:773 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:787 +#: builtin/log.c:789 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:801 +#: builtin/log.c:803 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:809 +#: builtin/log.c:811 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:916 +#: builtin/log.c:919 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:995 +#: builtin/log.c:998 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1023 +#: builtin/log.c:1026 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1068 +#: builtin/log.c:1071 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1183 +#: builtin/log.c:1186 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:1186 +#: builtin/log.c:1189 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1190 +#: builtin/log.c:1193 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1192 +#: builtin/log.c:1195 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1194 +#: builtin/log.c:1197 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1195 +#: builtin/log.c:1198 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1196 +#: builtin/log.c:1199 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1198 +#: builtin/log.c:1201 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1200 +#: builtin/log.c:1203 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1202 +#: builtin/log.c:1205 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1205 +#: builtin/log.c:1208 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1208 +#: builtin/log.c:1211 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1211 +#: builtin/log.c:1214 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1213 +#: builtin/log.c:1216 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1215 +#: builtin/log.c:1218 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1217 +#: builtin/log.c:1220 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1218 +#: builtin/log.c:1221 msgid "header" msgstr "huvud" -#: builtin/log.c:1219 +#: builtin/log.c:1222 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1220 builtin/log.c:1222 +#: builtin/log.c:1223 builtin/log.c:1225 msgid "email" msgstr "epost" -#: builtin/log.c:1220 +#: builtin/log.c:1223 msgid "add To: header" msgstr "Lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1222 +#: builtin/log.c:1225 msgid "add Cc: header" msgstr "Lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1224 +#: builtin/log.c:1227 msgid "ident" msgstr "ident" -#: builtin/log.c:1225 +#: builtin/log.c:1228 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:1227 +#: builtin/log.c:1230 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1228 +#: builtin/log.c:1231 msgid "make first mail a reply to <message-id>" msgstr "Gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1229 builtin/log.c:1232 +#: builtin/log.c:1232 builtin/log.c:1235 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1230 +#: builtin/log.c:1233 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1233 +#: builtin/log.c:1236 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1237 +#: builtin/log.c:1240 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1239 +#: builtin/log.c:1242 msgid "signature" msgstr "signatur" -#: builtin/log.c:1240 +#: builtin/log.c:1243 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1242 +#: builtin/log.c:1245 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1243 +#: builtin/log.c:1246 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1317 +#: builtin/log.c:1320 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1332 +#: builtin/log.c:1335 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1334 +#: builtin/log.c:1337 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix och -k kan inte användas samtidigt." -#: builtin/log.c:1342 +#: builtin/log.c:1345 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1344 +#: builtin/log.c:1347 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1346 +#: builtin/log.c:1349 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1369 +#: builtin/log.c:1372 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1371 +#: builtin/log.c:1374 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1468 +#: builtin/log.c:1472 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1531 +#: builtin/log.c:1535 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1579 +#: builtin/log.c:1583 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1634 +#: builtin/log.c:1638 #, 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/log.c:1647 builtin/log.c:1649 builtin/log.c:1661 +#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" @@ -6540,7 +6742,7 @@ 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:477 -msgid "show 'other' directories' name only" +msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" #: builtin/ls-files.c:480 @@ -6627,99 +6829,99 @@ msgstr "använd fullständiga sökvägsnamn" msgid "list entire tree; not just current directory (implies --full-name)" msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" -#: builtin/merge.c:43 +#: builtin/merge.c:44 msgid "git merge [options] [<commit>...]" msgstr "git merge [flaggor] [<incheckning>...]" -#: builtin/merge.c:44 +#: builtin/merge.c:45 msgid "git merge [options] <msg> HEAD <commit>" msgstr "git merge [flaggor] <meddelande> HEAD <incheckning>" -#: builtin/merge.c:45 +#: builtin/merge.c:46 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:98 +#: builtin/merge.c:99 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:135 +#: builtin/merge.c:136 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:136 +#: builtin/merge.c:137 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:191 +#: builtin/merge.c:192 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:194 +#: builtin/merge.c:195 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:195 +#: builtin/merge.c:196 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:197 +#: builtin/merge.c:198 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:200 +#: builtin/merge.c:201 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:202 +#: builtin/merge.c:203 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:204 +#: builtin/merge.c:205 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:205 +#: builtin/merge.c:206 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:211 +#: builtin/merge.c:212 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:212 builtin/notes.c:742 builtin/revert.c:89 +#: builtin/merge.c:213 builtin/notes.c:741 builtin/revert.c:89 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:214 +#: builtin/merge.c:215 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:215 +#: builtin/merge.c:216 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:217 +#: builtin/merge.c:218 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:221 +#: builtin/merge.c:222 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" @@ -6776,33 +6978,33 @@ msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/merge.c:678 +#: builtin/merge.c:677 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:692 +#: builtin/merge.c:691 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:705 +#: builtin/merge.c:704 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:794 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:803 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra " "den.\n" -#: builtin/merge.c:809 +#: builtin/merge.c:808 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6818,163 +7020,163 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:833 +#: builtin/merge.c:832 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:845 +#: builtin/merge.c:844 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:908 +#: builtin/merge.c:907 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: builtin/merge.c:924 +#: builtin/merge.c:923 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" -#: builtin/merge.c:965 +#: builtin/merge.c:964 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:967 +#: builtin/merge.c:966 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:969 +#: builtin/merge.c:968 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:974 +#: builtin/merge.c:973 #, 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:1130 +#: builtin/merge.c:1129 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1146 git-pull.sh:31 +#: builtin/merge.c:1145 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" -"Checka in dina ändringar innan du kan slå ihop." +"Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1149 git-pull.sh:34 +#: builtin/merge.c:1148 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: builtin/merge.c:1153 +#: builtin/merge.c:1152 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" -"Please, commit your changes before you can merge." +"Please, commit your changes before you merge." msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" -"Checka in dina ändringar innan du kan slå ihop." +"Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1156 +#: builtin/merge.c:1155 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:1165 +#: builtin/merge.c:1164 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1174 +#: builtin/merge.c:1173 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1206 +#: builtin/merge.c:1205 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:1209 +#: builtin/merge.c:1208 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1211 +#: builtin/merge.c:1210 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:1216 +#: builtin/merge.c:1215 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1267 +#: builtin/merge.c:1266 #, 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:1270 +#: builtin/merge.c:1269 #, 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:1273 +#: builtin/merge.c:1272 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: builtin/merge.c:1276 +#: builtin/merge.c:1275 #, 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:1357 +#: builtin/merge.c:1356 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1396 +#: builtin/merge.c:1395 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1403 +#: builtin/merge.c:1402 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1435 +#: builtin/merge.c:1434 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1458 builtin/merge.c:1537 +#: builtin/merge.c:1457 builtin/merge.c:1536 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1462 +#: builtin/merge.c:1461 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1528 +#: builtin/merge.c:1527 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1530 +#: builtin/merge.c:1529 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1538 #, 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:1551 +#: builtin/merge.c:1550 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7079,86 +7281,91 @@ msgstr "tillåt skapa mer än ett träd" msgid "git mv [options] <source>... <destination>" msgstr "git mv [flaggor] <källa>... <mål>" +#: builtin/mv.c:69 +#, c-format +msgid "Directory %s is in index and no submodule?" +msgstr "Katalogen %s är i indexet och inte en undermodul?" + #: builtin/mv.c:71 +msgid "Please stage your changes to .gitmodules or stash them to proceed" +msgstr "" +"Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" + +#: builtin/mv.c:89 +#, c-format +msgid "%.*s is in index" +msgstr "%.*s är i indexet" + +#: builtin/mv.c:111 msgid "force move/rename even if target exists" msgstr "tvinga flytta/ändra namn även om målet finns" -#: builtin/mv.c:72 +#: builtin/mv.c:112 msgid "skip move/rename errors" msgstr "hoppa över fel vid flytt/namnändring" -#: builtin/mv.c:122 +#: builtin/mv.c:151 +#, c-format +msgid "destination '%s' is not a directory" +msgstr "destinationen \"%s\" är ingen katalog" + +#: builtin/mv.c:162 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n" -#: builtin/mv.c:126 +#: builtin/mv.c:166 msgid "bad source" msgstr "felaktig källa" -#: builtin/mv.c:129 +#: builtin/mv.c:169 msgid "can not move directory into itself" msgstr "kan inte flytta katalog till sig själv" -#: builtin/mv.c:132 +#: builtin/mv.c:172 msgid "cannot move directory over file" msgstr "kan inte flytta katalog över fil" -#: builtin/mv.c:138 -#, c-format -msgid "Huh? Directory %s is in index and no submodule?" -msgstr "Vad? Katalogen %s är i indexet och inte en undermodul?" - -#: builtin/mv.c:140 builtin/rm.c:318 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" - -#: builtin/mv.c:156 -#, c-format -msgid "Huh? %.*s is in index?" -msgstr "Vad? %.*s är i indexet?" - -#: builtin/mv.c:169 +#: builtin/mv.c:181 msgid "source directory is empty" msgstr "källkatalogen är tom" -#: builtin/mv.c:205 +#: builtin/mv.c:206 msgid "not under version control" msgstr "inte versionshanterad" -#: builtin/mv.c:208 +#: builtin/mv.c:209 msgid "destination exists" msgstr "destinationen finns" -#: builtin/mv.c:216 +#: builtin/mv.c:217 #, c-format msgid "overwriting '%s'" msgstr "skriver över \"%s\"" -#: builtin/mv.c:219 +#: builtin/mv.c:220 msgid "Cannot overwrite" msgstr "Kan inte skriva över" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "multiple sources for the same target" msgstr "flera källor för samma mål" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "destination directory does not exist" msgstr "destinationskatalogen finns inte" -#: builtin/mv.c:244 +#: builtin/mv.c:232 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, källa=%s, mål=%s" -#: builtin/mv.c:254 +#: builtin/mv.c:253 #, c-format msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:358 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" @@ -7315,118 +7522,118 @@ msgstr "git notes prune [<flaggor>]" msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:137 +#: builtin/notes.c:136 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "kunde inte starta \"show\" för objektet \"%s\"" -#: builtin/notes.c:141 +#: builtin/notes.c:140 msgid "could not read 'show' output" msgstr "kunde inte läsa utdata från \"show\"" -#: builtin/notes.c:149 +#: builtin/notes.c:148 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" -#: builtin/notes.c:167 builtin/tag.c:477 +#: builtin/notes.c:166 builtin/tag.c:477 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: builtin/notes.c:186 +#: builtin/notes.c:185 msgid "Please supply the note contents using either -m or -F option" msgstr "Ange innehåll för anteckningen med antingen -m eller -F" -#: builtin/notes.c:207 builtin/notes.c:848 +#: builtin/notes.c:206 builtin/notes.c:847 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" -#: builtin/notes.c:212 +#: builtin/notes.c:211 msgid "unable to write note object" msgstr "kunde inte skriva anteckningsobjekt" -#: builtin/notes.c:214 +#: builtin/notes.c:213 #, c-format -msgid "The note contents has been left in %s" +msgid "The note contents have been left in %s" msgstr "Anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:248 builtin/tag.c:692 +#: builtin/notes.c:247 builtin/tag.c:693 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:250 builtin/tag.c:695 +#: builtin/notes.c:249 builtin/tag.c:696 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" -#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322 -#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519 -#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641 -#: builtin/notes.c:843 builtin/tag.c:708 +#: builtin/notes.c:268 builtin/notes.c:319 builtin/notes.c:321 +#: builtin/notes.c:381 builtin/notes.c:435 builtin/notes.c:518 +#: builtin/notes.c:523 builtin/notes.c:598 builtin/notes.c:640 +#: builtin/notes.c:842 builtin/tag.c:709 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/notes.c:272 +#: builtin/notes.c:271 #, c-format msgid "Failed to read object '%s'." msgstr "Kunde inte läsa objektet \"%s\"." -#: builtin/notes.c:276 +#: builtin/notes.c:275 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"." -#: builtin/notes.c:316 +#: builtin/notes.c:315 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/notes.c:331 +#: builtin/notes.c:330 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502 -#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634 -#: builtin/notes.c:908 +#: builtin/notes.c:374 builtin/notes.c:428 builtin/notes.c:501 +#: builtin/notes.c:513 builtin/notes.c:586 builtin/notes.c:633 +#: builtin/notes.c:907 msgid "too many parameters" msgstr "för många parametrar" -#: builtin/notes.c:388 builtin/notes.c:647 +#: builtin/notes.c:387 builtin/notes.c:646 #, c-format msgid "No note found for object %s." msgstr "Inga anteckningar hittades för objektet %s." -#: builtin/notes.c:410 builtin/notes.c:567 +#: builtin/notes.c:409 builtin/notes.c:566 msgid "note contents as a string" msgstr "anteckningsinnehåll som sträng" -#: builtin/notes.c:413 builtin/notes.c:570 +#: builtin/notes.c:412 builtin/notes.c:569 msgid "note contents in a file" msgstr "anteckningsinnehåll i en fil" -#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572 -#: builtin/notes.c:575 builtin/tag.c:627 +#: builtin/notes.c:414 builtin/notes.c:417 builtin/notes.c:571 +#: builtin/notes.c:574 builtin/tag.c:628 msgid "object" msgstr "objekt" -#: builtin/notes.c:416 builtin/notes.c:573 +#: builtin/notes.c:415 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "återanvänd och redigera angivet anteckningsobjekt" -#: builtin/notes.c:419 builtin/notes.c:576 +#: builtin/notes.c:418 builtin/notes.c:575 msgid "reuse specified note object" msgstr "återanvänd angivet anteckningsobjekt" -#: builtin/notes.c:421 builtin/notes.c:489 +#: builtin/notes.c:420 builtin/notes.c:488 msgid "replace existing notes" msgstr "ersätt befintliga anteckningar" -#: builtin/notes.c:455 +#: builtin/notes.c:454 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7435,24 +7642,24 @@ msgstr "" "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för " "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:460 builtin/notes.c:537 +#: builtin/notes.c:459 builtin/notes.c:536 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:490 +#: builtin/notes.c:489 msgid "read objects from stdin" msgstr "läs objekt från standard in" -#: builtin/notes.c:492 +#: builtin/notes.c:491 msgid "load rewriting config for <command> (implies --stdin)" msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)" -#: builtin/notes.c:510 +#: builtin/notes.c:509 msgid "too few parameters" msgstr "för få parametrar" -#: builtin/notes.c:531 +#: builtin/notes.c:530 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7461,12 +7668,12 @@ msgstr "" "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet " "%s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:543 +#: builtin/notes.c:542 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: builtin/notes.c:592 +#: builtin/notes.c:591 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -7475,15 +7682,15 @@ 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:739 +#: builtin/notes.c:738 msgid "General options" msgstr "Allmänna flaggor" -#: builtin/notes.c:741 +#: builtin/notes.c:740 msgid "Merge options" msgstr "Flaggor för sammanslagning" -#: builtin/notes.c:743 +#: builtin/notes.c:742 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -7491,224 +7698,228 @@ msgstr "" "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:745 +#: builtin/notes.c:744 msgid "Committing unmerged notes" msgstr "Checkar in ej sammanslagna anteckningar" -#: builtin/notes.c:747 +#: builtin/notes.c:746 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:749 +#: builtin/notes.c:748 msgid "Aborting notes merge resolution" msgstr "Avbryt lösning av sammanslagning av anteckningar" -#: builtin/notes.c:751 +#: builtin/notes.c:750 msgid "abort notes merge" msgstr "avbryt sammanslagning av anteckningar" -#: builtin/notes.c:846 +#: builtin/notes.c:845 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:858 +#: builtin/notes.c:857 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:861 +#: builtin/notes.c:860 msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:942 +#: builtin/notes.c:941 msgid "notes-ref" msgstr "anteckningar-ref" -#: builtin/notes.c:943 +#: builtin/notes.c:942 msgid "use notes from <notes_ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:978 builtin/remote.c:1616 +#: builtin/notes.c:977 builtin/remote.c:1624 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" -#: builtin/pack-objects.c:25 +#: builtin/pack-objects.c:28 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "git pack-objects --stdout [flaggor...] [< reflista | < objektlista]" -#: builtin/pack-objects.c:26 +#: builtin/pack-objects.c:29 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]" -#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:771 +#: builtin/pack-objects.c:773 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1015 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:2174 +#: builtin/pack-objects.c:2175 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2526 +#: builtin/pack-objects.c:2572 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2530 +#: builtin/pack-objects.c:2576 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2553 +#: builtin/pack-objects.c:2599 #, c-format msgid "option %s does not accept negative form" msgstr "flaggan %s godtar inte negativ form" -#: builtin/pack-objects.c:2557 +#: builtin/pack-objects.c:2603 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "kunde inte tolka värdet \"%s\" för flaggan %s" -#: builtin/pack-objects.c:2576 +#: builtin/pack-objects.c:2622 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2578 +#: builtin/pack-objects.c:2624 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2580 +#: builtin/pack-objects.c:2626 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2583 +#: builtin/pack-objects.c:2629 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsmätaren visas" -#: builtin/pack-objects.c:2584 +#: builtin/pack-objects.c:2630 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2585 +#: builtin/pack-objects.c:2631 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2634 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2590 +#: builtin/pack-objects.c:2636 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2638 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2640 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2642 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:2598 +#: builtin/pack-objects.c:2644 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:2600 +#: builtin/pack-objects.c:2646 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2602 +#: builtin/pack-objects.c:2648 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2650 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2652 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:2608 +#: builtin/pack-objects.c:2654 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2656 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2658 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:2615 +#: builtin/pack-objects.c:2661 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2664 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2667 +msgid "include objects referred to by the index" +msgstr "inkludera objekt som refereras från indexet" + +#: builtin/pack-objects.c:2670 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2672 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2674 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2626 parse-options.h:140 +#: builtin/pack-objects.c:2675 parse-options.h:140 msgid "time" msgstr "tid" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2676 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2630 +#: builtin/pack-objects.c:2679 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2632 +#: builtin/pack-objects.c:2681 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2683 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2685 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2638 +#: builtin/pack-objects.c:2687 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:2640 +#: builtin/pack-objects.c:2689 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:2719 +#: builtin/pack-objects.c:2778 msgid "Counting objects" msgstr "Räknar objekt" @@ -7728,7 +7939,7 @@ msgstr "ta bort lösa referenser (standard)" msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" -#: builtin/prune-packed.c:49 +#: builtin/prune-packed.c:40 msgid "Removing duplicate objects" msgstr "Tar bort duplicerade objekt" @@ -7736,15 +7947,15 @@ msgstr "Tar bort duplicerade objekt" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]" -#: builtin/prune.c:142 +#: builtin/prune.c:106 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" -#: builtin/prune.c:143 +#: builtin/prune.c:107 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:146 +#: builtin/prune.c:110 msgid "expire objects older than <time>" msgstr "låt tid gå ut för objekt äldre än <tid>" @@ -8002,79 +8213,79 @@ msgstr "--mirror kan inte kombineras med referensspecifikationer" msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:482 +#: builtin/push.c:493 msgid "repository" msgstr "arkiv" -#: builtin/push.c:483 +#: builtin/push.c:494 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:484 +#: builtin/push.c:495 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:486 +#: builtin/push.c:497 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:487 +#: builtin/push.c:498 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:490 +#: builtin/push.c:501 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:492 +#: builtin/push.c:503 msgid "refname>:<expect" msgstr "refnamn>:<förvänta" -#: builtin/push.c:493 +#: builtin/push.c:504 msgid "require old value of ref to be at this value" msgstr "kräv att ref:s tidigare värde är detta" -#: builtin/push.c:495 -msgid "check" -msgstr "kontrollera" - -#: builtin/push.c:496 +#: builtin/push.c:507 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:498 +#: builtin/push.c:509 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:499 builtin/push.c:500 +#: builtin/push.c:510 builtin/push.c:511 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:501 +#: builtin/push.c:512 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:504 +#: builtin/push.c:515 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:506 +#: builtin/push.c:517 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:507 +#: builtin/push.c:518 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:517 +#: builtin/push.c:520 +msgid "GPG sign the push" +msgstr "GPG-signera insändningen" + +#: builtin/push.c:529 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är inkompatibel med --all, --mirror och --tags" -#: builtin/push.c:519 +#: builtin/push.c:531 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" -#: builtin/read-tree.c:36 +#: builtin/read-tree.c:37 msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -8084,67 +8295,67 @@ 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:109 +#: builtin/read-tree.c:110 msgid "write resulting index to <file>" msgstr "skriv resulterande index till <fil>" -#: builtin/read-tree.c:112 +#: builtin/read-tree.c:113 msgid "only empty the index" msgstr "töm bara indexet" -#: builtin/read-tree.c:114 +#: builtin/read-tree.c:115 msgid "Merging" msgstr "Sammanslagning" -#: builtin/read-tree.c:116 +#: builtin/read-tree.c:117 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:118 +#: builtin/read-tree.c:119 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:120 +#: builtin/read-tree.c:121 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:122 +#: builtin/read-tree.c:123 msgid "same as -m, but discard unmerged entries" msgstr "som -m, men kasta bort ej sammanslagna poster" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:124 msgid "<subdirectory>/" msgstr "<underkatalog>/" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:125 msgid "read the tree into the index under <subdirectory>/" msgstr "läs in trädet i indexet under <underkatalog>/" -#: builtin/read-tree.c:127 +#: builtin/read-tree.c:128 msgid "update working tree with merge result" msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c:130 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:131 msgid "allow explicitly ignored files to be overwritten" msgstr "tillåt explicit ignorerade filer att skrivas över" -#: builtin/read-tree.c:133 +#: builtin/read-tree.c:134 msgid "don't check the working tree after merging" msgstr "kontrollera inte arbetskatalogen efter sammanslagning" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:135 msgid "don't update the index or the work tree" msgstr "uppdatera inte indexet eller arbetskatalogen" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" msgstr "hoppa över att applicera filter för gles utcheckning" -#: builtin/read-tree.c:138 +#: builtin/read-tree.c:139 msgid "debug unpack-trees" msgstr "felsök unpack-trees" @@ -8294,12 +8505,12 @@ msgstr "att ange en master-gren ger ingen mening med --mirror" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar" -#: builtin/remote.c:185 builtin/remote.c:640 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "fjärrarkivet %s finns redan." -#: builtin/remote.c:189 builtin/remote.c:644 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" @@ -8309,11 +8520,6 @@ msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" msgid "Could not setup master '%s'" msgstr "Kunde inte skapa master \"%s\"" -#: builtin/remote.c:288 -#, c-format -msgid "more than one %s" -msgstr "mer än en %s" - #: builtin/remote.c:333 #, c-format msgid "Could not get fetch map for refspec %s" @@ -8327,27 +8533,27 @@ msgstr "(matchande)" msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Kunde inte tillämpa \"%s\" på \"%s\"" -#: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894 +#: builtin/remote.c:634 builtin/remote.c:798 builtin/remote.c:898 #, c-format msgid "No such remote: %s" msgstr "Inget sådant fjärrarkiv: %s" -#: builtin/remote.c:650 +#: builtin/remote.c:651 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:656 builtin/remote.c:846 +#: builtin/remote.c:657 builtin/remote.c:850 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:671 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8358,32 +8564,32 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:677 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "Kunde inte lägga till på \"%s\"" -#: builtin/remote.c:688 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "Kunde inte sätta \"%s\"" -#: builtin/remote.c:710 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:744 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:765 +#: builtin/remote.c:769 #, c-format msgid "Could not remove branch %s" msgstr "Kunde inte ta bort grenen %s" -#: builtin/remote.c:832 +#: builtin/remote.c:836 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8397,262 +8603,262 @@ 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:947 +#: builtin/remote.c:951 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:950 +#: builtin/remote.c:954 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:952 +#: builtin/remote.c:956 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:954 +#: builtin/remote.c:958 msgid " ???" msgstr " ???" -#: builtin/remote.c:995 +#: builtin/remote.c:999 #, 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:1002 +#: builtin/remote.c:1006 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:1005 +#: builtin/remote.c:1009 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:1006 +#: builtin/remote.c:1010 msgid " and with remote" msgstr " och med fjärren" -#: builtin/remote.c:1008 +#: builtin/remote.c:1012 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:1009 +#: builtin/remote.c:1013 msgid " and with remote" msgstr " och med fjärren" -#: builtin/remote.c:1055 +#: builtin/remote.c:1059 msgid "create" msgstr "skapa" -#: builtin/remote.c:1058 +#: builtin/remote.c:1062 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1062 +#: builtin/remote.c:1066 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1065 +#: builtin/remote.c:1069 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1068 +#: builtin/remote.c:1072 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1075 +#: builtin/remote.c:1079 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1078 +#: builtin/remote.c:1082 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1082 +#: builtin/remote.c:1086 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1085 +#: builtin/remote.c:1089 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1153 +#: builtin/remote.c:1157 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1180 +#: builtin/remote.c:1184 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1181 +#: builtin/remote.c:1185 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1182 builtin/remote.c:1329 +#: builtin/remote.c:1186 builtin/remote.c:1333 msgid "(no URL)" msgstr "(ingen URL)" -#: builtin/remote.c:1191 builtin/remote.c:1193 +#: builtin/remote.c:1195 builtin/remote.c:1197 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199 +#: builtin/remote.c:1199 builtin/remote.c:1201 builtin/remote.c:1203 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1201 +#: builtin/remote.c:1205 #, 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:1213 +#: builtin/remote.c:1217 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1216 builtin/remote.c:1243 +#: builtin/remote.c:1220 builtin/remote.c:1247 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1225 +#: builtin/remote.c:1229 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:1233 +#: builtin/remote.c:1237 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1240 +#: builtin/remote.c:1244 #, 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:1261 +#: builtin/remote.c:1265 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1263 +#: builtin/remote.c:1267 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1278 +#: builtin/remote.c:1282 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1280 +#: builtin/remote.c:1284 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:1290 +#: builtin/remote.c:1294 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1302 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1300 +#: builtin/remote.c:1304 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1318 +#: builtin/remote.c:1322 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1319 +#: builtin/remote.c:1323 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1325 +#: builtin/remote.c:1329 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1326 +#: builtin/remote.c:1330 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1349 +#: builtin/remote.c:1357 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1352 +#: builtin/remote.c:1360 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1397 +#: builtin/remote.c:1405 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1463 builtin/remote.c:1537 +#: builtin/remote.c:1471 builtin/remote.c:1545 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1483 +#: builtin/remote.c:1491 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1490 +#: builtin/remote.c:1498 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1512 +#: builtin/remote.c:1520 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1514 +#: builtin/remote.c:1522 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1516 +#: builtin/remote.c:1524 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1523 +#: builtin/remote.c:1531 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1563 +#: builtin/remote.c:1571 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1571 +#: builtin/remote.c:1579 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1573 +#: builtin/remote.c:1581 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/remote.c:1587 +#: builtin/remote.c:1595 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" @@ -8749,22 +8955,22 @@ msgstr "git replace -d <objekt>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<mönster>]]" -#: builtin/replace.c:322 builtin/replace.c:360 builtin/replace.c:388 +#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 #, c-format msgid "Not a valid object name: '%s'" msgstr "Objektnamnet är inte giltigt: \"%s\"" -#: builtin/replace.c:352 +#: builtin/replace.c:355 #, c-format msgid "bad mergetag in commit '%s'" msgstr "felaktig sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:354 +#: builtin/replace.c:357 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "felformad sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:365 +#: builtin/replace.c:368 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -8773,45 +8979,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:398 +#: builtin/replace.c:401 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur." -#: builtin/replace.c:399 +#: builtin/replace.c:402 msgid "the signature will be removed in the replacement commit!" msgstr "signaturen kommer att tas bort i ersättningsincheckningen!" -#: builtin/replace.c:405 +#: builtin/replace.c:408 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "kunde inte skriva ersättningsincheckning för: \"%s\"" -#: builtin/replace.c:429 +#: builtin/replace.c:432 msgid "list replace refs" msgstr "visa ersättningsreferenser" -#: builtin/replace.c:430 +#: builtin/replace.c:433 msgid "delete replace refs" msgstr "ta bort ersättningsreferenser" -#: builtin/replace.c:431 +#: builtin/replace.c:434 msgid "edit existing object" msgstr "redigera befintligt objekt" -#: builtin/replace.c:432 +#: builtin/replace.c:435 msgid "change a commit's parents" msgstr "ändra en inchecknings föräldrar" -#: builtin/replace.c:433 +#: builtin/replace.c:436 msgid "replace the ref if it exists" msgstr "ersätt referensen om den finns" -#: builtin/replace.c:434 +#: builtin/replace.c:437 msgid "do not pretty-print contents for --edit" msgstr "använd inte snygg visning av innehåll för --edit" -#: builtin/replace.c:435 +#: builtin/replace.c:438 msgid "use this format" msgstr "använd detta format" @@ -8823,155 +9029,155 @@ msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" msgid "register clean resolutions in index" msgstr "registrera rena lösningar i indexet" -#: builtin/reset.c:25 +#: builtin/reset.c:26 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]" -#: builtin/reset.c:26 +#: builtin/reset.c:27 msgid "git reset [-q] <tree-ish> [--] <paths>..." msgstr "git reset [-q] <träd-igt> [--] <sökvägar>..." -#: builtin/reset.c:27 +#: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "mixed" msgstr "blandad" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "soft" msgstr "mjuk" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "hard" msgstr "hård" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "merge" msgstr "sammanslagning" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "keep" msgstr "behåll" -#: builtin/reset.c:73 +#: builtin/reset.c:74 msgid "You do not have a valid HEAD." msgstr "Du har inte en giltig HEAD." -#: builtin/reset.c:75 +#: builtin/reset.c:76 msgid "Failed to find tree of HEAD." msgstr "Kunde inte hitta träder för HEAD." -#: builtin/reset.c:81 +#: builtin/reset.c:82 #, c-format msgid "Failed to find tree of %s." msgstr "Kunde inte hitta träder för %s." -#: builtin/reset.c:99 +#: builtin/reset.c:100 #, c-format msgid "HEAD is now at %s" msgstr "HEAD är nu på %s" -#: builtin/reset.c:182 +#: builtin/reset.c:183 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." -#: builtin/reset.c:275 +#: builtin/reset.c:276 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" -#: builtin/reset.c:277 +#: builtin/reset.c:278 msgid "reset HEAD and index" msgstr "återställ HEAD och index" -#: builtin/reset.c:278 +#: builtin/reset.c:279 msgid "reset only HEAD" msgstr "återställ endast HEAD" -#: builtin/reset.c:280 builtin/reset.c:282 +#: builtin/reset.c:281 builtin/reset.c:283 msgid "reset HEAD, index and working tree" msgstr "återställ HEAD, index och arbetskatalog" -#: builtin/reset.c:284 +#: builtin/reset.c:285 msgid "reset HEAD but keep local changes" msgstr "återställ HEAD men behåll lokala ändringar" -#: builtin/reset.c:287 +#: builtin/reset.c:288 msgid "record only the fact that removed paths will be added later" msgstr "registrera endast att borttagna sökvägar kommer läggas till senare" -#: builtin/reset.c:304 +#: builtin/reset.c:305 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Kunde inte slå upp \"%s\" som en giltig revision." -#: builtin/reset.c:307 builtin/reset.c:315 +#: builtin/reset.c:308 builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"" -#: builtin/reset.c:312 +#: builtin/reset.c:313 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd." -#: builtin/reset.c:321 +#: builtin/reset.c:322 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch är inkompatibel med --{hard,mixed,soft}" -#: builtin/reset.c:330 +#: builtin/reset.c:331 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"." -#: builtin/reset.c:332 +#: builtin/reset.c:333 #, c-format msgid "Cannot do %s reset with paths." msgstr "Kan inte göra %s återställning med sökvägar." -#: builtin/reset.c:342 +#: builtin/reset.c:343 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s återställning tillåts inte i ett naket arkiv" -#: builtin/reset.c:346 +#: builtin/reset.c:347 msgid "-N can only be used with --mixed" msgstr "-N kan endast användas med --mixed" -#: builtin/reset.c:363 +#: builtin/reset.c:364 msgid "Unstaged changes after reset:" msgstr "Oköade ändringar efter återställning:" -#: builtin/reset.c:369 +#: builtin/reset.c:370 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." -#: builtin/reset.c:373 +#: builtin/reset.c:374 msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-parse.c:360 +#: builtin/rev-parse.c:361 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [options] -- [<argument>...]" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" msgstr "behåll \"--\" sänt som argument" -#: builtin/rev-parse.c:367 +#: builtin/rev-parse.c:368 msgid "stop parsing after the first non-option argument" msgstr "sluta tolka efter första argument som inte är flagga" -#: builtin/rev-parse.c:370 +#: builtin/rev-parse.c:371 msgid "output in stuck long form" msgstr "utdata fast i lång form" -#: builtin/rev-parse.c:498 +#: builtin/rev-parse.c:499 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -9084,7 +9290,7 @@ msgid "" "the following submodule (or one of its nested submodules)\n" "uses a .git directory:" msgid_plural "" -"the following submodules (or one of its nested submodules)\n" +"the following submodules (or one of their nested submodules)\n" "use a .git directory:" msgstr[0] "" "följande undermodul (eller en av dess nästlade undermoduler)\n" @@ -9161,6 +9367,11 @@ msgstr "tillåt rekursiv borttagning" msgid "exit with a zero status even if nothing matched" msgstr "avsluta med nollstatus även om inget träffades" +#: builtin/rm.c:318 +msgid "Please, stage your changes to .gitmodules or stash them to proceed" +msgstr "" +"Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" + #: builtin/rm.c:336 #, c-format msgid "not removing '%s' recursively without -r" @@ -9282,11 +9493,11 @@ msgstr "visa <n> nyaste refloggposter med början på bas" #: builtin/show-ref.c:10 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] [-s|--" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--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] [-s|--" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] " #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" @@ -9345,11 +9556,11 @@ msgstr "ta bort symbolisk referens" msgid "shorten ref output" msgstr "förkorta ref-utdata" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "skäl" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "skäl till uppdateringen" @@ -9472,236 +9683,226 @@ msgstr "flaggan \"points-at\" behöver ett objekt" msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: builtin/tag.c:588 +#: builtin/tag.c:589 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:590 +#: builtin/tag.c:591 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:592 +#: builtin/tag.c:593 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:593 +#: builtin/tag.c:594 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:595 +#: builtin/tag.c:596 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:597 +#: builtin/tag.c:598 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:599 +#: builtin/tag.c:600 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:601 +#: builtin/tag.c:602 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:605 +#: builtin/tag.c:606 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:606 +#: builtin/tag.c:607 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:607 +#: builtin/tag.c:608 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:609 +#: builtin/tag.c:610 msgid "sort tags" msgstr "sortera taggar" -#: builtin/tag.c:613 +#: builtin/tag.c:614 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:616 builtin/tag.c:622 +#: builtin/tag.c:617 builtin/tag.c:623 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:628 +#: builtin/tag.c:629 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:654 +#: builtin/tag.c:655 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:666 +#: builtin/tag.c:667 msgid "--sort and -n are incompatible" msgstr "--sort och -n är inkompatibla" -#: builtin/tag.c:673 +#: builtin/tag.c:674 msgid "-n option is only allowed with -l." msgstr "Flaggan -n är endast tillåten tillsammans med -l." -#: builtin/tag.c:675 +#: builtin/tag.c:676 msgid "--contains option is only allowed with -l." msgstr "Flaggan --contains är endast tillåten tillsammans med -l" -#: builtin/tag.c:677 +#: builtin/tag.c:678 msgid "--points-at option is only allowed with -l." msgstr "Flaggan --points-at är endast tillåten tillsammans med -l." -#: builtin/tag.c:685 +#: builtin/tag.c:686 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:705 +#: builtin/tag.c:706 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:711 +#: builtin/tag.c:712 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:716 +#: builtin/tag.c:717 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:734 -#, c-format -msgid "%s: cannot lock the ref" -msgstr "%s: kan inte låsa referensen" - -#: builtin/tag.c:736 -#, c-format -msgid "%s: cannot update the ref" -msgstr "%s: kan inte uppdatera referensen" - -#: builtin/tag.c:738 +#: builtin/tag.c:741 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" -#: builtin/unpack-objects.c:483 +#: builtin/unpack-objects.c:489 msgid "Unpacking objects" msgstr "Packar upp objekt" -#: builtin/update-index.c:402 +#: builtin/update-index.c:403 msgid "git update-index [options] [--] [<file>...]" msgstr "git update-index [flaggor] [--] [<fil>...]" -#: builtin/update-index.c:755 +#: builtin/update-index.c:756 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:758 +#: builtin/update-index.c:759 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:761 +#: builtin/update-index.c:762 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:763 +#: builtin/update-index.c:764 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:765 +#: builtin/update-index.c:766 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:767 +#: builtin/update-index.c:768 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:770 +#: builtin/update-index.c:771 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:774 +#: builtin/update-index.c:775 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:778 +#: builtin/update-index.c:779 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:779 +#: builtin/update-index.c:780 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:783 +#: builtin/update-index.c:784 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/update-index.c:788 +#: builtin/update-index.c:789 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:791 +#: builtin/update-index.c:792 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:794 +#: builtin/update-index.c:795 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:797 +#: builtin/update-index.c:798 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:800 +#: builtin/update-index.c:801 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:802 +#: builtin/update-index.c:803 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:804 +#: builtin/update-index.c:805 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:806 +#: builtin/update-index.c:807 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:810 +#: builtin/update-index.c:811 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:814 +#: builtin/update-index.c:815 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:818 +#: builtin/update-index.c:819 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:822 +#: builtin/update-index.c:823 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:825 +#: builtin/update-index.c:826 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:827 +#: builtin/update-index.c:828 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:831 +#: builtin/update-index.c:832 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:833 +#: builtin/update-index.c:834 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" @@ -9717,19 +9918,19 @@ msgstr "git update-ref [flaggor] <refnamn> <gammaltvärde> [<nyttvärde>]" msgid "git update-ref [options] --stdin [-z]" msgstr "git update-ref [flaggor] --stdin [-z]" -#: builtin/update-ref.c:350 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "ta bort referensen" -#: builtin/update-ref.c:352 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "uppdatera <refnamn> inte det den pekar på" -#: builtin/update-ref.c:353 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "standard in har NUL-terminerade argument" -#: builtin/update-ref.c:354 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "läs uppdateringar från standard in" @@ -9749,15 +9950,15 @@ msgstr "git verify-commit [-v|--verbose] <incheckning>..." msgid "print commit contents" msgstr "visa innehåll för incheckning" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:54 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <paket>..." -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:64 msgid "verbose" msgstr "pratsam" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:66 msgid "show statistics only" msgstr "visa endast statistik" @@ -9785,9 +9986,13 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" +#: credential-cache--daemon.c:267 +msgid "print debugging messages to stderr" +msgstr "skriv felsökningsmeddelanden på standard fel" + #: git.c:17 msgid "" -"'git help -a' and 'git help -g' lists available subcommands and some\n" +"'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "" @@ -9795,26 +10000,6 @@ 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." -#: parse-options.h:143 -msgid "expiry-date" -msgstr "giltig-till" - -#: parse-options.h:158 -msgid "no-op (backward compatibility)" -msgstr "ingen funktion (bakåtkompatibilitet)" - -#: parse-options.h:232 -msgid "be more verbose" -msgstr "var mer pratsam" - -#: parse-options.h:234 -msgid "be more quiet" -msgstr "var mer tyst" - -#: parse-options.h:240 -msgid "use <n> digits to display SHA-1s" -msgstr "använd <n> siffror för att visa SHA-1:or" - #: common-cmds.h:8 msgid "Add file contents to the index" msgstr "Lägg filinnehåll till indexet" @@ -9899,6 +10084,30 @@ msgstr "Visa status för arbetskatalogen" msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt" +#: parse-options.h:143 +msgid "expiry-date" +msgstr "giltig-till" + +#: parse-options.h:158 +msgid "no-op (backward compatibility)" +msgstr "ingen funktion (bakåtkompatibilitet)" + +#: parse-options.h:232 +msgid "be more verbose" +msgstr "var mer pratsam" + +#: parse-options.h:234 +msgid "be more quiet" +msgstr "var mer tyst" + +#: parse-options.h:240 +msgid "use <n> digits to display SHA-1s" +msgstr "använd <n> siffror för att visa SHA-1:or" + +#: rerere.h:27 +msgid "update the index with reused conflict resolution if possible" +msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt" + #: git-am.sh:52 msgid "You need to set your committer info first" msgstr "Du måste ställa in din incheckarinformation först" @@ -10155,7 +10364,7 @@ msgstr "Är du säker [Y=ja/N=nej]? " #: git-bisect.sh:289 msgid "" -"You need to give me at least one good and one bad revisions.\n" +"You need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "Du måste ange åtminstone en bra och en dålig version.\n" @@ -10164,7 +10373,7 @@ msgstr "" #: git-bisect.sh:292 msgid "" "You need to start by \"git bisect start\".\n" -"You then need to give me at least one good and one bad revisions.\n" +"You then need to give me at least one good and one bad revision.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "Du måste starta med \"git bisect start\".\n" @@ -10237,16 +10446,24 @@ msgstr "\"bisect\"-körningen lyckades" msgid "" "Pull is not possible because you have unmerged files.\n" "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" -"as appropriate to mark resolution, or use 'git commit -a'." +"as appropriate to mark resolution and make a commit." msgstr "" "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in.\n" "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n" -"där det är lämpligt för att ange lösning, eller använd \"git commit -a\"." +"där det är lämpligt för att ange lösning och checka in." #: git-pull.sh:25 msgid "Pull is not possible because you have unmerged files." msgstr "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in." +#: git-pull.sh:31 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" +"Checka in dina ändringar innan du kan slå ihop." + #: git-pull.sh:245 msgid "updating an unborn branch with changes added to the index" msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet" @@ -10500,8 +10717,8 @@ msgstr "För många revisioner angivna: $REV" #: git-stash.sh:397 #, sh-format -msgid "$reference is not valid reference" -msgstr "$reference är inte en giltig referens." +msgid "$reference is not a valid reference" +msgstr "$reference är inte en giltig referens" #: git-stash.sh:425 #, sh-format @@ -10547,11 +10764,11 @@ msgstr "Kastade ${REV} ($s)" msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:538 +#: git-stash.sh:539 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: git-stash.sh:610 +#: git-stash.sh:611 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" @@ -10855,6 +11072,36 @@ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" +#~ msgid "Failed to lock ref for update" +#~ msgstr "Misslyckades låsa referens för uppdatering" + +#~ msgid "Failed to write ref" +#~ msgstr "Misslyckades skriva referens" + +#~ msgid "Failed to lock HEAD during fast_forward_to" +#~ msgstr "Misslyckades låsa HEAD under \"fast_forward_to\"" + +#~ msgid "invalid commit: %s" +#~ msgstr "felaktig incheckning: %s" + +#~ msgid "cannot lock HEAD ref" +#~ msgstr "kunde inte låsa HEAD-referens" + +#~ msgid "cannot update HEAD ref" +#~ msgstr "kunde inte uppdatera HEAD-referens" + +#~ msgid "Invalid %s: '%s'" +#~ msgstr "Felaktigt %s: \"%s\"" + +#~ 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" + +#~ msgid "%s: cannot update the ref" +#~ msgstr "%s: kan inte uppdatera referensen" + #~ msgid "commit has empty message" #~ msgstr "incheckningen har ett tomt meddelande" |