diff options
Diffstat (limited to 'po/sv.po')
| -rw-r--r-- | po/sv.po | 5074 |
1 files changed, 4284 insertions, 790 deletions
@@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 1.7.12\n" +"Project-Id-Version: git 1.8.1\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-08-06 23:47+0800\n" -"PO-Revision-Date: 2012-08-14 09:58+0100\n" +"POT-Creation-Date: 2012-11-30 12:40+0800\n" +"PO-Revision-Date: 2012-11-30 10:49+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -38,6 +38,101 @@ msgstr "" "lämpligt för att ange lösning och checka in,\n" "eller använd \"git commit -a\"." +#: archive.c:10 +msgid "git archive [options] <tree-ish> [<path>...]" +msgstr "git archive [flaggor] <träd-igt> [<sökväg>...]" + +#: archive.c:11 +msgid "git archive --list" +msgstr "git archive --list" + +#: archive.c:12 +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 +msgid "git archive --remote <repo> [--exec <cmd>] --list" +msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" + +#: archive.c:322 +msgid "fmt" +msgstr "fmt" + +#: archive.c:322 +msgid "archive format" +msgstr "arkivformat" + +#: archive.c:323 builtin/log.c:1084 +msgid "prefix" +msgstr "prefix" + +#: archive.c:324 +msgid "prepend prefix to each pathname in the archive" +msgstr "lägg till prefix till varje sökväg i arkivet" + +#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2390 +#: builtin/blame.c:2391 builtin/config.c:55 builtin/fast-export.c:642 +#: builtin/fast-export.c:644 builtin/grep.c:715 builtin/hash-object.c:77 +#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540 +#: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149 +msgid "file" +msgstr "fil" + +#: archive.c:326 builtin/archive.c:92 +msgid "write the archive to this file" +msgstr "skriv arkivet till filen" + +#: archive.c:328 +msgid "read .gitattributes in working directory" +msgstr "läs .gitattributes i arbetskatalogen" + +#: archive.c:329 +msgid "report archived files on stderr" +msgstr "rapportera arkiverade filer på standard fel" + +#: archive.c:330 +msgid "store only" +msgstr "endast spara" + +#: archive.c:331 +msgid "compress faster" +msgstr "komprimera snabbare" + +#: archive.c:339 +msgid "compress better" +msgstr "komprimera bättre" + +#: archive.c:342 +msgid "list supported archive formats" +msgstr "visa understödda arkivformat" + +#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85 +msgid "repo" +msgstr "arkiv" + +#: archive.c:345 builtin/archive.c:94 +msgid "retrieve the archive from remote repository <repo>" +msgstr "hämta arkivet från fjärrarkivet <arkiv>" + +#: archive.c:346 builtin/archive.c:95 builtin/notes.c:619 +msgid "command" +msgstr "kommando" + +#: archive.c:347 builtin/archive.c:96 +msgid "path to the remote git-upload-archive command" +msgstr "sökväg till kommandot git-upload-archive på fjärren" + +#: attr.c:259 +msgid "" +"Negative patterns are forbidden in git attributes\n" +"Use '\\!' for literal leading exclamation." +msgstr "" +"Negativa mönster är förbjudna i git-attribut\n" +"Använd '\\!' för att inleda med ett utropstecken." + #: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -48,7 +143,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:89 builtin/commit.c:699 +#: bundle.c:89 builtin/commit.c:674 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -57,8 +152,8 @@ msgstr "kunde inte öppna \"%s\"" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290 -#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347 +#: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290 +#: builtin/log.c:732 builtin/log.c:1319 builtin/log.c:1535 builtin/merge.c:347 #: builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -85,7 +180,7 @@ msgstr[1] "Paketet (bundlen) kräver dessa %d referenser" msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1215 builtin/shortlog.c:284 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -116,12 +211,12 @@ msgstr "kan inte skapa \"%s\"" msgid "index-pack died" msgstr "index-pack dog" -#: commit.c:48 +#: commit.c:50 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" -#: commit.c:50 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s är inte en incheckning!" @@ -211,17 +306,22 @@ msgid_plural "%lu years ago" msgstr[0] "%lu år sedan" msgstr[1] "%lu år sedan" -#: diff.c:105 +#: diff.c:111 #, c-format -msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" -msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%.*s\"\n" +msgid " Failed to parse dirstat cut-off percentage '%s'\n" +msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:110 +#: diff.c:116 #, c-format -msgid " Unknown dirstat parameter '%.*s'\n" -msgstr " Okänd dirstat-parameter \"%.*s\"\n" +msgid " Unknown dirstat parameter '%s'\n" +msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:210 +#: diff.c:194 +#, c-format +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" + +#: diff.c:237 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -230,32 +330,7 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:1400 -msgid " 0 files changed" -msgstr " 0 filer ändrade" - -#: diff.c:1404 -#, c-format -msgid " %d file changed" -msgid_plural " %d files changed" -msgstr[0] " %d fil ändrad" -msgstr[1] " %d filer ändrade" - -#: diff.c:1421 -#, c-format -msgid ", %d insertion(+)" -msgid_plural ", %d insertions(+)" -msgstr[0] ", %d tillägg(+)" -msgstr[1] ", %d tillägg(+)" - -#: diff.c:1432 -#, c-format -msgid ", %d deletion(-)" -msgid_plural ", %d deletions(-)" -msgstr[0] ", %d borttagning(-)" -msgstr[1] ", %d borttagningar(-)" - -#: diff.c:3461 +#: diff.c:3494 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -264,6 +339,11 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" +#: diff.c:3508 +#, c-format +msgid "Failed to parse --submodule option parameter: '%s'" +msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" + #: gpg-interface.c:59 msgid "could not run gpg." msgstr "kunde inte köra gpg." @@ -276,17 +356,17 @@ msgstr "gpg godtog inte data" msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" -#: grep.c:1320 +#: grep.c:1622 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1337 +#: grep.c:1639 #, c-format msgid "'%s': %s" msgstr "\"%s\": %s" -#: grep.c:1348 +#: grep.c:1650 #, c-format msgid "'%s': short read %s" msgstr "\"%s\": kort läsning %s" @@ -346,6 +426,15 @@ msgstr[1] "" "\n" "Menade du ett av dessa?" +#: merge.c:56 +msgid "failed to read the cache" +msgstr "misslyckads läsa cachen" + +#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534 +#: builtin/clone.c:586 +msgid "unable to write new index file" +msgstr "kunde inte skriva ny indexfil" + #: merge-recursive.c:190 #, c-format msgid "(bad commit)\n" @@ -360,74 +449,66 @@ msgstr "addinfo_cache misslyckades för sökvägen \"%s\"" msgid "error building trees" msgstr "fel vid byggande av träd" -#: merge-recursive.c:497 -msgid "diff setup failed" -msgstr "misslyckades sätta upp för diff" - -#: merge-recursive.c:627 -msgid "merge-recursive: disk full?" -msgstr "merge-recursive: disk full?" - -#: merge-recursive.c:690 +#: merge-recursive.c:672 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:701 +#: merge-recursive.c:683 #, 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" #. something else exists #. .. but not some other error (who really cares what?) -#: merge-recursive.c:715 merge-recursive.c:736 +#: merge-recursive.c:697 merge-recursive.c:718 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:726 +#: merge-recursive.c:708 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:766 +#: merge-recursive.c:748 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:768 +#: merge-recursive.c:750 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:791 builtin/clone.c:302 +#: merge-recursive.c:773 builtin/clone.c:302 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: merge-recursive.c:799 +#: merge-recursive.c:781 #, c-format msgid "failed to symlink '%s'" msgstr "misslyckades ta skapa symboliska länken \"%s\"" -#: merge-recursive.c:802 +#: merge-recursive.c:784 #, 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:939 +#: merge-recursive.c:922 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:943 +#: merge-recursive.c:926 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:959 +#: merge-recursive.c:942 msgid "unsupported object type in the tree" msgstr "objekttyp som ej stöds upptäcktes i trädet" -#: merge-recursive.c:1038 merge-recursive.c:1052 +#: merge-recursive.c:1021 merge-recursive.c:1035 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -436,7 +517,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:1044 merge-recursive.c:1057 +#: merge-recursive.c:1027 merge-recursive.c:1040 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -445,20 +526,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:1098 +#: merge-recursive.c:1081 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1098 +#: merge-recursive.c:1081 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1154 +#: merge-recursive.c:1137 #, 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:1176 +#: merge-recursive.c:1159 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -467,144 +548,144 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1181 +#: merge-recursive.c:1164 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1235 +#: merge-recursive.c:1218 #, 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:1265 +#: merge-recursive.c:1248 #, 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:1464 +#: merge-recursive.c:1447 #, 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:1474 +#: merge-recursive.c:1457 #, c-format msgid "Adding merged %s" msgstr "Lägger till sammanslagen %s" -#: merge-recursive.c:1479 merge-recursive.c:1677 +#: merge-recursive.c:1462 merge-recursive.c:1660 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s iställer" -#: merge-recursive.c:1530 +#: merge-recursive.c:1513 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:1533 +#: merge-recursive.c:1516 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:1581 +#: merge-recursive.c:1564 msgid "modify" msgstr "ändra" -#: merge-recursive.c:1581 +#: merge-recursive.c:1564 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:1591 +#: merge-recursive.c:1574 msgid "content" msgstr "innehåll" -#: merge-recursive.c:1598 +#: merge-recursive.c:1581 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:1632 +#: merge-recursive.c:1615 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:1646 +#: merge-recursive.c:1629 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1650 git-submodule.sh:844 +#: merge-recursive.c:1633 git-submodule.sh:893 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:1651 +#: merge-recursive.c:1634 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:1741 +#: merge-recursive.c:1724 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:1766 +#: merge-recursive.c:1749 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:1772 +#: merge-recursive.c:1755 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:1777 +#: merge-recursive.c:1760 #, 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:1787 +#: merge-recursive.c:1770 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1804 +#: merge-recursive.c:1787 msgid "Fatal merge failure, shouldn't happen." msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa." -#: merge-recursive.c:1823 +#: merge-recursive.c:1806 msgid "Already up-to-date!" msgstr "Redan à jour!" -#: merge-recursive.c:1832 +#: merge-recursive.c:1815 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:1862 +#: merge-recursive.c:1845 #, c-format msgid "Unprocessed path??? %s" msgstr "Obehandlad sökväg??? %s" -#: merge-recursive.c:1907 +#: merge-recursive.c:1890 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:1920 +#: merge-recursive.c:1903 #, 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:1957 +#: merge-recursive.c:1940 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2014 +#: merge-recursive.c:1997 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2026 builtin/merge.c:697 +#: merge-recursive.c:2009 builtin/merge.c:643 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -636,7 +717,11 @@ 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:1638 +#: remote.c:1637 +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:1640 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -646,7 +731,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:1646 +#: remote.c:1647 +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:1650 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -661,19 +750,23 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978 -#: builtin/merge.c:1088 builtin/merge.c:1098 +#: remote.c:1659 +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" + +#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984 +#: builtin/merge.c:994 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868 -#: builtin/merge.c:1090 builtin/merge.c:1103 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986 +#: builtin/merge.c:999 #, c-format msgid "Could not write to '%s'" msgstr "Kunde inte skriva till \"%s\"" -#: sequencer.c:144 +#: sequencer.c:146 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -681,7 +774,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:147 +#: sequencer.c:149 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -691,214 +784,214 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:160 sequencer.c:758 sequencer.c:841 +#: sequencer.c:162 sequencer.c:770 sequencer.c:853 #, c-format msgid "Could not write to %s" msgstr "Kunde inte skriva till %s" -#: sequencer.c:163 +#: sequencer.c:165 #, c-format msgid "Error wrapping up %s" msgstr "Fel vid ombrytning av %s" -#: sequencer.c:178 +#: sequencer.c:180 msgid "Your local changes would be overwritten by cherry-pick." msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"." -#: sequencer.c:180 +#: sequencer.c:182 msgid "Your local changes would be overwritten by revert." msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"." -#: sequencer.c:183 +#: sequencer.c:185 msgid "Commit your changes or stash them to proceed." msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta." #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:233 +#: sequencer.c:235 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:261 +#: sequencer.c:266 msgid "Could not resolve HEAD commit\n" msgstr "Kunde inte bestämma HEAD:s incheckning\n" -#: sequencer.c:282 +#: sequencer.c:287 msgid "Unable to update cache tree\n" msgstr "Kan inte uppdatera cacheträd\n" -#: sequencer.c:324 +#: sequencer.c:332 #, c-format msgid "Could not parse commit %s\n" msgstr "Kunde inte tolka incheckningen %s\n" -#: sequencer.c:329 +#: sequencer.c:337 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:395 +#: sequencer.c:403 msgid "Your index file is unmerged." msgstr "Din indexfil har inte slagits ihop." -#: sequencer.c:398 +#: sequencer.c:406 msgid "You do not have a valid HEAD" msgstr "Du har ingen giltig HEAD" -#: sequencer.c:413 +#: sequencer.c:421 #, 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:421 +#: sequencer.c:429 #, c-format msgid "Commit %s does not have parent %d" msgstr "Incheckning %s har inte förälder %d" -#: sequencer.c:425 +#: sequencer.c:433 #, 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:436 +#: sequencer.c:444 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:440 +#: sequencer.c:448 #, c-format msgid "Cannot get commit message for %s" msgstr "Kan inte hämta incheckningsmeddelande för %s" -#: sequencer.c:524 +#: sequencer.c:532 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:525 +#: sequencer.c:533 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:553 +#: sequencer.c:565 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:561 +#: sequencer.c:573 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:566 +#: sequencer.c:578 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:624 +#: sequencer.c:636 #, c-format msgid "Cannot %s during a %s" msgstr "kan inte %s under en %s" -#: sequencer.c:646 +#: sequencer.c:658 #, c-format msgid "Could not parse line %d." msgstr "Kan inte tolka rad %d." -#: sequencer.c:651 +#: sequencer.c:663 msgid "No commits parsed." msgstr "Inga incheckningar lästes." -#: sequencer.c:664 +#: sequencer.c:676 #, c-format msgid "Could not open %s" msgstr "Kunde inte öppna %s" -#: sequencer.c:668 +#: sequencer.c:680 #, c-format msgid "Could not read %s." msgstr "kunde inte läsa %s." -#: sequencer.c:675 +#: sequencer.c:687 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Oanvändbart manus: %s" -#: sequencer.c:703 +#: sequencer.c:715 #, c-format msgid "Invalid key: %s" msgstr "Felaktig nyckel: %s" -#: sequencer.c:706 +#: sequencer.c:718 #, c-format msgid "Invalid value for %s: %s" msgstr "Felaktigt värde för %s: %s" -#: sequencer.c:718 +#: sequencer.c:730 #, c-format msgid "Malformed options sheet: %s" msgstr "Trasigt manus: %s" -#: sequencer.c:739 +#: sequencer.c:751 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:740 +#: sequencer.c:752 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:744 +#: sequencer.c:756 #, c-format msgid "Could not create sequencer directory %s" msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:760 sequencer.c:845 +#: sequencer.c:772 sequencer.c:857 #, c-format msgid "Error wrapping up %s." msgstr "Fel vid ombrytning av %s." -#: sequencer.c:779 sequencer.c:913 +#: sequencer.c:791 sequencer.c:925 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:781 +#: sequencer.c:793 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:783 +#: sequencer.c:795 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:805 builtin/apply.c:3988 +#: sequencer.c:817 builtin/apply.c:4005 #, c-format msgid "cannot open %s: %s" msgstr "kan inte öppna %s: %s" -#: sequencer.c:808 +#: sequencer.c:820 #, c-format msgid "cannot read %s: %s" msgstr "kan inte läsa %s: %s" -#: sequencer.c:809 +#: sequencer.c:821 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:815 +#: sequencer.c:827 #, 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:838 +#: sequencer.c:850 #, c-format msgid "Could not format %s." msgstr "Kunde inte formatera %s." -#: sequencer.c:1000 +#: sequencer.c:1012 msgid "Can't revert as initial commit" msgstr "Kan inte ångra som första incheckning" -#: sequencer.c:1001 +#: sequencer.c:1013 msgid "Can't cherry-pick into empty head" msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" @@ -921,12 +1014,17 @@ msgstr "Ingen standarduppström angiven för grenen \"%s\"" msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "Uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren" -#: wrapper.c:413 +#: wrapper.c:408 +#, c-format +msgid "unable to access '%s': %s" +msgstr "kan inte komma åt \"%s\": %s" + +#: wrapper.c:426 #, 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:414 +#: wrapper.c:427 msgid "no such user" msgstr "okänd användare" @@ -985,12 +1083,6 @@ msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" -# %s är ett verb ("Untracked"/"Ignored"); lägg till ett -e. -#: wt-status.c:224 -#, c-format -msgid "%s files:" -msgstr "%se filer:" - #: wt-status.c:227 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" @@ -1194,12 +1286,12 @@ msgid "Initial commit" msgstr "Första incheckning" #: wt-status.c:1011 -msgid "Untracked" -msgstr "Ospårad" +msgid "Untracked files" +msgstr "Ospårade filer" #: wt-status.c:1013 -msgid "Ignored" -msgstr "Ignorerad" +msgid "Ignored files" +msgstr "Ignorerade filer" # %s är nästa sträng eller tom. #: wt-status.c:1015 @@ -1215,67 +1307,87 @@ msgstr " (använd flaggan -u för att visa ospårade filer)" msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1027 +#: wt-status.c:1028 #, c-format -msgid "no changes added to commit%s\n" -msgstr "inga ändringar att checka in%s\n" - -#: wt-status.c:1029 -msgid " (use \"git add\" and/or \"git commit -a\")" -msgstr " (använd \"git add\" och/eller \"git commit -a\")" +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:1031 #, c-format -msgid "nothing added to commit but untracked files present%s\n" -msgstr "inget köat för incheckning, men ospårade filer finns%s\n" +msgid "no changes added to commit\n" +msgstr "inga ändringar att checka in\n" -#: wt-status.c:1033 -msgid " (use \"git add\" to track)" -msgstr " (spåra med \"git add\")" +#: wt-status.c:1034 +#, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "" +"inget köat för incheckning, men ospårade filer finns (spåra med \"git add" +"\")\n" + +#: wt-status.c:1037 +#, 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:1035 wt-status.c:1038 wt-status.c:1041 +#: wt-status.c:1040 #, c-format -msgid "nothing to commit%s\n" -msgstr "inget att checka in%s\n" +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:1036 -msgid " (create/copy files and use \"git add\" to track)" -msgstr " (skapa/kopiera filer och spåra med \"git add\")" +#: wt-status.c:1043 wt-status.c:1048 +#, c-format +msgid "nothing to commit\n" +msgstr "inget att checka in\n" -#: wt-status.c:1039 -msgid " (use -u to show untracked files)" -msgstr " (använd -u för att visa ospårade filer)" +#: wt-status.c:1046 +#, 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:1042 -msgid " (working directory clean)" -msgstr " (arbetskatalogen ren)" +#: wt-status.c:1050 +#, c-format +msgid "nothing to commit, working directory clean\n" +msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1150 +#: wt-status.c:1158 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1156 +#: wt-status.c:1164 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1171 +#: wt-status.c:1179 msgid "behind " msgstr "efter " -#: wt-status.c:1174 wt-status.c:1177 +#: wt-status.c:1182 wt-status.c:1185 msgid "ahead " msgstr "före " -#: wt-status.c:1179 +#: wt-status.c:1187 msgid ", behind " msgstr ", efter " +#: compat/precompose_utf8.c:58 builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "misslyckades ta bort länken \"%s\"" + +#: builtin/add.c:19 +msgid "git add [options] [--] <filepattern>..." +msgstr "git add [flaggor] [--] <filmönster>..." + #: builtin/add.c:62 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:67 builtin/commit.c:229 +#: builtin/add.c:67 builtin/commit.c:231 msgid "updating files failed" msgstr "misslyckades uppdatera filer" @@ -1293,7 +1405,7 @@ msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\"" msgid "Unstaged changes after refreshing the index:" msgstr "Ospårade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186 +#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -1330,47 +1442,99 @@ msgstr "Tom patch. Avbryter." msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:312 +#: builtin/add.c:313 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:352 +#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253 +#: builtin/rm.c:206 +msgid "dry run" +msgstr "testkörning" + +#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1160 +#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1483 +#: builtin/mv.c:62 builtin/read-tree.c:112 +msgid "be verbose" +msgstr "var pratsam" + +#: builtin/add.c:322 +msgid "interactive picking" +msgstr "plocka interaktivt" + +#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:248 +msgid "select hunks interactively" +msgstr "välj stycken interaktivt" + +#: builtin/add.c:324 +msgid "edit current diff and apply" +msgstr "redigera aktuell diff och applicera" + +#: builtin/add.c:325 +msgid "allow adding otherwise ignored files" +msgstr "tillåt lägga till annars ignorerade filer" + +#: builtin/add.c:326 +msgid "update tracked files" +msgstr "uppdatera spårade filer" + +#: builtin/add.c:327 +msgid "record only the fact that the path will be added later" +msgstr "registrera endast att sökvägen kommer läggas till senare" + +#: builtin/add.c:328 +msgid "add changes from all tracked and untracked files" +msgstr "lägg till ändringar från alla spårade och ospårade filer" + +#: builtin/add.c:329 +msgid "don't add, only refresh the index" +msgstr "lägg inte till, uppdatera endast indexet" + +#: builtin/add.c:330 +msgid "just skip files which cannot be added because of errors" +msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" + +#: builtin/add.c:331 +msgid "check if - even missing - files are ignored in dry run" +msgstr "se om - även saknade - filer ignoreras i testkörning" + +#: builtin/add.c:353 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Använd -f om du verkligen vill lägga till dem.\n" -#: builtin/add.c:353 +#: builtin/add.c:354 msgid "no files added" msgstr "inga filer har lagts till" -#: builtin/add.c:359 +#: builtin/add.c:360 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:391 +#: builtin/add.c:392 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:393 +#: builtin/add.c:394 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" -#: builtin/add.c:413 +#: builtin/add.c:414 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:414 +#: builtin/add.c:415 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 -#: builtin/rm.c:162 +#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:291 builtin/mv.c:82 +#: builtin/rm.c:235 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:370 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" @@ -1388,52 +1552,52 @@ msgstr "okänt alternativ för whitespace: \"%s\"" msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: builtin/apply.c:824 +#: builtin/apply.c:823 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: builtin/apply.c:833 +#: builtin/apply.c:832 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: builtin/apply.c:914 +#: builtin/apply.c:913 #, 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:946 +#: builtin/apply.c:945 #, 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:950 +#: builtin/apply.c:949 #, 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:951 +#: builtin/apply.c:950 #, 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:958 +#: builtin/apply.c:957 #, 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:1403 +#: builtin/apply.c:1420 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: builtin/apply.c:1460 +#: builtin/apply.c:1477 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: builtin/apply.c:1477 +#: builtin/apply.c:1494 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1449,82 +1613,82 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: builtin/apply.c:1637 +#: builtin/apply.c:1654 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: builtin/apply.c:1639 +#: builtin/apply.c:1656 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: builtin/apply.c:1665 +#: builtin/apply.c:1682 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: builtin/apply.c:1701 +#: builtin/apply.c:1718 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: builtin/apply.c:1703 +#: builtin/apply.c:1720 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: builtin/apply.c:1706 +#: builtin/apply.c:1723 #, 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:1852 +#: builtin/apply.c:1869 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1881 +#: builtin/apply.c:1898 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: builtin/apply.c:1967 +#: builtin/apply.c:1984 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: builtin/apply.c:2057 +#: builtin/apply.c:2074 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/apply.c:2061 +#: builtin/apply.c:2078 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: builtin/apply.c:2132 +#: builtin/apply.c:2149 msgid "oops" msgstr "hoppsan" -#: builtin/apply.c:2654 +#: builtin/apply.c:2671 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: builtin/apply.c:2772 +#: builtin/apply.c:2789 #, 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:2784 +#: builtin/apply.c:2801 #, 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:2790 +#: builtin/apply.c:2807 #, c-format msgid "" "while searching for:\n" @@ -1533,321 +1697,318 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: builtin/apply.c:2809 +#: builtin/apply.c:2826 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: builtin/apply.c:2912 +#: builtin/apply.c:2929 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: builtin/apply.c:2918 +#: builtin/apply.c:2935 #, 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:2939 +#: builtin/apply.c:2956 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: builtin/apply.c:3061 +#: builtin/apply.c:3078 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159 +#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176 #, c-format msgid "read of %s failed" msgstr "misslyckades läsa %s" -#: builtin/apply.c:3139 builtin/apply.c:3361 +#: builtin/apply.c:3156 builtin/apply.c:3378 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: builtin/apply.c:3220 builtin/apply.c:3375 +#: builtin/apply.c:3237 builtin/apply.c:3392 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389 +#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3229 builtin/apply.c:3383 +#: builtin/apply.c:3246 builtin/apply.c:3400 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: builtin/apply.c:3331 +#: builtin/apply.c:3348 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: builtin/apply.c:3400 +#: builtin/apply.c:3417 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: builtin/apply.c:3402 +#: builtin/apply.c:3419 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: builtin/apply.c:3503 +#: builtin/apply.c:3520 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: builtin/apply.c:3506 +#: builtin/apply.c:3523 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: builtin/apply.c:3526 +#: builtin/apply.c:3543 #, 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:3531 +#: builtin/apply.c:3548 #, 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:3539 +#: builtin/apply.c:3556 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: builtin/apply.c:3552 +#: builtin/apply.c:3569 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158 +#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: builtin/apply.c:3750 +#: builtin/apply.c:3767 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: builtin/apply.c:3778 +#: builtin/apply.c:3795 #, c-format msgid "corrupt patch for subproject %s" msgstr "trasig patch för underprojektet %s" -#: builtin/apply.c:3782 +#: builtin/apply.c:3799 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: builtin/apply.c:3787 +#: builtin/apply.c:3804 #, 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:3790 builtin/apply.c:3898 +#: builtin/apply.c:3807 builtin/apply.c:3915 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: builtin/apply.c:3823 +#: builtin/apply.c:3840 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: builtin/apply.c:3872 +#: builtin/apply.c:3889 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: builtin/apply.c:3959 +#: builtin/apply.c:3976 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: builtin/apply.c:3967 +#: builtin/apply.c:3984 msgid "internal error" msgstr "internt fel" #. Say this even without --verbose -#: builtin/apply.c:3970 +#: builtin/apply.c:3987 #, 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:3980 +#: builtin/apply.c:3997 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: builtin/apply.c:4001 +#: builtin/apply.c:4018 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: builtin/apply.c:4004 +#: builtin/apply.c:4021 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: builtin/apply.c:4154 +#: builtin/apply.c:4171 msgid "unrecognized input" msgstr "indata känns inte igen" -#: builtin/apply.c:4165 +#: builtin/apply.c:4182 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: builtin/apply.c:4284 builtin/apply.c:4287 +#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91 +#: builtin/fetch.c:63 msgid "path" msgstr "sökväg" -#: builtin/apply.c:4285 +#: builtin/apply.c:4302 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: builtin/apply.c:4288 +#: builtin/apply.c:4305 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: builtin/apply.c:4290 +#: builtin/apply.c:4307 msgid "num" msgstr "antal" -#: builtin/apply.c:4291 +#: builtin/apply.c:4308 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:4294 +#: builtin/apply.c:4311 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: builtin/apply.c:4296 +#: builtin/apply.c:4313 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:4300 -msgid "shows number of added and deleted lines in decimal notation" -msgstr "visar antal tillagda och borttagna rader decimalt" +#: builtin/apply.c:4317 +msgid "show number of added and deleted lines in decimal notation" +msgstr "visa antal tillagda och borttagna rader decimalt" -#: builtin/apply.c:4302 +#: builtin/apply.c:4319 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:4304 +#: builtin/apply.c:4321 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:4306 +#: builtin/apply.c:4323 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:4308 +#: builtin/apply.c:4325 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: builtin/apply.c:4310 +#: builtin/apply.c:4327 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: builtin/apply.c:4312 +#: builtin/apply.c:4329 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:4314 +#: builtin/apply.c:4331 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: builtin/apply.c:4316 +#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: builtin/apply.c:4319 +#: builtin/apply.c:4336 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: builtin/apply.c:4320 +#: builtin/apply.c:4337 msgid "action" msgstr "åtgärd" -#: builtin/apply.c:4321 +#: builtin/apply.c:4338 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: builtin/apply.c:4324 builtin/apply.c:4327 +#: builtin/apply.c:4341 builtin/apply.c:4344 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: builtin/apply.c:4330 +#: builtin/apply.c:4347 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: builtin/apply.c:4332 +#: builtin/apply.c:4349 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: builtin/apply.c:4334 +#: builtin/apply.c:4351 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: builtin/apply.c:4336 +#: builtin/apply.c:4353 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: builtin/apply.c:4337 -msgid "be verbose" -msgstr "var pratsam" - -#: builtin/apply.c:4339 +#: builtin/apply.c:4356 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: builtin/apply.c:4342 +#: builtin/apply.c:4359 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: builtin/apply.c:4344 +#: builtin/apply.c:4361 msgid "root" msgstr "rot" -#: builtin/apply.c:4345 +#: builtin/apply.c:4362 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: builtin/apply.c:4367 +#: builtin/apply.c:4384 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: builtin/apply.c:4375 +#: builtin/apply.c:4392 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: builtin/apply.c:4378 +#: builtin/apply.c:4395 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: builtin/apply.c:4394 +#: builtin/apply.c:4411 #, c-format msgid "can't open patch '%s'" msgstr "kan inte öppna patchen \"%s\"" -#: builtin/apply.c:4408 +#: builtin/apply.c:4425 #, 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:4414 builtin/apply.c:4424 +#: builtin/apply.c:4431 builtin/apply.c:4441 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1889,7 +2050,135 @@ msgstr "git archive: protokollfel" msgid "git archive: expected a flush" msgstr "git archive: förväntade en tömning (flush)" -#: builtin/branch.c:144 +#: builtin/bisect--helper.c:7 +msgid "git bisect--helper --next-all [--no-checkout]" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:17 +msgid "perform 'git bisect next'" +msgstr "utför 'git bisect next'" + +#: builtin/bisect--helper.c:19 +msgid "update BISECT_HEAD instead of checking out the current commit" +msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning" + +#: builtin/blame.c:25 +msgid "git blame [options] [rev-opts] [rev] [--] file" +msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil" + +#: builtin/blame.c:30 builtin/shortlog.c:15 +msgid "[rev-opts] are documented in git-rev-list(1)" +msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)" + +#: builtin/blame.c:2374 +msgid "Show blame entries as we find them, incrementally" +msgstr "Visa klandringsposter när vi hittar dem, interaktivt" + +#: builtin/blame.c:2375 +msgid "Show blank SHA-1 for boundary commits (Default: off)" +msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" + +#: builtin/blame.c:2376 +msgid "Do not treat root commits as boundaries (Default: off)" +msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" + +#: builtin/blame.c:2377 +msgid "Show work cost statistics" +msgstr "Visa statistik över arbetskostnad" + +#: builtin/blame.c:2378 +msgid "Show output score for blame entries" +msgstr "Visa utdatapoäng för klandringsposter" + +#: builtin/blame.c:2379 +msgid "Show original filename (Default: auto)" +msgstr "Visa originalfilnamn (Standard: auto)" + +#: builtin/blame.c:2380 +msgid "Show original linenumber (Default: off)" +msgstr "Visa ursprungligt radnummer (Standard: av)" + +#: builtin/blame.c:2381 +msgid "Show in a format designed for machine consumption" +msgstr "Visa i ett format avsett för maskinkonsumtion" + +#: builtin/blame.c:2382 +msgid "Show porcelain format with per-line commit information" +msgstr "Visa porslinsformat med per-rad-incheckningsinformation" + +#: builtin/blame.c:2383 +msgid "Use the same output mode as git-annotate (Default: off)" +msgstr "Använd samma utdataläge som git-annotate (Standard: av)" + +#: builtin/blame.c:2384 +msgid "Show raw timestamp (Default: off)" +msgstr "Visa rå tidsstämpel (Standard: av)" + +#: builtin/blame.c:2385 +msgid "Show long commit SHA1 (Default: off)" +msgstr "Visa lång inchecknings-SHA1 (Standard: av)" + +#: builtin/blame.c:2386 +msgid "Suppress author name and timestamp (Default: off)" +msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" + +#: builtin/blame.c:2387 +msgid "Show author email instead of name (Default: off)" +msgstr "Visa författarens e-post istället för namn (Standard: av)" + +#: builtin/blame.c:2388 +msgid "Ignore whitespace differences" +msgstr "Ignorera ändringar i blanksteg" + +#: builtin/blame.c:2389 +msgid "Spend extra cycles to find better match" +msgstr "Slösa extra cykler med att hitta bättre träff" + +#: builtin/blame.c:2390 +msgid "Use revisions from <file> instead of calling git-rev-list" +msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list" + +#: builtin/blame.c:2391 +msgid "Use <file>'s contents as the final image" +msgstr "Använd <fil>s innehåll som slutgiltig bild" + +#: builtin/blame.c:2392 builtin/blame.c:2393 +msgid "score" +msgstr "poäng" + +#: builtin/blame.c:2392 +msgid "Find line copies within and across files" +msgstr "Hitta kopierade rader inuti och mellan filer" + +#: builtin/blame.c:2393 +msgid "Find line movements within and across files" +msgstr "Hitta flyttade rader inuti och mellan filer" + +#: builtin/blame.c:2394 +msgid "n,m" +msgstr "n,m" + +#: builtin/blame.c:2394 +msgid "Process only line range n,m, counting from 1" +msgstr "Behandla endast radintervallet n,m, med början på 1" + +#: builtin/branch.c:23 +msgid "git branch [options] [-r | -a] [--merged | --no-merged]" +msgstr "git branch [flaggor] [-r | -a] [--merged | --no-merged]" + +#: builtin/branch.c:24 +msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" +msgstr "git branch [flaggor] [-l] [-f] <grennamn> [<startpunkt>]" + +#: builtin/branch.c:25 +msgid "git branch [options] [-r] (-d | -D) <branchname>..." +msgstr "git branch [flaggor] [-r] (-d | -D) <grennamn>..." + +#: builtin/branch.c:26 +msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" +msgstr "git branch [flaggor] (-m | -M) [<gammal_gren>] <ny_gren>" + +#: builtin/branch.c:145 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -1898,7 +2187,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:148 +#: builtin/branch.c:149 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -1907,166 +2196,296 @@ 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:163 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" + +#: builtin/branch.c:167 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +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:180 +msgid "Update of config-file failed" +msgstr "Misslyckades uppdatera konfigurationsfil" + +#: builtin/branch.c:208 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:186 +#: builtin/branch.c:214 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:191 +#: builtin/branch.c:222 #, 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:202 +#: builtin/branch.c:235 #, c-format msgid "remote branch '%s' not found." msgstr "fjärrgrenen \"%s\" hittades inte." -#: builtin/branch.c:203 +#: builtin/branch.c:236 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:210 -#, c-format -msgid "Couldn't look up commit object for '%s'" -msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" - -#: builtin/branch.c:216 -#, c-format -msgid "" -"The branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'." -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:225 +#: builtin/branch.c:250 #, c-format msgid "Error deleting remote branch '%s'" msgstr "Fel vid borttagning av fjärrgrenen \"%s\"" -#: builtin/branch.c:226 +#: builtin/branch.c:251 #, c-format msgid "Error deleting branch '%s'" msgstr "Fel vid borttagning av grenen \"%s\"" -#: builtin/branch.c:233 +#: builtin/branch.c:258 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "Tog bort fjärrgrenen %s (var %s).\n" -#: builtin/branch.c:234 +#: builtin/branch.c:259 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:239 -msgid "Update of config-file failed" -msgstr "Misslyckades uppdatera konfigurationsfil" - -#: builtin/branch.c:337 +#: builtin/branch.c:361 #, c-format msgid "branch '%s' does not point at a commit" msgstr "grenen \"%s\" pekar inte på en incheckning" -#: builtin/branch.c:409 +#: builtin/branch.c:433 #, c-format msgid "[%s: behind %d]" msgstr "[%s: bakom %d] " -#: builtin/branch.c:411 +#: builtin/branch.c:435 #, c-format msgid "[behind %d]" msgstr "[bakom %d] " -#: builtin/branch.c:415 +#: builtin/branch.c:439 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: före %d] " -#: builtin/branch.c:417 +#: builtin/branch.c:441 #, c-format msgid "[ahead %d]" msgstr "[före %d] " -#: builtin/branch.c:420 +#: builtin/branch.c:444 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: före %d, bakom %d] " -#: builtin/branch.c:423 +#: builtin/branch.c:447 #, c-format msgid "[ahead %d, behind %d]" msgstr "[före %d, bakom %d] " -#: builtin/branch.c:535 +#: builtin/branch.c:560 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:600 +#: builtin/branch.c:625 msgid "some refs could not be read" msgstr "vissa referenser kunde inte läsas" -#: builtin/branch.c:613 +#: builtin/branch.c:638 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:623 +#: builtin/branch.c:648 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:638 +#: builtin/branch.c:663 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:642 +#: builtin/branch.c:667 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:646 +#: builtin/branch.c:671 #, 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:653 +#: builtin/branch.c:678 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:668 +#: builtin/branch.c:693 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: builtin/branch.c:692 +#: builtin/branch.c:717 #, c-format msgid "could not write branch description template: %s" msgstr "kunde inte skriva grenbeskrivningsmall: %s" -#: builtin/branch.c:783 +#: builtin/branch.c:747 +msgid "Generic options" +msgstr "Allmänna flaggor" + +#: builtin/branch.c:749 +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:750 +msgid "suppress informational messages" +msgstr "undertryck informationsmeddelanden" + +#: builtin/branch.c:751 +msgid "set up tracking mode (see git-pull(1))" +msgstr "ställ in spårningsläge (se git-pull(1))" + +#: builtin/branch.c:753 +msgid "change upstream info" +msgstr "ändra uppströmsinformation" + +#: builtin/branch.c:757 +msgid "use colored output" +msgstr "använd färgad utdata" + +#: builtin/branch.c:758 +msgid "act on remote-tracking branches" +msgstr "arbeta på fjärrspårande grenar" + +#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788 +#: builtin/branch.c:794 builtin/commit.c:1376 builtin/commit.c:1377 +#: builtin/commit.c:1378 builtin/commit.c:1379 builtin/tag.c:470 +msgid "commit" +msgstr "incheckning" + +#: builtin/branch.c:762 builtin/branch.c:768 +msgid "print only branches that contain the commit" +msgstr "visa endast grenar som innehåller incheckningen" + +#: builtin/branch.c:774 +msgid "Specific git-branch actions:" +msgstr "Specifika git-branch-åtgärder:" + +#: builtin/branch.c:775 +msgid "list both remote-tracking and local branches" +msgstr "visa både fjärrspårande och lokala grenar" + +#: builtin/branch.c:777 +msgid "delete fully merged branch" +msgstr "ta bort helt sammanslagen gren" + +#: builtin/branch.c:778 +msgid "delete branch (even if not merged)" +msgstr "ta bort gren (även om inte helt sammanslagen)" + +#: builtin/branch.c:779 +msgid "move/rename a branch and its reflog" +msgstr "flytta/ta bort en gren och dess reflogg" + +#: builtin/branch.c:780 +msgid "move/rename a branch, even if target exists" +msgstr "flytta/ta bort en gren, även om målet finns" + +#: builtin/branch.c:781 +msgid "list branch names" +msgstr "lista namn på grenar" + +#: builtin/branch.c:782 +msgid "create the branch's reflog" +msgstr "skapa grenens reflogg" + +#: builtin/branch.c:784 +msgid "edit the description for the branch" +msgstr "redigera beskrivning för grenen" + +#: builtin/branch.c:785 +msgid "force creation (when already exists)" +msgstr "tvinga skapande (när den redan finns)" + +#: builtin/branch.c:788 +msgid "print only not merged branches" +msgstr "visa endast ej sammanslagna grenar" + +#: builtin/branch.c:794 +msgid "print only merged branches" +msgstr "visa endast sammanslagna grenar" + +#: builtin/branch.c:798 +msgid "list branches in columns" +msgstr "visa grenar i spalter" + +#: builtin/branch.c:811 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:788 builtin/clone.c:561 +#: builtin/branch.c:816 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:808 +#: builtin/branch.c:836 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:857 +#: builtin/branch.c:887 +#, c-format +msgid "branch '%s' does not exist" +msgstr "grenen \"%s\" finns inte" + +#: builtin/branch.c:899 +#, c-format +msgid "Branch '%s' has no upstream information" +msgstr "Grenen \"%s\" har ingen uppströmsinformation" + +#: builtin/branch.c:914 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:917 +#, c-format +msgid "" +"The --set-upstream flag is deprecated and will be removed. Consider using --" +"track or --set-upstream-to\n" +msgstr "" +"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " +"eller --set-upstream-to\n" + +#: builtin/branch.c:934 +#, c-format +msgid "" +"\n" +"If you wanted to make '%s' track '%s', do this:\n" +"\n" +msgstr "" +"\n" +"Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" +"\n" + +#: builtin/branch.c:935 +#, c-format +msgid " git branch -d %s\n" +msgstr " git branch -d %s\n" + +#: builtin/branch.c:936 +#, c-format +msgid " git branch --set-upstream-to %s\n" +msgstr " git branch --set-upstream-to %s\n" + #: builtin/bundle.c:47 #, c-format msgid "%s is okay\n" @@ -2080,99 +2499,222 @@ 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/checkout.c:114 builtin/checkout.c:147 +#: builtin/cat-file.c:247 +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:248 +msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" +msgstr "git cat-file (--batch|--batch-check) < <objektlista>" + +#: builtin/cat-file.c:266 +msgid "<type> can be one of: blob, tree, commit, tag" +msgstr "<typ> kan vara en av: blob, tree, commit, tag" + +#: builtin/cat-file.c:267 +msgid "show object type" +msgstr "visa objekttyp" + +#: builtin/cat-file.c:268 +msgid "show object size" +msgstr "visa objektstorlek" + +#: builtin/cat-file.c:270 +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:271 +msgid "pretty-print object's content" +msgstr "visa objektets innehåll snyggt" + +#: builtin/cat-file.c:273 +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:275 +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:278 +msgid "show info about objects fed from the standard input" +msgstr "visa information för objekt som listas på standard in" + +#: builtin/check-attr.c:11 +msgid "git check-attr [-a | --all | attr...] [--] pathname..." +msgstr "git check-attr [-a | --all | attr...] [--] sökväg..." + +#: builtin/check-attr.c:12 +msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <sökvägslista>" + +#: builtin/check-attr.c:19 +msgid "report all attributes set on file" +msgstr "visa alla attribut som satts på filen" + +#: builtin/check-attr.c:20 +msgid "use .gitattributes only from the index" +msgstr "använd .gitattributes endast från indexet" + +#: builtin/check-attr.c:21 builtin/hash-object.c:75 +msgid "read file names from stdin" +msgstr "läs filnamn från standard in" + +#: builtin/check-attr.c:23 +msgid "input paths are terminated by a null character" +msgstr "sökvägar avdelas med null-tecken" + +#: builtin/checkout-index.c:126 +msgid "git checkout-index [options] [--] [<file>...]" +msgstr "git checkout-index [flaggor] [--] [<fil>...]" + +#: builtin/checkout-index.c:187 +msgid "check out all files in the index" +msgstr "checka ut alla filer i indexet" + +#: builtin/checkout-index.c:188 +msgid "force overwrite of existing files" +msgstr "tvinga överskrivning av befintliga filer" + +#: builtin/checkout-index.c:190 +msgid "no warning for existing files and files not in index" +msgstr "ingen varning för existerande filer och filer ej i indexet" + +#: builtin/checkout-index.c:192 +msgid "don't checkout new files" +msgstr "checka inte ut nya filer" + +#: builtin/checkout-index.c:194 +msgid "update stat information in the index file" +msgstr "uppdatera stat-information i indexfilen" + +#: builtin/checkout-index.c:200 +msgid "read list of paths from the standard input" +msgstr "läs listan över sökvägar från standard in" + +#: builtin/checkout-index.c:202 +msgid "write the content to temporary files" +msgstr "skriv innehåll till temporära filer" + +#: builtin/checkout-index.c:203 builtin/column.c:30 +msgid "string" +msgstr "sträng" + +#: builtin/checkout-index.c:204 +msgid "when creating files, prepend <string>" +msgstr "när filer skapas, lägg till <sträng> först" + +#: builtin/checkout-index.c:207 +msgid "copy out the files from named stage" +msgstr "kopiera ut filer från namngiven etapp" + +#: builtin/checkout.c:25 +msgid "git checkout [options] <branch>" +msgstr "git checkout [flaggor] <gren>" + +#: builtin/checkout.c:26 +msgid "git checkout [options] [<branch>] -- <file>..." +msgstr "git checkout [flaggor] [<gren>] -- <fil>..." + +#: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:116 builtin/checkout.c:149 +#: builtin/checkout.c:118 builtin/checkout.c:151 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:132 +#: builtin/checkout.c:134 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner" -#: builtin/checkout.c:176 +#: builtin/checkout.c:178 #, c-format msgid "path '%s' does not have necessary versions" msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" -#: builtin/checkout.c:193 +#: builtin/checkout.c:195 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:210 +#: builtin/checkout.c:212 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:235 builtin/checkout.c:393 +#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242 +#: builtin/checkout.c:245 +#, c-format +msgid "'%s' cannot be used with updating paths" +msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar" + +#: builtin/checkout.c:248 builtin/checkout.c:251 +#, c-format +msgid "'%s' cannot be used with %s" +msgstr "\"%s\" kan inte användas med %s" + +#: builtin/checkout.c:254 +#, c-format +msgid "Cannot update paths and switch to branch '%s' at the same time." +msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." + +#: builtin/checkout.c:265 builtin/checkout.c:426 msgid "corrupt index file" msgstr "indexfilen är trasig" -#: builtin/checkout.c:265 builtin/checkout.c:272 +#: builtin/checkout.c:295 builtin/checkout.c:302 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586 -#: builtin/merge.c:812 -msgid "unable to write new index file" -msgstr "kunde inte skriva ny indexfil" - -#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408 -msgid "diff_setup_done failed" -msgstr "diff_setup_done misslyckades" - -#: builtin/checkout.c:415 +#: builtin/checkout.c:448 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:534 +#: builtin/checkout.c:569 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Kan inte skapa referenslog för \"%s\"\n" -#: builtin/checkout.c:567 +#: builtin/checkout.c:602 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:574 +#: builtin/checkout.c:609 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:577 +#: builtin/checkout.c:612 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:581 +#: builtin/checkout.c:616 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:583 +#: builtin/checkout.c:618 builtin/checkout.c:955 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:585 +#: builtin/checkout.c:620 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:641 +#: builtin/checkout.c:676 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" #. The singular version -#: builtin/checkout.c:647 +#: builtin/checkout.c:682 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -2195,7 +2737,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:665 +#: builtin/checkout.c:700 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -2210,88 +2752,150 @@ msgstr "" " git branch nytt_grennamn %s\n" "\n" -#: builtin/checkout.c:695 +#: builtin/checkout.c:730 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:699 +#: builtin/checkout.c:734 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:725 builtin/checkout.c:920 +#: builtin/checkout.c:761 builtin/checkout.c:950 msgid "You are on a branch yet to be born" msgstr "Du är på en gren som ännu inte är född" #. case (1) -#: builtin/checkout.c:856 +#: builtin/checkout.c:886 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" #. case (1): want a tree -#: builtin/checkout.c:895 +#: builtin/checkout.c:925 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:977 -msgid "-B cannot be used with -b" -msgstr "-B kan inte användas med -b" +#: builtin/checkout.c:964 +msgid "paths cannot be used with switching branches" +msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:986 -msgid "--patch is incompatible with all other options" -msgstr "--patch är inkompatibel med alla andra flaggor" +#: builtin/checkout.c:967 builtin/checkout.c:971 +#, c-format +msgid "'%s' cannot be used with switching branches" +msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:989 -msgid "--detach cannot be used with -b/-B/--orphan" -msgstr "--detcah kan inte användas med -b/-B/--orphan" +#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983 +#: builtin/checkout.c:986 +#, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "\"%s\" kan inte användas med \"%s\"" #: builtin/checkout.c:991 -msgid "--detach cannot be used with -t" -msgstr "--detach kan inte användas med -t" +#, c-format +msgid "Cannot switch branch to a non-commit '%s'" +msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:997 -msgid "--track needs a branch name" -msgstr "--track behöver ett namn på en gren" +#: builtin/checkout.c:1012 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "undertryck förloppsrapportering" -#: builtin/checkout.c:1004 -msgid "Missing branch name; try -b" -msgstr "Grennamn saknas; försök med -b" +#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89 +#: builtin/remote.c:169 builtin/remote.c:171 +msgid "branch" +msgstr "gren" + +#: builtin/checkout.c:1014 +msgid "create and checkout a new branch" +msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1010 -msgid "--orphan and -b|-B are mutually exclusive" -msgstr "--orphan och -b|-B kan inte användas samtidigt" +#: builtin/checkout.c:1016 +msgid "create/reset and checkout a branch" +msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1012 -msgid "--orphan cannot be used with -t" -msgstr "--orphan kan inte användas med -t" +#: builtin/checkout.c:1017 +msgid "create reflog for new branch" +msgstr "skapa reflogg för ny gren" + +#: builtin/checkout.c:1018 +msgid "detach the HEAD at named commit" +msgstr "koppla från HEAD vid namngiven incheckning" + +#: builtin/checkout.c:1019 +msgid "set upstream info for new branch" +msgstr "sätt uppströmsinformation för ny gren" + +#: builtin/checkout.c:1021 +msgid "new branch" +msgstr "ny gren" + +#: builtin/checkout.c:1021 +msgid "new unparented branch" +msgstr "ny gren utan förälder" #: builtin/checkout.c:1022 -msgid "git checkout: -f and -m are incompatible" -msgstr "git checkout: -f och -m är inkompatibla" +msgid "checkout our version for unmerged files" +msgstr "checka ut vår version för ej sammanslagna filer" + +#: builtin/checkout.c:1024 +msgid "checkout their version for unmerged files" +msgstr "checka ut deras version för ej sammanslagna filer" + +#: builtin/checkout.c:1026 +msgid "force checkout (throw away local modifications)" +msgstr "tvinga utcheckning (kasta bort lokala ändringar)" + +#: builtin/checkout.c:1027 +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:1028 builtin/merge.c:215 +msgid "update ignored files (default)" +msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1029 builtin/log.c:1116 parse-options.h:241 +msgid "style" +msgstr "stil" + +#: builtin/checkout.c:1030 +msgid "conflict style (merge or diff3)" +msgstr "konfliktstil (merge eller diff3)" + +#: builtin/checkout.c:1033 +msgid "second guess 'git checkout no-such-branch'" +msgstr "förutspå \"git checkout gren-saknas\"" + +#: builtin/checkout.c:1057 +msgid "-b, -B and --orphan are mutually exclusive" +msgstr "-b, -B och --orphan är ömsesidigt uteslutande" + +#: builtin/checkout.c:1074 +msgid "--track needs a branch name" +msgstr "--track behöver ett namn på en gren" + +#: builtin/checkout.c:1081 +msgid "Missing branch name; try -b" +msgstr "Grennamn saknas; försök med -b" + +#: builtin/checkout.c:1116 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1064 +#: builtin/checkout.c:1123 #, c-format msgid "" -"git checkout: updating paths is incompatible with switching branches.\n" +"Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -"git checkout: uppdatera sökvägar är inkompatibelt med att växla gren.\n" -"Ville du checka ut \"%s\" som inte kan lösas som en sammanslaning?" - -#: builtin/checkout.c:1066 -msgid "git checkout: updating paths is incompatible with switching branches." -msgstr "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren." +"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:1071 -msgid "git checkout: --detach does not take a path argument" -msgstr "git checkout: --detach tar inte en sökväg som argument" +#: builtin/checkout.c:1128 +#, 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:1074 +#: builtin/checkout.c:1132 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -2299,13 +2903,39 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:1093 -msgid "Cannot switch branch to a non-commit." -msgstr "Kan inte växla gren på en icke-incheckning." +#: builtin/clean.c:19 +msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "" +"git clean [-d] [-f] [-n] [-q] [-e <mönster>] [-x | -X] [--] <sökvägar>..." + +#: builtin/clean.c:51 +msgid "do not print names of files removed" +msgstr "skriv inte ut namn på borttagna filer" + +#: builtin/clean.c:53 +msgid "force" +msgstr "tvinga" + +#: builtin/clean.c:55 +msgid "remove whole directories" +msgstr "ta bort hela kataloger" -#: builtin/checkout.c:1096 -msgid "--ours/--theirs is incompatible with switching branches." -msgstr "--ours/--theirs är inkompatibla med att byta gren." +#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:717 +#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182 +msgid "pattern" +msgstr "mönster" + +#: builtin/clean.c:57 +msgid "add <pattern> to ignore rules" +msgstr "lägg till <mönster> till ignoreringsregler" + +#: builtin/clean.c:58 +msgid "remove ignored files, too" +msgstr "ta även bort ignorerade filer" + +#: builtin/clean.c:60 +msgid "remove only ignored files" +msgstr "ta endast bort ignorerade filer" #: builtin/clean.c:78 msgid "-x and -X cannot be used together" @@ -2351,6 +2981,99 @@ msgstr "Skulle inte ta bort %s\n" msgid "Not removing %s\n" msgstr "Tar inte bort %s\n" +#: builtin/clone.c:36 +msgid "git clone [options] [--] <repo> [<dir>]" +msgstr "git clone [flaggor] [--] <arkiv> [<kat>]" + +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 +#: builtin/push.c:399 +msgid "force progress reporting" +msgstr "tvinga förloppsrapportering" + +#: builtin/clone.c:66 +msgid "don't create a checkout" +msgstr "skapa inte någon utcheckning" + +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 +msgid "create a bare repository" +msgstr "skapa ett naket (\"bare\") arkiv" + +#: builtin/clone.c:72 +msgid "create a mirror repository (implies bare)" +msgstr "skapa ett spegelarkiv (implicerar \"bare\")" + +#: builtin/clone.c:74 +msgid "to clone from a local repository" +msgstr "för att klona från ett lokalt arkiv" + +#: 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:78 +msgid "setup as shared repository" +msgstr "skapa som ett delat arkiv" + +#: builtin/clone.c:80 builtin/clone.c:82 +msgid "initialize submodules in the clone" +msgstr "initiera undermoduler i klonen" + +#: builtin/clone.c:83 builtin/init-db.c:485 +msgid "template-directory" +msgstr "mallkatalog" + +#: 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:86 +msgid "reference repository" +msgstr "referensarkiv" + +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 +msgid "name" +msgstr "namn" + +#: 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:90 +msgid "checkout <branch> instead of the remote's HEAD" +msgstr "checka ut <gren> istället för fjärrens HEAD" + +#: 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:93 builtin/fetch.c:83 builtin/grep.c:662 +msgid "depth" +msgstr "djup" + +#: builtin/clone.c:94 +msgid "create a shallow clone of that depth" +msgstr "skapa en grund klon på detta djup" + +#: builtin/clone.c:96 +msgid "clone only one branch, HEAD or --branch" +msgstr "klona endast en gren, HEAD eller --branch" + +#: builtin/clone.c:97 builtin/init-db.c:494 +msgid "gitdir" +msgstr "gitkat" + +#: 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:99 +msgid "key=value" +msgstr "nyckel=värde" + +#: builtin/clone.c:100 +msgid "set config inside the new repository" +msgstr "ställ in konfiguration i det nya arkivet" + #: builtin/clone.c:243 #, c-format msgid "reference repository '%s' is not a local directory." @@ -2361,7 +3084,7 @@ msgstr "referensarkivet \"%s\" är inte en lokal katalog." msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/clone.c:308 builtin/diff.c:75 +#: builtin/clone.c:308 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" @@ -2376,11 +3099,6 @@ msgstr "%s finns och är ingen katalog" msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:341 -#, c-format -msgid "failed to unlink '%s'" -msgstr "misslyckades ta bort länken \"%s\"" - #: builtin/clone.c:346 #, c-format msgid "failed to create link '%s'" @@ -2406,77 +3124,113 @@ 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:642 +#: builtin/clone.c:690 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:646 +#: builtin/clone.c:694 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:657 +#: builtin/clone.c:705 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:671 +#: builtin/clone.c:719 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:676 +#: builtin/clone.c:724 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:686 +#: builtin/clone.c:734 #, 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:696 +#: builtin/clone.c:744 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:709 builtin/clone.c:723 +#: builtin/clone.c:757 builtin/clone.c:771 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:712 +#: builtin/clone.c:760 #, c-format msgid "could not create work tree dir '%s'." msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:731 +#: builtin/clone.c:779 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:733 +#: builtin/clone.c:781 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:789 +#: builtin/clone.c:823 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:838 +#: builtin/clone.c:872 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:845 +#: builtin/clone.c:879 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." +#: builtin/column.c:9 +msgid "git column [options]" +msgstr "git column [flaggor]" + +#: builtin/column.c:26 +msgid "lookup config vars" +msgstr "slå upp konfigurationsvariabler" + +#: builtin/column.c:27 builtin/column.c:28 +msgid "layout to use" +msgstr "utseende att använda" + +#: builtin/column.c:29 +msgid "Maximum width" +msgstr "Maximal bredd" + +#: builtin/column.c:30 +msgid "Padding space on left border" +msgstr "Spaltfyllnad i vänsterkanten" + +#: builtin/column.c:31 +msgid "Padding space on right border" +msgstr "Spaltfyllnad i högerkanten" + +#: builtin/column.c:32 +msgid "Padding space between columns" +msgstr "Spaltfyllnad mellan spalter" + #: builtin/column.c:51 msgid "--command must be the first argument" msgstr "--command måste vara första argument" -#: builtin/commit.c:43 +#: builtin/commit.c:34 +msgid "git commit [options] [--] <filepattern>..." +msgstr "git commit [flaggor] [--] <filmöster>..." + +#: builtin/commit.c:39 +msgid "git status [options] [--] <filepattern>..." +msgstr "git status [flaggor] [--] <filmönster>..." + +#: builtin/commit.c:44 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -2501,7 +3255,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:55 +#: builtin/commit.c:56 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" @@ -2511,7 +3265,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:60 +#: builtin/commit.c:61 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -2527,93 +3281,93 @@ msgstr "" "\n" "Annars använder du \"git reset\"\n" -#: builtin/commit.c:256 +#: builtin/commit.c:258 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:298 +#: builtin/commit.c:300 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:304 +#: builtin/commit.c:306 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 +#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:389 +#: builtin/commit.c:391 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:391 +#: builtin/commit.c:393 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:401 +#: builtin/commit.c:403 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:421 +#: builtin/commit.c:423 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:496 builtin/commit.c:502 +#: builtin/commit.c:511 builtin/commit.c:517 #, c-format msgid "invalid commit: %s" msgstr "felaktig incheckning: %s" -#: builtin/commit.c:525 +#: builtin/commit.c:540 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:585 +#: builtin/commit.c:560 #, c-format msgid "Malformed ident string: '%s'" msgstr "Felaktig indragningssträng: \"%s\"" -#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970 +#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:635 builtin/shortlog.c:296 +#: builtin/commit.c:610 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:637 +#: builtin/commit.c:612 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:641 +#: builtin/commit.c:616 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:647 +#: builtin/commit.c:622 msgid "commit has empty message" msgstr "incheckningen har ett tomt meddelande" -#: builtin/commit.c:663 +#: builtin/commit.c:638 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:667 +#: builtin/commit.c:642 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:671 +#: builtin/commit.c:646 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/commit.c:723 +#: builtin/commit.c:707 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:734 +#: builtin/commit.c:718 #, c-format msgid "" "\n" @@ -2628,7 +3382,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:739 +#: builtin/commit.c:723 #, c-format msgid "" "\n" @@ -2643,7 +3397,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:751 +#: builtin/commit.c:735 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" @@ -2651,7 +3405,7 @@ msgstr "" "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" "med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:756 +#: builtin/commit.c:740 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be kept; you may remove them yourself if you want to.\n" @@ -2661,118 +3415,316 @@ msgstr "" "med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:769 +#: builtin/commit.c:753 #, c-format msgid "%sAuthor: %s" msgstr "%sFörfattare: %s" -#: builtin/commit.c:776 +#: builtin/commit.c:760 #, c-format msgid "%sCommitter: %s" msgstr "%sIncheckare: %s" -#: builtin/commit.c:796 +#: builtin/commit.c:780 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:833 +#: builtin/commit.c:817 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:848 builtin/tag.c:361 +#: builtin/commit.c:832 builtin/tag.c:361 #, 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:945 +#: builtin/commit.c:929 #, c-format msgid "No existing author found with '%s'" msgstr "Hittade ingen befintlig författare med \"%s\"" -#: builtin/commit.c:960 builtin/commit.c:1160 +#: builtin/commit.c:944 builtin/commit.c:1148 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1000 +#: builtin/commit.c:984 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:1011 +#: builtin/commit.c:995 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1014 +#: builtin/commit.c:998 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:1016 +#: builtin/commit.c:1000 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:1019 +#: builtin/commit.c:1003 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1029 +#: builtin/commit.c:1013 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:1031 +#: builtin/commit.c:1015 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:1039 +#: builtin/commit.c:1023 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:1056 +#: builtin/commit.c:1040 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:1058 +#: builtin/commit.c:1042 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:1060 +#: builtin/commit.c:1044 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:1062 +#: builtin/commit.c:1046 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..." -#: builtin/commit.c:1072 builtin/tag.c:577 +#: builtin/commit.c:1056 builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1077 +#: builtin/commit.c:1061 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1260 +#: builtin/commit.c:1067 builtin/commit.c:1202 +msgid "--long and -z are incompatible" +msgstr "--long och -z är inkompatibla" + +#: builtin/commit.c:1162 builtin/commit.c:1398 +msgid "show status concisely" +msgstr "vis koncis status" + +#: builtin/commit.c:1164 builtin/commit.c:1400 +msgid "show branch information" +msgstr "visa information om gren" + +#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/push.c:389 +msgid "machine-readable output" +msgstr "maskinläsbar utdata" + +#: builtin/commit.c:1169 builtin/commit.c:1404 +msgid "show status in long format (default)" +msgstr "visa status i långt format (standard)" + +#: builtin/commit.c:1172 builtin/commit.c:1407 +msgid "terminate entries with NUL" +msgstr "terminera poster med NUL" + +#: builtin/commit.c:1174 builtin/commit.c:1410 builtin/fast-export.c:636 +#: builtin/fast-export.c:639 builtin/tag.c:461 +msgid "mode" +msgstr "läge" + +#: builtin/commit.c:1175 builtin/commit.c:1410 +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:1178 +msgid "show ignored files" +msgstr "visa ignorerade filer" + +#: builtin/commit.c:1179 parse-options.h:151 +msgid "when" +msgstr "när" + +#: builtin/commit.c:1180 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" +"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " +"(Default: all)" + +#: builtin/commit.c:1182 +msgid "list untracked files in columns" +msgstr "visa ospårade filer i spalter" + +#: builtin/commit.c:1256 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1262 +#: builtin/commit.c:1258 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1303 +#: builtin/commit.c:1299 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1305 +#: builtin/commit.c:1301 msgid " (root-commit)" msgstr " (rotincheckning)" +#: builtin/commit.c:1368 +msgid "suppress summary after successful commit" +msgstr "undertryck sammanfattning efter framgångsrik incheckning" + +#: builtin/commit.c:1369 +msgid "show diff in commit message template" +msgstr "visa diff i mallen för incheckningsmeddelandet" + +#: builtin/commit.c:1371 +msgid "Commit message options" +msgstr "Alternativ för incheckningsmeddelande" + +#: builtin/commit.c:1372 builtin/tag.c:459 +msgid "read message from file" +msgstr "läs meddelande från fil" + +#: builtin/commit.c:1373 +msgid "author" +msgstr "författare" + +#: builtin/commit.c:1373 +msgid "override author for commit" +msgstr "överstyr författare för incheckningen" + +#: builtin/commit.c:1374 builtin/gc.c:178 +msgid "date" +msgstr "datum" + +#: builtin/commit.c:1374 +msgid "override date for commit" +msgstr "överstyr datum för inchecknignen" + +#: builtin/commit.c:1375 builtin/merge.c:206 builtin/notes.c:537 +#: builtin/notes.c:694 builtin/tag.c:457 +msgid "message" +msgstr "meddelande" + +#: builtin/commit.c:1375 +msgid "commit message" +msgstr "incheckningsmeddelande" + +#: builtin/commit.c:1376 +msgid "reuse and edit message from specified commit" +msgstr "återanvänd och redigera meddelande från angiven incheckning" + +#: builtin/commit.c:1377 +msgid "reuse message from specified commit" +msgstr "återanvänd meddelande från angiven incheckning" + +#: builtin/commit.c:1378 +msgid "use autosquash formatted message to fixup specified commit" +msgstr "" +"använd autosquash-formaterat meddelande för att fixa angiven incheckning" + +#: builtin/commit.c:1379 +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:1380 +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:1381 builtin/log.c:1073 builtin/revert.c:109 +msgid "add Signed-off-by:" +msgstr "lägg till Signed-off-by:" + +#: builtin/commit.c:1382 +msgid "use specified template file" +msgstr "använd angiven mallfil" + +#: builtin/commit.c:1383 +msgid "force edit of commit" +msgstr "tvinga redigering av incheckning" + +#: builtin/commit.c:1384 +msgid "default" +msgstr "standard" + +#: builtin/commit.c:1384 builtin/tag.c:462 +msgid "how to strip spaces and #comments from message" +msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" + +#: builtin/commit.c:1385 +msgid "include status in commit message template" +msgstr "inkludera status i mallen för incheckningsmeddelandet" + +#: builtin/commit.c:1386 builtin/merge.c:213 builtin/tag.c:463 +msgid "key id" +msgstr "nyckel-id" + +#: builtin/commit.c:1387 builtin/merge.c:214 +msgid "GPG sign commit" +msgstr "GPG-signera incheckning" + +#. end commit message options +#: builtin/commit.c:1390 +msgid "Commit contents options" +msgstr "Alternativ för incheckningens innehåll" + +#: builtin/commit.c:1391 +msgid "commit all changed files" +msgstr "checka in alla ändrade filer" + +#: builtin/commit.c:1392 +msgid "add specified files to index for commit" +msgstr "lägg till angivna filer till indexet för incheckning" + +#: builtin/commit.c:1393 +msgid "interactively add files" +msgstr "lägg till filer interaktivt" + +#: builtin/commit.c:1394 +msgid "interactively add changes" +msgstr "lägg till ändringar interaktivt" + +#: builtin/commit.c:1395 +msgid "commit only specified files" +msgstr "checka endast in angivna filer" + +#: builtin/commit.c:1396 +msgid "bypass pre-commit hook" +msgstr "förbigå pre-commit-krok" + +#: builtin/commit.c:1397 +msgid "show what would be committed" +msgstr "visa vad som skulle checkas in" + +#: builtin/commit.c:1408 +msgid "amend previous commit" +msgstr "lägg till föregående incheckning" + +#: builtin/commit.c:1409 +msgid "bypass post-rewrite hook" +msgstr "förbigå post-rewrite-krok" + +#: builtin/commit.c:1414 +msgid "ok to record an empty change" +msgstr "ok att registrera en tom ändring" + +#: builtin/commit.c:1417 +msgid "ok to record a change with an empty message" +msgstr "ok att registrera en ändring med tomt meddelande" + #: builtin/commit.c:1449 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1487 builtin/merge.c:509 +#: builtin/commit.c:1487 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" @@ -2801,7 +3753,7 @@ msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 +#: builtin/commit.c:1554 builtin/merge.c:832 builtin/merge.c:857 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" @@ -2824,6 +3776,134 @@ msgstr "" "att kvoten inte har överskridits, och kör sedan\n" "\"git reset HEAD\" för att återställa." +#: builtin/config.c:7 +msgid "git config [options]" +msgstr "git config [flaggor]" + +#: builtin/config.c:51 +msgid "Config file location" +msgstr "Konfigurationsfilens plats" + +#: builtin/config.c:52 +msgid "use global config file" +msgstr "använd global konfigurationsfil" + +#: builtin/config.c:53 +msgid "use system config file" +msgstr "använd systemets konfigurationsfil" + +#: builtin/config.c:54 +msgid "use repository config file" +msgstr "använd arkivets konfigurationsfil" + +#: builtin/config.c:55 +msgid "use given config file" +msgstr "använd angiven konfigurationsil" + +#: builtin/config.c:56 +msgid "Action" +msgstr "Åtgärd" + +#: builtin/config.c:57 +msgid "get value: name [value-regex]" +msgstr "hämta värde: namn [värde-reguttr]" + +#: builtin/config.c:58 +msgid "get all values: key [value-regex]" +msgstr "hämta alla värden: nyckel [värde-reguttr]" + +#: builtin/config.c:59 +msgid "get values for regexp: name-regex [value-regex]" +msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]" + +#: builtin/config.c:60 +msgid "replace all matching variables: name value [value_regex]" +msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]" + +#: builtin/config.c:61 +msgid "add a new variable: name value" +msgstr "lägg till en ny variabel: namn värde" + +#: builtin/config.c:62 +msgid "remove a variable: name [value-regex]" +msgstr "ta bort en variabel: namn [värde-reguttr]" + +#: builtin/config.c:63 +msgid "remove all matches: name [value-regex]" +msgstr "ta bort alla träffar: namn [värde-reguttr]" + +#: builtin/config.c:64 +msgid "rename section: old-name new-name" +msgstr "byt namn på sektion: gammalt-namn nytt-namn" + +#: builtin/config.c:65 +msgid "remove a section: name" +msgstr "ta bort en sektion: namn" + +#: builtin/config.c:66 +msgid "list all" +msgstr "visa alla" + +#: builtin/config.c:67 +msgid "open an editor" +msgstr "öppna textredigeringsprogram" + +#: builtin/config.c:68 builtin/config.c:69 +msgid "slot" +msgstr "plats" + +#: builtin/config.c:68 +msgid "find the color configured: [default]" +msgstr "hitta den inställda färgen: [default]" + +#: builtin/config.c:69 +msgid "find the color setting: [stdout-is-tty]" +msgstr "hitta färginställningen: [stdout-is-tty]" + +#: builtin/config.c:70 +msgid "Type" +msgstr "Typ" + +#: builtin/config.c:71 +msgid "value is \"true\" or \"false\"" +msgstr "värdet är \"true\" eller \"false\"" + +#: builtin/config.c:72 +msgid "value is decimal number" +msgstr "värdet är ett decimalt tal" + +#: builtin/config.c:73 +msgid "value is --bool or --int" +msgstr "värdet är --bool eller --int" + +#: builtin/config.c:74 +msgid "value is a path (file or directory name)" +msgstr "värdet är en sökväg (fil- eller katalognamn)" + +#: builtin/config.c:75 +msgid "Other" +msgstr "Andra" + +#: builtin/config.c:76 +msgid "terminate values with NUL byte" +msgstr "terminera värden med NUL-byte" + +#: builtin/config.c:77 +msgid "respect include directives on lookup" +msgstr "respektera inkluderingsdirektiv vid uppslag" + +#: builtin/count-objects.c:69 +msgid "git count-objects [-v]" +msgstr "git count-objects [-v]" + +#: builtin/describe.c:15 +msgid "git describe [options] <committish>*" +msgstr "git describe [flaggor] <incheckning-igt>*" + +#: builtin/describe.c:16 +msgid "git describe [options] --dirty" +msgstr "git describe [flaggor] --dirty" + #: builtin/describe.c:234 #, c-format msgid "annotated tag %s not available" @@ -2896,6 +3976,50 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" +#: builtin/describe.c:403 +msgid "find the tag that comes after the commit" +msgstr "hitta taggen som kommer efter incheckningen" + +#: builtin/describe.c:404 +msgid "debug search strategy on stderr" +msgstr "felsök sökstrategin på standard fel" + +#: builtin/describe.c:405 +msgid "use any ref in .git/refs" +msgstr "använd alla referenser i .git/refs" + +#: builtin/describe.c:406 +msgid "use any tag in .git/refs/tags" +msgstr "använd alla taggar i .git/refs/tags" + +#: builtin/describe.c:407 +msgid "always use long format" +msgstr "använd alltid långt format" + +#: builtin/describe.c:410 +msgid "only output exact matches" +msgstr "skriv endast ut exakta träffar" + +#: builtin/describe.c:412 +msgid "consider <n> most recent tags (default: 10)" +msgstr "överväg de <n> nyaste taggarna (standard: 10)" + +#: builtin/describe.c:414 +msgid "only consider tags matching <pattern>" +msgstr "överväg endast taggar som motsvarar <mönster>" + +#: builtin/describe.c:416 builtin/name-rev.c:238 +msgid "show abbreviated commit object as fallback" +msgstr "visa förkortade incheckningsobjekt som standard" + +#: builtin/describe.c:417 +msgid "mark" +msgstr "märke" + +#: builtin/describe.c:418 +msgid "append <mark> on dirty working tree (default: \"-dirty\")" +msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")" + #: builtin/describe.c:436 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" @@ -2908,45 +4032,165 @@ msgstr "Inga namn hittades, kan inte beskriva något." msgid "--dirty is incompatible with committishes" msgstr "--dirty är inkompatibelt med \"committish\"-värden" -#: builtin/diff.c:77 +#: builtin/diff.c:79 #, c-format msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" -#: builtin/diff.c:220 +#: builtin/diff.c:228 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:297 +#: builtin/diff.c:305 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:341 +#: builtin/diff.c:348 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:346 +#: builtin/diff.c:353 #, c-format msgid "more than %d trees given: '%s'" msgstr "mer än %d träd angavs: \"%s\"" -#: builtin/diff.c:356 +#: builtin/diff.c:363 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:364 +#: builtin/diff.c:371 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." -#: builtin/fetch.c:200 +#: builtin/fast-export.c:22 +msgid "git fast-export [rev-list-opts]" +msgstr "git fast-export [rev-list-flaggor]" + +#: builtin/fast-export.c:635 +msgid "show progress after <n> objects" +msgstr "visa förlopp efter <n> objekt" + +#: builtin/fast-export.c:637 +msgid "select handling of signed tags" +msgstr "välj hantering av signerade taggar" + +#: builtin/fast-export.c:640 +msgid "select handling of tags that tag filtered objects" +msgstr "välj hantering av taggar som har taggfiltrerade objekt" + +#: builtin/fast-export.c:643 +msgid "Dump marks to this file" +msgstr "Dump märken till filen" + +#: builtin/fast-export.c:645 +msgid "Import marks from this file" +msgstr "Importera märken från filen" + +#: builtin/fast-export.c:647 +msgid "Fake a tagger when tags lack one" +msgstr "Fejka taggare när taggen saknar en" + +#: builtin/fast-export.c:649 +msgid "Output full tree for each commit" +msgstr "Skriv ut hela trädet för varje incheckning" + +#: builtin/fast-export.c:651 +msgid "Use the done feature to terminate the stream" +msgstr "Använd done-funktionen för att avsluta strömmen" + +#: builtin/fast-export.c:652 +msgid "Skip output of blob data" +msgstr "Hoppa över skrivning av blob-data" + +#: builtin/fetch.c:20 +msgid "git fetch [<options>] [<repository> [<refspec>...]]" +msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" + +#: builtin/fetch.c:21 +msgid "git fetch [<options>] <group>" +msgstr "git fetch [<flaggor>] <grupp>" + +#: builtin/fetch.c:22 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" +msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" + +#: builtin/fetch.c:23 +msgid "git fetch --all [<options>]" +msgstr "git fetch --all [<flaggor>]" + +#: builtin/fetch.c:60 +msgid "fetch from all remotes" +msgstr "hämta från alla fjärrar" + +#: builtin/fetch.c:62 +msgid "append to .git/FETCH_HEAD instead of overwriting" +msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" + +#: builtin/fetch.c:64 +msgid "path to upload pack on remote end" +msgstr "sökväg till upload pack på fjärren" + +#: builtin/fetch.c:65 +msgid "force overwrite of local branch" +msgstr "tvinga överskrivning av lokal gren" + +#: builtin/fetch.c:67 +msgid "fetch from multiple remotes" +msgstr "hämta från flera fjärrar" + +#: builtin/fetch.c:69 +msgid "fetch all tags and associated objects" +msgstr "hämta alla taggar och associerade objekt" + +#: builtin/fetch.c:71 +msgid "do not fetch all tags (--no-tags)" +msgstr "hämta inte alla taggar (--no-tags)" + +#: builtin/fetch.c:73 +msgid "prune remote-tracking branches no longer on remote" +msgstr "rensa fjärrspårande grenar ej längre på fjärren" + +#: builtin/fetch.c:74 +msgid "on-demand" +msgstr "on-demand" + +#: builtin/fetch.c:75 +msgid "control recursive fetching of submodules" +msgstr "styr rekursiv hämtning av undermoduler" + +#: builtin/fetch.c:79 +msgid "keep downloaded pack" +msgstr "behåll hämtade paket" + +#: builtin/fetch.c:81 +msgid "allow updating of HEAD ref" +msgstr "tillåt uppdatering av HEAD-referens" + +#: builtin/fetch.c:84 +msgid "deepen history of shallow clone" +msgstr "fördjupa historik för grund klon" + +#: builtin/fetch.c:85 builtin/log.c:1088 +msgid "dir" +msgstr "kat" + +#: builtin/fetch.c:86 +msgid "prepend this to submodule path output" +msgstr "lägg till i början av undermodulens sökvägsutdata" + +#: builtin/fetch.c:89 +msgid "default mode for recursion" +msgstr "standardläge för rekursion" + +#: builtin/fetch.c:201 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:253 +#: builtin/fetch.c:254 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" @@ -3058,17 +4302,17 @@ msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:891 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:890 builtin/remote.c:100 +#: builtin/fetch.c:893 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:907 +#: builtin/fetch.c:912 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -3076,27 +4320,146 @@ 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:927 +#: builtin/fetch.c:932 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:979 +#: builtin/fetch.c:984 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:981 +#: builtin/fetch.c:986 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:992 +#: builtin/fetch.c:997 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1005 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" +#: builtin/fmt-merge-msg.c:13 +msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" +msgstr "" +"git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]" + +#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:701 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175 +#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235 +msgid "n" +msgstr "n" + +#: builtin/fmt-merge-msg.c:654 +msgid "populate log with at most <n> entries from shortlog" +msgstr "fyll i loggen med som mest <n> poster från shortlog" + +#: builtin/fmt-merge-msg.c:657 +msgid "alias for --log (deprecated)" +msgstr "alias för --log (avråds)" + +#: builtin/fmt-merge-msg.c:660 +msgid "text" +msgstr "text" + +#: builtin/fmt-merge-msg.c:661 +msgid "use <text> as start of message" +msgstr "inled meddelande med <text>" + +#: builtin/fmt-merge-msg.c:662 +msgid "file to read from" +msgstr "fil att läsa från" + +#: builtin/for-each-ref.c:979 +msgid "git for-each-ref [options] [<pattern>]" +msgstr "git for-each-ref [flaggor] [<mönster>]" + +#: builtin/for-each-ref.c:994 +msgid "quote placeholders suitably for shells" +msgstr "citera platshållare passande för skal" + +#: builtin/for-each-ref.c:996 +msgid "quote placeholders suitably for perl" +msgstr "citera platshållare passande för perl" + +#: builtin/for-each-ref.c:998 +msgid "quote placeholders suitably for python" +msgstr "citera platshållare passande för python" + +#: builtin/for-each-ref.c:1000 +msgid "quote placeholders suitably for tcl" +msgstr "citera platshållare passande för tcl" + +#: builtin/for-each-ref.c:1003 +msgid "show only <n> matched refs" +msgstr "visa endast <n> träffade refs" + +#: builtin/for-each-ref.c:1004 +msgid "format" +msgstr "format" + +#: builtin/for-each-ref.c:1004 +msgid "format to use for the output" +msgstr "format att använda för utdata" + +#: builtin/for-each-ref.c:1005 +msgid "key" +msgstr "nyckel" + +#: builtin/for-each-ref.c:1006 +msgid "field name to sort on" +msgstr "fältnamn att sortera på" + +#: builtin/fsck.c:608 +msgid "git fsck [options] [<object>...]" +msgstr "git fsck [flaggor] [<objekt>...]" + +#: builtin/fsck.c:614 +msgid "show unreachable objects" +msgstr "visa onåbara objekt" + +#: builtin/fsck.c:615 +msgid "show dangling objects" +msgstr "visa dinglande objekt" + +#: builtin/fsck.c:616 +msgid "report tags" +msgstr "rapportera taggar" + +#: builtin/fsck.c:617 +msgid "report root nodes" +msgstr "rapportera rotnoder" + +#: builtin/fsck.c:618 +msgid "make index objects head nodes" +msgstr "gör indexojekt till huvudnoder" + +#: builtin/fsck.c:619 +msgid "make reflogs head nodes (default)" +msgstr "gör refloggar till huvudnoder (standard)" + +#: builtin/fsck.c:620 +msgid "also consider packs and alternate objects" +msgstr "ta även hänsyn till paket och alternativa objekt" + +#: builtin/fsck.c:621 +msgid "enable more strict checking" +msgstr "aktivera striktare kontroll" + +#: builtin/fsck.c:623 +msgid "write dangling objects in .git/lost-found" +msgstr "skriv dinglande objekt i .git/lost-found" + +#: builtin/fsck.c:624 builtin/prune.c:134 +msgid "show progress" +msgstr "visa förlopp" + +#: builtin/gc.c:22 +msgid "git gc [options]" +msgstr "git gc [flaggor]" + #: builtin/gc.c:63 #, c-format msgid "Invalid %s: '%s'" @@ -3107,12 +4470,19 @@ msgstr "Felaktigt %s: \"%s\"" msgid "insanely long object directory %.*s" msgstr "tokigt lång objektkatalog %.*s" -#: builtin/gc.c:221 -#, c-format -msgid "Auto packing the repository for optimum performance.\n" -msgstr "Packar arkivet automatiskt för optimal prestanda.\n" +#: builtin/gc.c:179 +msgid "prune unreferenced objects" +msgstr "rensa ej refererade objekt" + +#: builtin/gc.c:181 +msgid "be more thorough (increased runtime)" +msgstr "var mer grundlig (ökar körtiden)" + +#: builtin/gc.c:182 +msgid "enable auto-gc mode" +msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:224 +#: builtin/gc.c:222 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" @@ -3121,72 +4491,300 @@ msgstr "" "Packar arkivet automatiskt för optimal prestanda. Du kan även\n" "köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n" -#: builtin/gc.c:251 +#: builtin/gc.c:249 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort " "dem." -#: builtin/grep.c:216 +#: builtin/grep.c:22 +msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" +msgstr "git grep [flaggor] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" + +#: builtin/grep.c:217 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: misslyckades skapa tråd. %s" -#: builtin/grep.c:402 +#: builtin/grep.c:365 #, c-format msgid "Failed to chdir: %s" msgstr "Kunde inte byta katalog (chdir): %s" -#: builtin/grep.c:478 builtin/grep.c:512 +#: builtin/grep.c:443 builtin/grep.c:478 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:526 +#: builtin/grep.c:493 #, c-format msgid "unable to grep from object of type %s" msgstr "Kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:584 +#: builtin/grep.c:551 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:601 +#: builtin/grep.c:568 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: builtin/grep.c:885 +#: builtin/grep.c:643 +msgid "search in index instead of in the work tree" +msgstr "sök i indexet istället för i arbetskatalogen" + +#: builtin/grep.c:645 +msgid "find in contents not managed by git" +msgstr "sök i innehål som inte hanteras av git" + +#: builtin/grep.c:647 +msgid "search in both tracked and untracked files" +msgstr "sök i både spårade och ospårade filer" + +#: builtin/grep.c:649 +msgid "search also in ignored files" +msgstr "sök även i ignorerade filer" + +#: builtin/grep.c:652 +msgid "show non-matching lines" +msgstr "vis rader som inte träffas" + +#: builtin/grep.c:654 +msgid "case insensitive matching" +msgstr "skiftlägesokänslig sökning" + +#: builtin/grep.c:656 +msgid "match patterns only at word boundaries" +msgstr "matcha endast mönster vid ordgränser" + +#: builtin/grep.c:658 +msgid "process binary files as text" +msgstr "hantera binärfiler som text" + +#: builtin/grep.c:660 +msgid "don't match patterns in binary files" +msgstr "träffa inte mönster i binärfiler" + +#: builtin/grep.c:663 +msgid "descend at most <depth> levels" +msgstr "gå som mest ned <djup> nivåer" + +#: builtin/grep.c:667 +msgid "use extended POSIX regular expressions" +msgstr "använd utökade POSIX-reguljära uttryck" + +#: builtin/grep.c:670 +msgid "use basic POSIX regular expressions (default)" +msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" + +#: builtin/grep.c:673 +msgid "interpret patterns as fixed strings" +msgstr "tolka mönster som fixerade strängar" + +#: builtin/grep.c:676 +msgid "use Perl-compatible regular expressions" +msgstr "använd Perlkompatibla reguljära uttryck" + +#: builtin/grep.c:679 +msgid "show line numbers" +msgstr "visa radnummer" + +#: builtin/grep.c:680 +msgid "don't show filenames" +msgstr "visa inte filnamn" + +#: builtin/grep.c:681 +msgid "show filenames" +msgstr "visa filnamn" + +#: builtin/grep.c:683 +msgid "show filenames relative to top directory" +msgstr "visa filnamn relativa till toppkatalogen" + +#: builtin/grep.c:685 +msgid "show only filenames instead of matching lines" +msgstr "visa endast filnamn istället för träffade rader" + +#: builtin/grep.c:687 +msgid "synonym for --files-with-matches" +msgstr "synonym för --files-with-matches" + +#: builtin/grep.c:690 +msgid "show only the names of files without match" +msgstr "visa endast namn på filer utan träffar" + +#: builtin/grep.c:692 +msgid "print NUL after filenames" +msgstr "skriv NUL efter filnamn" + +#: builtin/grep.c:694 +msgid "show the number of matches instead of matching lines" +msgstr "visa antal träffar istället för träffade rader" + +#: builtin/grep.c:695 +msgid "highlight matches" +msgstr "ljusmarkera träffar" + +#: builtin/grep.c:697 +msgid "print empty line between matches from different files" +msgstr "skriv tomma rader mellan träffar från olika filer" + +#: builtin/grep.c:699 +msgid "show filename only once above matches from same file" +msgstr "visa filnamn endast en gång ovanför träffar från samma fil" + +#: builtin/grep.c:702 +msgid "show <n> context lines before and after matches" +msgstr "visa <n> rader sammanhang före och efter träffar" + +#: builtin/grep.c:705 +msgid "show <n> context lines before matches" +msgstr "visa <n> rader sammanhang före träffar" + +#: builtin/grep.c:707 +msgid "show <n> context lines after matches" +msgstr "visa <n> rader sammanhang efter träffar" + +#: builtin/grep.c:708 +msgid "shortcut for -C NUM" +msgstr "genväg för -C NUM" + +#: builtin/grep.c:711 +msgid "show a line with the function name before matches" +msgstr "visa en rad med funktionsnamnet före träffen" + +#: builtin/grep.c:713 +msgid "show the surrounding function" +msgstr "visa den omkringliggande funktionen" + +#: builtin/grep.c:716 +msgid "read patterns from file" +msgstr "läs mönster från fil" + +#: builtin/grep.c:718 +msgid "match <pattern>" +msgstr "träffa <mönster>" + +#: builtin/grep.c:720 +msgid "combine patterns specified with -e" +msgstr "kombinera mönster som anges med -e" + +#: builtin/grep.c:732 +msgid "indicate hit with exit status without output" +msgstr "ange träff med slutstatuskod utan utdata" + +#: builtin/grep.c:734 +msgid "show only matches from files that match all patterns" +msgstr "visa endast träffar från filer som träffar alla mönster" + +#: builtin/grep.c:736 +msgid "show parse tree for grep expression" +msgstr "visa analysträd för grep-uttryck" + +#: builtin/grep.c:740 +msgid "pager" +msgstr "bläddrare" + +#: builtin/grep.c:740 +msgid "show matching files in the pager" +msgstr "visa träffade filer i filbläddraren" + +#: builtin/grep.c:743 +msgid "allow calling of grep(1) (ignored by this build)" +msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" + +#: builtin/grep.c:744 builtin/show-ref.c:184 +msgid "show usage" +msgstr "visa användning" + +#: builtin/grep.c:811 msgid "no pattern given." msgstr "inget mönster angavs." -#: builtin/grep.c:899 +#: builtin/grep.c:825 #, c-format msgid "bad object %s" msgstr "felaktigt objekt %s" -#: builtin/grep.c:940 +#: builtin/grep.c:866 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:963 +#: builtin/grep.c:889 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached och --untracked kan inte användas med --no-index." -#: builtin/grep.c:968 +#: builtin/grep.c:894 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index och --untracked kan inte användas med revisioner." -#: builtin/grep.c:971 +#: builtin/grep.c:897 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll." -#: builtin/grep.c:979 +#: builtin/grep.c:905 msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." +#: builtin/hash-object.c:60 +msgid "" +"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " +"<file>..." +msgstr "" +"git hash-object [-t <typ>] [-w] [--path=<fil>|--no-filters] [--stdin] [--] " +"<fil>..." + +#: builtin/hash-object.c:61 +msgid "git hash-object --stdin-paths < <list-of-paths>" +msgstr "git hash-object --stdin-paths < <sökvägslista>" + +#: builtin/hash-object.c:72 +msgid "type" +msgstr "typ" + +#: builtin/hash-object.c:72 +msgid "object type" +msgstr "objekttyp" + +#: builtin/hash-object.c:73 +msgid "write the object into the object database" +msgstr "skriv objektet till objektdatabasen" + +#: builtin/hash-object.c:74 +msgid "read the object from stdin" +msgstr "läs objektet från standard in" + +#: builtin/hash-object.c:76 +msgid "store file as is without filters" +msgstr "spara filen som den är utan filer" + +#: builtin/hash-object.c:77 +msgid "process file as it were from this path" +msgstr "hantera filen som om den kom från sökvägen" + +#: builtin/help.c:43 +msgid "print all available commands" +msgstr "visa alla tillgängliga kommandon" + +#: builtin/help.c:44 +msgid "show man page" +msgstr "visa manualsida" + +#: builtin/help.c:45 +msgid "show manual in web browser" +msgstr "visa manual i webbläsare" + +#: builtin/help.c:47 +msgid "show info page" +msgstr "visa info-sida" + +#: builtin/help.c:53 +msgid "git help [--all] [--man|--web|--info] [command]" +msgstr "git help [--all] [--man|--web|--info] [kommando]" + #: builtin/help.c:65 #, c-format msgid "unrecognized help format '%s'" @@ -3301,6 +4899,11 @@ msgstr "kan inte öppna paketfilen \"%s\"" msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" +#: builtin/index-pack.c:294 +#, c-format +msgid "pack version %<PRIu32> unsupported" +msgstr "paketversion %<PRIu32> stöds ej" + #: builtin/index-pack.c:312 #, c-format msgid "pack has bad object at offset %lu: %s" @@ -3381,7 +4984,7 @@ msgstr "misslyckades tillämpa delta" #: builtin/index-pack.c:986 msgid "Receiving objects" -msgstr "Tar bort objekt" +msgstr "Tar emot objekt" #: builtin/index-pack.c:986 msgid "Indexing objects" @@ -3407,93 +5010,123 @@ msgstr "förvirrad bortom vanvett i parse_pack_objects()" msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1105 +#: builtin/index-pack.c:1064 +#, c-format +msgid "unable to create thread: %s" +msgstr "kunde inte skapa tråd: %s" + +#: builtin/index-pack.c:1106 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1124 +#: builtin/index-pack.c:1112 +#, c-format +msgid "completed with %d local objects" +msgstr "slutfördes med %d lokala objekt" + +#: builtin/index-pack.c:1121 +#, c-format +msgid "Unexpected tail checksum for %s (disk corruption?)" +msgstr "Oväntad svanschecksumma för %s (trasig disk?)" + +#: builtin/index-pack.c:1125 #, 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:1149 +#: builtin/index-pack.c:1150 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1228 +#: builtin/index-pack.c:1229 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1253 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1265 +#: builtin/index-pack.c:1266 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1273 +#: builtin/index-pack.c:1274 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1286 +#: builtin/index-pack.c:1287 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1297 +#: builtin/index-pack.c:1298 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1398 +#: builtin/index-pack.c:1331 +#, c-format +msgid "bad pack.indexversion=%<PRIu32>" +msgstr "felaktig pack.indexversion=%<PRIu32>" + +#: builtin/index-pack.c:1337 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "felaktigt antal trådar angivet (%d)" + +#: builtin/index-pack.c:1341 builtin/index-pack.c:1514 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "trådstöd saknas, ignorerar %s" + +#: builtin/index-pack.c:1399 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1400 +#: builtin/index-pack.c:1401 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kan inte öppna befintligt paket-idx-fil för \"%s\"" -#: builtin/index-pack.c:1447 +#: builtin/index-pack.c:1448 #, 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:1454 +#: builtin/index-pack.c:1455 #, 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:1481 +#: builtin/index-pack.c:1482 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1525 builtin/index-pack.c:1528 -#: builtin/index-pack.c:1540 builtin/index-pack.c:1544 +#: builtin/index-pack.c:1526 builtin/index-pack.c:1529 +#: builtin/index-pack.c:1541 builtin/index-pack.c:1545 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1558 +#: builtin/index-pack.c:1559 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1562 builtin/index-pack.c:1572 +#: builtin/index-pack.c:1563 builtin/index-pack.c:1573 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1581 +#: builtin/index-pack.c:1582 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -3613,6 +5246,26 @@ msgstr " delat" msgid "cannot tell cwd" msgstr "kan inte läsa aktuell katalog (cwd)" +#: builtin/init-db.c:467 +msgid "" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" +"[=<permissions>]] [directory]" +msgstr "" +"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--shared" +"[=<behörigheter>]] [katalog]" + +#: builtin/init-db.c:490 +msgid "permissions" +msgstr "behörigheter" + +#: 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:493 builtin/prune-packed.c:77 +msgid "be quiet" +msgstr "var tyst" + #: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" @@ -3641,94 +5294,238 @@ msgstr "Kan inte komma åt aktuell arbetskatalog" msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" +#: builtin/log.c:37 +msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" +msgstr "git log [<flaggor>] [<sedan>..<till>] [[--] <sökväg>...]\n" + +#: builtin/log.c:38 +msgid " or: git show [options] <object>..." +msgstr " eller: git show [flaggor] <objekt>..." + +#: builtin/log.c:100 +msgid "suppress diff output" +msgstr "undertryck diff-utdata" + +#: builtin/log.c:101 +msgid "show source" +msgstr "visa källkod" + +#: builtin/log.c:102 +msgid "decorate options" +msgstr "dekoreringsflaggor" + #: builtin/log.c:189 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:403 builtin/log.c:494 +#: builtin/log.c:405 builtin/log.c:497 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:518 +#: builtin/log.c:521 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:608 +#: builtin/log.c:613 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:682 +#: builtin/log.c:687 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:693 +#: builtin/log.c:698 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:707 +#: builtin/log.c:712 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:715 +#: builtin/log.c:720 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:792 +#: builtin/log.c:794 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:865 +#: builtin/log.c:867 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:938 +#: builtin/log.c:895 +msgid "git format-patch [options] [<since> | <revision range>]" +msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]" + +#: builtin/log.c:940 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1160 +#: builtin/log.c:1068 +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:1071 +msgid "use [PATCH] even with multiple patches" +msgstr "använd [PATCH] även för flera patchar" + +#: builtin/log.c:1075 +msgid "print patches to standard out" +msgstr "skriv patcharna på stnadard ut" + +#: builtin/log.c:1077 +msgid "generate a cover letter" +msgstr "generera ett följebrev" + +#: builtin/log.c:1079 +msgid "use simple number sequence for output file names" +msgstr "använd enkel nummersekvens för utdatafilnamn" + +#: builtin/log.c:1080 +msgid "sfx" +msgstr "sfx" + +#: builtin/log.c:1081 +msgid "use <sfx> instead of '.patch'" +msgstr "använd <sfx> istället för \".patch\"" + +#: builtin/log.c:1083 +msgid "start numbering patches at <n> instead of 1" +msgstr "börja numrera patchar på <n> istället för 1" + +#: builtin/log.c:1085 +msgid "Use [<prefix>] instead of [PATCH]" +msgstr "Använd [<prefix>] istället för [PATCH]" + +#: builtin/log.c:1088 +msgid "store resulting files in <dir>" +msgstr "spara filerna i <katalog>" + +#: builtin/log.c:1091 +msgid "don't strip/add [PATCH]" +msgstr "ta inte bort eller lägg till [PATCH]" + +#: builtin/log.c:1094 +msgid "don't output binary diffs" +msgstr "skriv inte binära diffar" + +#: builtin/log.c:1096 +msgid "don't include a patch matching a commit upstream" +msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" + +#: builtin/log.c:1098 +msgid "show patch format instead of default (patch + stat)" +msgstr "visa patchformat istället för standard (patch + stat)" + +#: builtin/log.c:1100 +msgid "Messaging" +msgstr "E-post" + +#: builtin/log.c:1101 +msgid "header" +msgstr "huvud" + +#: builtin/log.c:1102 +msgid "add email header" +msgstr "lägg till e-posthuvud" + +#: builtin/log.c:1103 builtin/log.c:1105 +msgid "email" +msgstr "epost" + +#: builtin/log.c:1103 +msgid "add To: header" +msgstr "Lägg till mottagarhuvud (\"To:\")" + +#: builtin/log.c:1105 +msgid "add Cc: header" +msgstr "Lägg till kopiehuvud (\"Cc:\")" + +#: builtin/log.c:1107 +msgid "message-id" +msgstr "meddelande-id" + +#: builtin/log.c:1108 +msgid "make first mail a reply to <message-id>" +msgstr "Gör det första brevet ett svar till <meddelande-id>" + +#: builtin/log.c:1109 builtin/log.c:1112 +msgid "boundary" +msgstr "gräns" + +#: builtin/log.c:1110 +msgid "attach the patch" +msgstr "bifoga patchen" + +#: builtin/log.c:1113 +msgid "inline the patch" +msgstr "gör patchen ett inline-objekt" + +#: builtin/log.c:1117 +msgid "enable message threading, styles: shallow, deep" +msgstr "aktivera brevtrådning, typer: shallow, deep" + +#: builtin/log.c:1119 +msgid "signature" +msgstr "signatur" + +#: builtin/log.c:1120 +msgid "add a signature" +msgstr "lägg till signatur" + +#: builtin/log.c:1122 +msgid "don't print the patch filenames" +msgstr "visa inte filnamn för patchar" + +#: builtin/log.c:1163 #, c-format msgid "bogus committer info %s" msgstr "felaktig incheckarinformation %s" -#: builtin/log.c:1205 +#: builtin/log.c:1208 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1207 +#: builtin/log.c:1210 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix och -k kan inte användas samtidigt." -#: builtin/log.c:1215 +#: builtin/log.c:1218 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1217 +#: builtin/log.c:1220 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1219 +#: builtin/log.c:1222 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1242 +#: builtin/log.c:1245 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1244 +#: builtin/log.c:1247 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1397 +#: builtin/log.c:1400 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1501 +#: builtin/log.c:1449 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" +msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" + +#: builtin/log.c:1504 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -3739,6 +5536,146 @@ msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" msgid "Unknown commit %s" msgstr "Okänd incheckning %s" +#: builtin/ls-files.c:408 +msgid "git ls-files [options] [<file>...]" +msgstr "git ls-files [flaggor] [<fil>...]" + +#: builtin/ls-files.c:463 +msgid "identify the file status with tags" +msgstr "identifiera filstatus med taggar" + +#: builtin/ls-files.c:465 +msgid "use lowercase letters for 'assume unchanged' files" +msgstr "använd små bokstäver för \"anta oförändrade\"-filer" + +#: builtin/ls-files.c:467 +msgid "show cached files in the output (default)" +msgstr "visa cachade filer i utdata (standard)" + +#: builtin/ls-files.c:469 +msgid "show deleted files in the output" +msgstr "visa borttagna filer i utdata" + +#: builtin/ls-files.c:471 +msgid "show modified files in the output" +msgstr "visa modifierade filer i utdata" + +#: builtin/ls-files.c:473 +msgid "show other files in the output" +msgstr "visa andra filer i utdata" + +#: builtin/ls-files.c:475 +msgid "show ignored files in the output" +msgstr "visa ignorerade filer i utdata" + +#: builtin/ls-files.c:478 +msgid "show staged contents' object name in the output" +msgstr "visa köat innehålls objektnamn i utdata" + +#: builtin/ls-files.c:480 +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:482 +msgid "show 'other' directories' name only" +msgstr "visa endast namn för \"andra\" kataloger" + +#: builtin/ls-files.c:485 +msgid "don't show empty directories" +msgstr "visa inte tomma kataloger" + +#: builtin/ls-files.c:488 +msgid "show unmerged files in the output" +msgstr "visa ej sammanslagna filer i utdata" + +#: builtin/ls-files.c:490 +msgid "show resolve-undo information" +msgstr "visa \"resolve-undo\"-information" + +#: builtin/ls-files.c:492 +msgid "skip files matching pattern" +msgstr "hoppa över filer som motsvarar mönster" + +#: builtin/ls-files.c:495 +msgid "exclude patterns are read from <file>" +msgstr "exkludera mönster som läses från <fil>" + +#: builtin/ls-files.c:498 +msgid "read additional per-directory exclude patterns in <file>" +msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" + +#: builtin/ls-files.c:500 +msgid "add the standard git exclusions" +msgstr "lägg till git:s standardexkluderingar" + +#: builtin/ls-files.c:503 +msgid "make the output relative to the project top directory" +msgstr "gör utdata relativ till projektets toppkatalog" + +#: builtin/ls-files.c:506 +msgid "if any <file> is not in the index, treat this as an error" +msgstr "om en <fil> inte är indexet, betrakta det som ett fel" + +#: builtin/ls-files.c:507 +msgid "tree-ish" +msgstr "träd-igt" + +#: builtin/ls-files.c:508 +msgid "pretend that paths removed since <tree-ish> are still present" +msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" + +#: builtin/ls-files.c:510 +msgid "show debugging data" +msgstr "visa felsökningsutdata" + +#: builtin/ls-tree.c:27 +msgid "git ls-tree [<options>] <tree-ish> [<path>...]" +msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]" + +#: builtin/ls-tree.c:125 +msgid "only show trees" +msgstr "visa endast träd" + +#: builtin/ls-tree.c:127 +msgid "recurse into subtrees" +msgstr "rekursera ner i underträd" + +#: builtin/ls-tree.c:129 +msgid "show trees when recursing" +msgstr "visa träd medan rekursering" + +#: builtin/ls-tree.c:132 +msgid "terminate entries with NUL byte" +msgstr "terminera poster med NUL-byte" + +#: builtin/ls-tree.c:133 +msgid "include object size" +msgstr "inkludera objektstorlek" + +#: builtin/ls-tree.c:135 builtin/ls-tree.c:137 +msgid "list only filenames" +msgstr "visa endast filnamn" + +#: builtin/ls-tree.c:140 +msgid "use full path names" +msgstr "använd fullständiga sökvägsnamn" + +#: builtin/ls-tree.c:142 +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 +msgid "git merge [options] [<commit>...]" +msgstr "git merge [flaggor] [<incheckning>...]" + +#: builtin/merge.c:44 +msgid "git merge [options] <msg> HEAD <commit>" +msgstr "git merge [flaggor] <meddelande> HEAD <incheckning>" + +#: builtin/merge.c:45 +msgid "git merge --abort" +msgstr "git merge --abort" + #: builtin/merge.c:90 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" @@ -3758,6 +5695,67 @@ msgstr "Tillgängliga strategier är:" msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" +#: builtin/merge.c:183 +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:186 +msgid "show a diffstat at the end of the merge" +msgstr "visa en diffstat när sammanslagningen är färdig" + +#: builtin/merge.c:187 +msgid "(synonym to --stat)" +msgstr "(synonym till --stat)" + +#: builtin/merge.c:189 +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:192 +msgid "create a single commit instead of doing a merge" +msgstr "skapa en ensam incheckning istället för en sammanslagning" + +#: builtin/merge.c:194 +msgid "perform a commit if the merge succeeds (default)" +msgstr "utför en incheckning om sammanslagningen lyckades (standard)" + +#: builtin/merge.c:196 +msgid "edit message before committing" +msgstr "redigera meddelande innan incheckning" + +#: builtin/merge.c:198 +msgid "allow fast-forward (default)" +msgstr "tillåt snabbspolning (standard)" + +#: builtin/merge.c:200 +msgid "abort if fast-forward is not possible" +msgstr "avbryt om snabbspolning inte är möjlig" + +#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112 +msgid "strategy" +msgstr "strategi" + +#: builtin/merge.c:203 +msgid "merge strategy to use" +msgstr "sammanslagninsstrategi att använda" + +#: builtin/merge.c:204 +msgid "option=value" +msgstr "alternativ=värde" + +#: builtin/merge.c:205 +msgid "option for selected merge strategy" +msgstr "alternativ för vald sammanslagningsstrategi" + +#: builtin/merge.c:207 +msgid "merge commit message (for a non-fast-forward merge)" +msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" + +#: builtin/merge.c:211 +msgid "abort the current in-progress merge" +msgstr "avbryt den pågående sammanslagningen" + #: builtin/merge.c:240 msgid "could not run stash." msgstr "kunde köra stash." @@ -3797,51 +5795,47 @@ msgstr "Avslutar SQUASH_MSG" msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:437 +#: builtin/merge.c:436 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:536 +#: builtin/merge.c:535 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:629 +#: builtin/merge.c:628 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/merge.c:679 -msgid "failed to read the cache" -msgstr "misslyckads läsa cachen" - -#: builtin/merge.c:710 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:724 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:738 +#: builtin/merge.c:684 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:877 +#: builtin/merge.c:773 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:886 +#: builtin/merge.c:782 #, 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:892 +#: builtin/merge.c:788 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -3856,53 +5850,53 @@ msgstr "" "Rader som inleds med \"#\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:916 +#: builtin/merge.c:812 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:928 +#: builtin/merge.c:824 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:993 +#: builtin/merge.c:889 #, 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:1009 +#: builtin/merge.c:905 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" -#: builtin/merge.c:1050 +#: builtin/merge.c:946 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:1052 +#: builtin/merge.c:948 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:1054 +#: builtin/merge.c:950 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:1059 +#: builtin/merge.c:955 #, 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:1146 builtin/merge.c:1303 +#: builtin/merge.c:1042 builtin/merge.c:1199 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1214 +#: builtin/merge.c:1110 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1230 git-pull.sh:31 +#: builtin/merge.c:1126 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3910,11 +5904,11 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du kan slå ihop." -#: builtin/merge.c:1233 git-pull.sh:34 +#: builtin/merge.c:1129 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:1237 +#: builtin/merge.c:1133 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3922,84 +5916,183 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du kan slå ihop." -#: builtin/merge.c:1240 +#: builtin/merge.c:1136 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:1249 +#: builtin/merge.c:1145 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1254 +#: builtin/merge.c:1150 msgid "You cannot combine --no-ff with --ff-only." msgstr "Du kan inte kombinera --no-ff med --ff-only." -#: builtin/merge.c:1261 +#: builtin/merge.c:1157 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1293 +#: builtin/merge.c:1189 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:1296 +#: builtin/merge.c:1192 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1298 +#: builtin/merge.c:1194 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:1413 +#: builtin/merge.c:1309 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1451 +#: builtin/merge.c:1348 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1458 +#: builtin/merge.c:1355 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1490 +#: builtin/merge.c:1387 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1513 builtin/merge.c:1592 +#: builtin/merge.c:1410 builtin/merge.c:1489 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1517 +#: builtin/merge.c:1414 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagninsstrategin %s...\n" -#: builtin/merge.c:1583 +#: builtin/merge.c:1480 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1482 #, c-format msgid "Merge with strategy %s failed.\n" -msgstr "Sammanslaning med strategin %s misslyckades.\n" +msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1594 +#: builtin/merge.c:1491 #, 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:1606 +#: builtin/merge.c:1503 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n" +#: builtin/merge-base.c:26 +msgid "git merge-base [-a|--all] <commit> <commit>..." +msgstr "git merge-base [-a|--all] <incheckning> <incheckning>..." + +#: builtin/merge-base.c:27 +msgid "git merge-base [-a|--all] --octopus <commit>..." +msgstr "git merge-base [-a|--all] --octopus <incheckning>..." + +#: builtin/merge-base.c:28 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <incheckning>..." + +#: builtin/merge-base.c:29 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <incheckning> <incheckning>" + +#: builtin/merge-base.c:98 +msgid "output all common ancestors" +msgstr "skriv ut alla gemensamma anfäder" + +#: builtin/merge-base.c:99 +msgid "find ancestors for a single n-way merge" +msgstr "hitta anfader för enkel n-vägssammanslagning" + +#: builtin/merge-base.c:100 +msgid "list revs not reachable from others" +msgstr "visa revisioner som inte kan nås från andra" + +#: builtin/merge-base.c:102 +msgid "is the first one ancestor of the other?" +msgstr "är den första anfader till den andra?" + +#: builtin/merge-file.c:8 +msgid "" +"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " +"file2" +msgstr "" +"git merge-file [alternativ] [-L namn1 [-L orig [-L namn2]]] fil1 origfil fil2" + +#: builtin/merge-file.c:33 +msgid "send results to standard output" +msgstr "sänd resultat till standard ut" + +#: builtin/merge-file.c:34 +msgid "use a diff3 based merge" +msgstr "använd diff3-baserad sammanslagning" + +#: builtin/merge-file.c:35 +msgid "for conflicts, use our version" +msgstr "för konflikter, använd vår version" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use their version" +msgstr "för konflikter, använd deras version" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use a union version" +msgstr "för konflikter, använd en förenad version" + +#: builtin/merge-file.c:42 +msgid "for conflicts, use this marker size" +msgstr "för konflikter, använd denna markörstorlek" + +#: builtin/merge-file.c:43 +msgid "do not warn about conflicts" +msgstr "varna inte om konflikter" + +#: builtin/merge-file.c:45 +msgid "set labels for file1/orig_file/file2" +msgstr "sätt etiketter för fil1/origfil/fil2" + +#: builtin/mktree.c:67 +msgid "git mktree [-z] [--missing] [--batch]" +msgstr "git mktree [-z] [--missing] [--batch]" + +#: builtin/mktree.c:153 +msgid "input is NUL terminated" +msgstr "indata är NUL-terminerad" + +#: builtin/mktree.c:154 builtin/write-tree.c:24 +msgid "allow missing objects" +msgstr "tillåt saknade objekt" + +#: builtin/mktree.c:155 +msgid "allow creation of more than one tree" +msgstr "tillåt skapa mer än ett träd" + +#: builtin/mv.c:14 +msgid "git mv [options] <source>... <destination>" +msgstr "git mv [flaggor] <källa>... <mål>" + +#: builtin/mv.c:64 +msgid "force move/rename even if target exists" +msgstr "tvinga flytta/ändra namn även om målet finns" + +#: builtin/mv.c:65 +msgid "skip move/rename errors" +msgstr "hoppa över fel vid flytt/namnändring" + #: builtin/mv.c:108 #, c-format msgid "Checking rename of '%s' to '%s'\n" @@ -4062,114 +6155,287 @@ msgstr "Byter namn på %s till %s\n" msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/notes.c:139 +#: builtin/name-rev.c:175 +msgid "git name-rev [options] <commit>..." +msgstr "git name-rev [flaggor] <incheckning>..." + +#: builtin/name-rev.c:176 +msgid "git name-rev [options] --all" +msgstr "git name-rev [flaggor] --all" + +#: builtin/name-rev.c:177 +msgid "git name-rev [options] --stdin" +msgstr "git name-rev [flaggor] --stdin" + +#: builtin/name-rev.c:229 +msgid "print only names (no SHA-1)" +msgstr "skriv endast namn (ingen SHA-1)" + +#: builtin/name-rev.c:230 +msgid "only use tags to name the commits" +msgstr "använd endast taggar för att namnge incheckningar" + +#: builtin/name-rev.c:232 +msgid "only use refs matching <pattern>" +msgstr "använd endast referenser som motsvarar <mönster>" + +#: builtin/name-rev.c:234 +msgid "list all commits reachable from all refs" +msgstr "lista alla incheckningar som kan nås alla referenser" + +#: builtin/name-rev.c:235 +msgid "read from stdin" +msgstr "läs från standard in" + +#: builtin/name-rev.c:236 +msgid "allow to print `undefined` names" +msgstr "tillåt att skriva \"odefinierade\" namn" + +#: builtin/notes.c:26 +msgid "git notes [--ref <notes_ref>] [list [<object>]]" +msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]" + +#: builtin/notes.c:27 +msgid "" +"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" +"git notes [--ref <anteckningsref>] add [-f] [-m <medd> | -F <fil> | (-c | -" +"C) <objekt>] [<objekt>]" + +#: builtin/notes.c:28 +msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" +msgstr "" +"git notes [--ref <anteckningsref>] copy [-f] <från-objekt> <till-objekt>" + +#: builtin/notes.c:29 +msgid "" +"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " +"<object>] [<object>]" +msgstr "" +"git notes [--ref <anteckningsref>] append [-m <medd> | -F <fil> | (-c | -C) " +"<objekt>] [<objekt>]" + +#: builtin/notes.c:30 +msgid "git notes [--ref <notes_ref>] edit [<object>]" +msgstr "git notes [--ref <anteckningsref>] edit [<objekt>]" + +#: builtin/notes.c:31 +msgid "git notes [--ref <notes_ref>] show [<object>]" +msgstr "git notes [--ref <anteckningsref>] show [<objekt>]" + +#: builtin/notes.c:32 +msgid "" +"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" +msgstr "" +"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi> ] " +"<anteckningsref>" + +#: builtin/notes.c:33 +msgid "git notes merge --commit [-v | -q]" +msgstr "git notes merge --commit [-v | -q]" + +#: builtin/notes.c:34 +msgid "git notes merge --abort [-v | -q]" +msgstr "git notes merge --abort [-v | -q]" + +#: builtin/notes.c:35 +msgid "git notes [--ref <notes_ref>] remove [<object>...]" +msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]" + +#: builtin/notes.c:36 +msgid "git notes [--ref <notes_ref>] prune [-n | -v]" +msgstr "git notes [--ref <anteckningsref>] prune [-n | -v]" + +#: builtin/notes.c:37 +msgid "git notes [--ref <notes_ref>] get-ref" +msgstr "git notes [--ref <anteckningsref>] get-ref" + +#: builtin/notes.c:42 +msgid "git notes [list [<object>]]" +msgstr "git notes [list [<objekt>]]" + +#: builtin/notes.c:47 +msgid "git notes add [<options>] [<object>]" +msgstr "git notes add [<flaggor>] [<objekt>]" + +#: builtin/notes.c:52 +msgid "git notes copy [<options>] <from-object> <to-object>" +msgstr "git notes copy [<flaggor>] <från-objekt> <till-objekt>" + +#: builtin/notes.c:53 +msgid "git notes copy --stdin [<from-object> <to-object>]..." +msgstr "git notes copy --stdin [<från-objekt> <till-objekt>]..." + +#: builtin/notes.c:58 +msgid "git notes append [<options>] [<object>]" +msgstr "git notes append [<flaggor>] [<objekt>]" + +#: builtin/notes.c:63 +msgid "git notes edit [<object>]" +msgstr "git notes edit [<objekt>]" + +#: builtin/notes.c:68 +msgid "git notes show [<object>]" +msgstr "git notes show [<objekt>]" + +#: builtin/notes.c:73 +msgid "git notes merge [<options>] <notes_ref>" +msgstr "git notes merge [<flaggor>] <anteckningsref>" + +#: builtin/notes.c:74 +msgid "git notes merge --commit [<options>]" +msgstr "git notes merge --commit [<flaggor>]" + +#: builtin/notes.c:75 +msgid "git notes merge --abort [<options>]" +msgstr "git notes merge --abort [<flaggor>]" + +#: builtin/notes.c:80 +msgid "git notes remove [<object>]" +msgstr "git notes remove [<objekt>]" + +#: builtin/notes.c:85 +msgid "git notes prune [<options>]" +msgstr "git notes prune [<flaggor>]" + +#: builtin/notes.c:90 +msgid "git notes get-ref" +msgstr "git notes get-ref" + +#: builtin/notes.c:142 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "kunde inte starta \"show\" för objektet \"%s\"" -#: builtin/notes.c:145 +#: builtin/notes.c:148 msgid "can't fdopen 'show' output fd" msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag" -#: builtin/notes.c:155 +#: builtin/notes.c:158 #, c-format msgid "failed to close pipe to 'show' for object '%s'" msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\"" -#: builtin/notes.c:158 +#: builtin/notes.c:161 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" -#: builtin/notes.c:175 builtin/tag.c:347 +#: builtin/notes.c:178 builtin/tag.c:347 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: builtin/notes.c:189 +#: builtin/notes.c:192 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:210 builtin/notes.c:973 +#: builtin/notes.c:213 builtin/notes.c:976 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" -#: builtin/notes.c:215 +#: builtin/notes.c:218 msgid "unable to write note object" msgstr "kunde inte skriva anteckningsobjekt" -#: builtin/notes.c:217 +#: builtin/notes.c:220 #, c-format msgid "The note contents has been left in %s" msgstr "Anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:251 builtin/tag.c:542 +#: builtin/notes.c:254 builtin/tag.c:542 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:253 builtin/tag.c:545 +#: builtin/notes.c:256 builtin/tag.c:545 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" -#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 -#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 -#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 +#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450 +#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647 +#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769 +#: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/notes.c:275 +#: builtin/notes.c:278 #, c-format msgid "Failed to read object '%s'." msgstr "Kunde inte läsa objektet \"%s\"." -#: builtin/notes.c:299 +#: builtin/notes.c:302 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd" -#: builtin/notes.c:340 +#: builtin/notes.c:343 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Felaktigt värde för notes.rewriteMode: '%s'" -#: builtin/notes.c:350 +#: builtin/notes.c:353 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: builtin/notes.c:377 +#: builtin/notes.c:380 #, c-format msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" -#: builtin/notes.c:441 +#: builtin/notes.c:444 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/notes.c:456 +#: builtin/notes.c:459 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 -#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 -#: builtin/notes.c:1033 +#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630 +#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762 +#: builtin/notes.c:1036 msgid "too many parameters" msgstr "för många parametrar" -#: builtin/notes.c:513 builtin/notes.c:772 +#: builtin/notes.c:516 builtin/notes.c:775 #, c-format msgid "No note found for object %s." msgstr "Inga anteckningar hittades för objektet %s." -#: builtin/notes.c:580 +#: builtin/notes.c:538 builtin/notes.c:695 +msgid "note contents as a string" +msgstr "anteckningsinnehåll som sträng" + +#: builtin/notes.c:541 builtin/notes.c:698 +msgid "note contents in a file" +msgstr "anteckningsinnehåll i en fil" + +#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700 +#: builtin/notes.c:703 builtin/tag.c:476 +msgid "object" +msgstr "objekt" + +#: builtin/notes.c:544 builtin/notes.c:701 +msgid "reuse and edit specified note object" +msgstr "återanvänd och redigera angivet anteckningsobjekt" + +#: builtin/notes.c:547 builtin/notes.c:704 +msgid "reuse specified note object" +msgstr "återanvänd angivet anteckningsobjekt" + +#: builtin/notes.c:549 builtin/notes.c:617 +msgid "replace existing notes" +msgstr "ersätt befintliga anteckningar" + +#: builtin/notes.c:583 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -4178,16 +6444,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:585 builtin/notes.c:662 +#: builtin/notes.c:588 builtin/notes.c:665 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:635 +#: builtin/notes.c:618 +msgid "read objects from stdin" +msgstr "läs objekt från standard in" + +#: builtin/notes.c:620 +msgid "load rewriting config for <command> (implies --stdin)" +msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)" + +#: builtin/notes.c:638 msgid "too few parameters" msgstr "för få parametrar" -#: builtin/notes.c:656 +#: builtin/notes.c:659 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -4196,12 +6470,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:668 +#: builtin/notes.c:671 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: builtin/notes.c:717 +#: builtin/notes.c:720 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -4210,41 +6484,255 @@ 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:971 +#: builtin/notes.c:867 +msgid "General options" +msgstr "Allmänna flaggor" + +#: builtin/notes.c:869 +msgid "Merge options" +msgstr "Flaggor för sammanslagning" + +#: builtin/notes.c:871 +msgid "" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" +"cat_sort_uniq)" +msgstr "" +"läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" +"cat_sort_uniq)" + +#: builtin/notes.c:873 +msgid "Committing unmerged notes" +msgstr "Checkar in ej sammanslagna anteckningar" + +#: builtin/notes.c:875 +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:877 +msgid "Aborting notes merge resolution" +msgstr "Avbryt lösning av sammanslagning av anteckningar" + +#: builtin/notes.c:879 +msgid "abort notes merge" +msgstr "avbryt sammanslagning av anteckningar" + +#: builtin/notes.c:974 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:1103 builtin/remote.c:1598 +#: builtin/notes.c:986 +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:989 +msgid "read object names from the standard input" +msgstr "läs objektnamn från standard in" + +#: builtin/notes.c:1070 +msgid "notes_ref" +msgstr "anteckningar-ref" + +#: builtin/notes.c:1071 +msgid "use notes from <notes_ref>" +msgstr "använd anteckningar från <anteckningsref>" + +#: builtin/notes.c:1106 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" +#: builtin/pack-objects.c:23 +msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" +msgstr "git pack-objects --stdout [flaggor...] [< reflista | < objektlista]" + +#: builtin/pack-objects.c:24 +msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" +msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]" + #: builtin/pack-objects.c:183 builtin/pack-objects.c:186 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:2398 +#: builtin/pack-objects.c:2397 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2402 +#: builtin/pack-objects.c:2401 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2424 #, c-format msgid "option %s does not accept negative form" msgstr "flaggan %s godtar inte negativ form" -#: builtin/pack-objects.c:2429 +#: builtin/pack-objects.c:2428 #, 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:2447 +msgid "do not show progress meter" +msgstr "visa inte förloppsindikator" + +#: builtin/pack-objects.c:2449 +msgid "show progress meter" +msgstr "visa förloppsindikator" + +#: builtin/pack-objects.c:2451 +msgid "show progress meter during object writing phase" +msgstr "visa förloppsindikator under objektskrivningsfasen" + +#: builtin/pack-objects.c:2454 +msgid "similar to --all-progress when progress meter is shown" +msgstr "som --all-progress när förloppsmätaren visas" + +#: builtin/pack-objects.c:2455 +msgid "version[,offset]" +msgstr "version[,offset]" + +#: builtin/pack-objects.c:2456 +msgid "write the pack index file in the specified idx format version" +msgstr "skriv paketindexfilen i angiven indexformatversion" + +#: builtin/pack-objects.c:2459 +msgid "maximum size of each output pack file" +msgstr "maximal storlek på varje utdatapaketfil" + +#: builtin/pack-objects.c:2461 +msgid "ignore borrowed objects from alternate object store" +msgstr "ignorera lånade objekt från alternativa objektlager" + +#: builtin/pack-objects.c:2463 +msgid "ignore packed objects" +msgstr "ignorera packade objekt" + +#: builtin/pack-objects.c:2465 +msgid "limit pack window by objects" +msgstr "begränsa paketfönster efter objekt" + +#: builtin/pack-objects.c:2467 +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:2469 +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:2471 +msgid "reuse existing deltas" +msgstr "återanvänd befintliga delta" + +#: builtin/pack-objects.c:2473 +msgid "reuse existing objects" +msgstr "återanvänd befintliga objekt" + +#: builtin/pack-objects.c:2475 +msgid "use OFS_DELTA objects" +msgstr "använd OFS_DELTA-objekt" + +#: builtin/pack-objects.c:2477 +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:2479 +msgid "do not create an empty pack output" +msgstr "försök inte skapa tom paketutdata" + +#: builtin/pack-objects.c:2481 +msgid "read revision arguments from standard input" +msgstr "läs revisionsargument från standard in" + +#: builtin/pack-objects.c:2483 +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:2486 +msgid "include objects reachable from any reference" +msgstr "inkludera objekt som kan nås från någon referens" + +#: builtin/pack-objects.c:2489 +msgid "include objects referred by reflog entries" +msgstr "inkludera objekt som refereras från referensloggposter" + +#: builtin/pack-objects.c:2492 +msgid "output pack to stdout" +msgstr "skriv paket på standard ut" + +#: builtin/pack-objects.c:2494 +msgid "include tag objects that refer to objects to be packed" +msgstr "inkludera taggobjekt som refererar objekt som skall packas" + +#: builtin/pack-objects.c:2496 +msgid "keep unreachable objects" +msgstr "behåll onåbara objekt" + +#: builtin/pack-objects.c:2497 parse-options.h:141 +msgid "time" +msgstr "tid" + +#: builtin/pack-objects.c:2498 +msgid "unpack unreachable objects newer than <time>" +msgstr "packa upp onåbara objekt nyare än <tid>" + +#: builtin/pack-objects.c:2501 +msgid "create thin packs" +msgstr "skapa tunna paket" + +#: builtin/pack-objects.c:2503 +msgid "ignore packs that have companion .keep file" +msgstr "ignorera paket som har tillhörande .keep-fil" + +#: builtin/pack-objects.c:2505 +msgid "pack compression level" +msgstr "komprimeringsgrad för paket" + +#: builtin/pack-objects.c:2507 +msgid "do not hide commits by grafts" +msgstr "göm inte incheckningar med ympningar (\"grafts\")" + +#: builtin/pack-refs.c:6 +msgid "git pack-refs [options]" +msgstr "git pack-refs [flaggor]" + +#: builtin/pack-refs.c:14 +msgid "pack everything" +msgstr "packa allt" + +#: builtin/pack-refs.c:15 +msgid "prune loose refs (default)" +msgstr "ta bort lösa referenser (standard)" + +#: builtin/prune-packed.c:7 +msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" +msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" + +#: builtin/prune.c:12 +msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]" + +#: builtin/prune.c:132 +msgid "do not remove, show only" +msgstr "ta inte bort, bara visa" + +#: builtin/prune.c:133 +msgid "report pruned objects" +msgstr "rapportera borttagna objekt" + +#: builtin/prune.c:136 +msgid "expire objects older than <time>" +msgstr "låt tid gå ut för objekt äldre än <tid>" + +#: builtin/push.c:14 +msgid "git push [<options>] [<repository> [<refspec>...]]" +msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]" + #: builtin/push.c:45 msgid "tag shorthand without <tag>" msgstr "taggförkortning utan <tagg>" @@ -4331,14 +6819,48 @@ msgstr "" "aktuella grenen \"%s\", utan att tala om för mig vad som\n" "skall sändas för att uppdatera fjärrgrenen." -#: builtin/push.c:174 +#: builtin/push.c:151 +msgid "" +"push.default is unset; its implicit value is changing in\n" +"Git 2.0 from 'matching' to 'simple'. To squelch this message\n" +"and maintain the current behavior after the default changes, use:\n" +"\n" +" git config --global push.default matching\n" +"\n" +"To squelch this message and adopt the new behavior now, use:\n" +"\n" +" git config --global push.default simple\n" +"\n" +"See 'git help config' and search for 'push.default' for further " +"information.\n" +"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" +"'current' instead of 'simple' if you sometimes use older versions of Git)" +msgstr "" +"push.default har inte ställts in; dess underförstådda värde\n" +"ändras i Git 2.0 från \"matching\" till \"simple\". För att\n" +"undertrycka det här meddelandet och behålla nuvarande beteende\n" +"efter att förvalet ändras,\n" +"skriver du:\n" +"\n" +" git config --global push.default matching\n" +"\n" +"För att undertrycka meddelandet och välja det nya beteendet nu skriver du:\n" +"\n" +" git config --global push.default simple\n" +"\n" +"Se \"git help config\" och sök efter \"push.default\" för ytterligare \n" +"information. (Läget \"simple\" introducerades i Git 1.7.11. Använd det\n" +"liknande läget \"current\" istället för \"simple\" om du ibland använder\n" +"äldre versioner av Git.)" + +#: builtin/push.c:199 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Du angav inga referensspecifikationer att sända, och push.default är " "\"nothing\"." -#: builtin/push.c:181 +#: builtin/push.c:206 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" @@ -4350,20 +6872,21 @@ msgstr "" "innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:187 +#: builtin/push.c:212 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" -"specify branches to push or set the 'push.default' configuration\n" -"variable to 'current' or 'upstream' to push only the current branch." +"specify branches to push or set the 'push.default' configuration variable\n" +"to 'simple', 'current' or 'upstream' to push only the current branch." msgstr "" "Uppdateringar avvisades då änden på en insänd gren är bakom dess\n" "fjärrmotsvarighet. Om det inte var meningen att sända in grenen, bör\n" "du specificera grenar att sända, eller ändra inställningsvariabeln\n" -"\"push-default\" till \"current\" eller \"upstream\" för att endast sända\n" -"aktuell gren." +"\"push-default\" till \"simple\", \"current\" eller \"upstream\" för att " +"endast\n" +"sända aktuell gren." -#: builtin/push.c:193 +#: builtin/push.c:218 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and merge the remote changes\n" @@ -4375,22 +6898,22 @@ msgstr "" "\"git pull\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:233 +#: builtin/push.c:258 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:237 +#: builtin/push.c:262 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:269 +#: builtin/push.c:294 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:270 +#: builtin/push.c:295 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -4411,34 +6934,234 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:285 +#: builtin/push.c:310 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:286 +#: builtin/push.c:311 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:291 +#: builtin/push.c:316 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:292 +#: builtin/push.c:317 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:297 +#: builtin/push.c:322 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:385 +#: builtin/push.c:382 +msgid "repository" +msgstr "arkiv" + +#: builtin/push.c:383 +msgid "push all refs" +msgstr "sänd alla referenser" + +#: builtin/push.c:384 +msgid "mirror all refs" +msgstr "spegla alla referenser" + +#: builtin/push.c:386 +msgid "delete refs" +msgstr "ta bort referenser" + +#: builtin/push.c:387 +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:390 +msgid "force updates" +msgstr "tvinga uppdateringar" + +#: builtin/push.c:391 +msgid "check" +msgstr "kontrollera" + +#: builtin/push.c:392 +msgid "control recursive pushing of submodules" +msgstr "styr rekursiv insändning av undermoduler" + +#: builtin/push.c:394 +msgid "use thin pack" +msgstr "använd tunna paket" + +#: builtin/push.c:395 builtin/push.c:396 +msgid "receive pack program" +msgstr "program för att ta emot paket" + +#: builtin/push.c:397 +msgid "set upstream for git pull/status" +msgstr "ställ in uppström för git pull/status" + +#: builtin/push.c:400 +msgid "prune locally removed refs" +msgstr "ta bort lokalt borttagna referenser" + +#: builtin/push.c:410 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är imkompatibel med --all, --mirror och --tags" -#: builtin/push.c:387 +#: builtin/push.c:412 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" +#: builtin/read-tree.c:36 +msgid "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " +"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +msgstr "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " +"[-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:108 +msgid "write resulting index to <file>" +msgstr "skriv resulterande index till <fil>" + +#: builtin/read-tree.c:111 +msgid "only empty the index" +msgstr "töm bara indexet" + +#: builtin/read-tree.c:113 +msgid "Merging" +msgstr "Sammanslagning" + +#: builtin/read-tree.c:115 +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:117 +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:119 +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:121 +msgid "same as -m, but discard unmerged entries" +msgstr "som -m, men kasta bort ej sammanslagna poster" + +#: builtin/read-tree.c:122 +msgid "<subdirectory>/" +msgstr "<underkatalog>/" + +#: builtin/read-tree.c:123 +msgid "read the tree into the index under <subdirectory>/" +msgstr "läs in trädet i indexet under <underkatalog>/" + +#: builtin/read-tree.c:126 +msgid "update working tree with merge result" +msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen" + +#: builtin/read-tree.c:128 +msgid "gitignore" +msgstr "gitignore" + +#: builtin/read-tree.c:129 +msgid "allow explicitly ignored files to be overwritten" +msgstr "tillåt explicit ignorerade filer att skrivas över" + +#: builtin/read-tree.c:132 +msgid "don't check the working tree after merging" +msgstr "kontrollera inte arbetskatalogen efter sammanslagning" + +#: builtin/read-tree.c:133 +msgid "don't update the index or the work tree" +msgstr "uppdatera inte indexet eller arbetskatalogen" + +#: builtin/read-tree.c:135 +msgid "skip applying sparse checkout filter" +msgstr "hoppa över att applicera filter för gles utcheckning" + +#: builtin/read-tree.c:137 +msgid "debug unpack-trees" +msgstr "felsök unpack-trees" + +#: builtin/remote.c:11 +msgid "git remote [-v | --verbose]" +msgstr "git remote [-v | --verbose]" + +#: builtin/remote.c:12 +msgid "" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <name> <url>" +msgstr "" +"git remote add [-t <gren>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <namn> <url>" + +#: builtin/remote.c:13 builtin/remote.c:32 +msgid "git remote rename <old> <new>" +msgstr "git remote rename <gammal> <ny>" + +#: builtin/remote.c:14 builtin/remote.c:37 +msgid "git remote remove <name>" +msgstr "git remote remove <namn>" + +#: builtin/remote.c:15 builtin/remote.c:42 +msgid "git remote set-head <name> (-a | -d | <branch>)" +msgstr "git remote set-head <namn> (-a | -d | <gren>)" + +#: builtin/remote.c:16 +msgid "git remote [-v | --verbose] show [-n] <name>" +msgstr "git remote [-v | --verbose] show [-n] <namn>" + +#: builtin/remote.c:17 +msgid "git remote prune [-n | --dry-run] <name>" +msgstr "git remote prune [-n | --dry-run] <namn>" + +#: builtin/remote.c:18 +msgid "" +"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" +msgstr "" +"git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjärr>)...]" + +#: builtin/remote.c:19 +msgid "git remote set-branches [--add] <name> <branch>..." +msgstr "git remote set-branches [--add] <namn> <gren>..." + +#: builtin/remote.c:20 builtin/remote.c:68 +msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" +msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]" + +#: builtin/remote.c:21 builtin/remote.c:69 +msgid "git remote set-url --add <name> <newurl>" +msgstr "git remote set-url --add <namn> <nyurl>" + +#: builtin/remote.c:22 builtin/remote.c:70 +msgid "git remote set-url --delete <name> <url>" +msgstr "git remote set-url --delete <namn> <url>" + +#: builtin/remote.c:27 +msgid "git remote add [<options>] <name> <url>" +msgstr "git remote add [<flaggor>] <namn> <url>" + +#: builtin/remote.c:47 +msgid "git remote set-branches <name> <branch>..." +msgstr "git remote set-branches <namn> <gren>..." + +#: builtin/remote.c:48 +msgid "git remote set-branches --add <name> <branch>..." +msgstr "git remote set-branches --add <namn> <gren>..." + +#: builtin/remote.c:53 +msgid "git remote show [<options>] <name>" +msgstr "git remote show [<flaggor>] <namn>" + +#: builtin/remote.c:58 +msgid "git remote prune [<options>] <name>" +msgstr "git remote prune [<flaggor>] <namn>" + +#: builtin/remote.c:63 +msgid "git remote update [<options>] [<group> | <remote>]..." +msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..." + #: builtin/remote.c:98 #, c-format msgid "Updating %s" @@ -4457,6 +7180,34 @@ msgstr "" msgid "unknown mirror argument: %s" msgstr "okänt argument till mirror: %s" +#: builtin/remote.c:163 +msgid "fetch the remote branches" +msgstr "hämta fjärrgrenarna" + +#: builtin/remote.c:165 +msgid "import all tags and associated objects when fetching" +msgstr "importera alla taggar och associerade objekt vid hämtning" + +#: builtin/remote.c:168 +msgid "or do not fetch any tag at all (--no-tags)" +msgstr "eller hämta inte några taggar alls (--no-tags)" + +#: builtin/remote.c:170 +msgid "branch(es) to track" +msgstr "gren(ar) att spåra" + +#: builtin/remote.c:171 +msgid "master branch" +msgstr "huvudgren" + +#: builtin/remote.c:172 +msgid "push|fetch" +msgstr "push|fetch" + +#: builtin/remote.c:173 +msgid "set up remote as a mirror to push to or fetch from" +msgstr "ställ in arkiv som spegel att sända eller ta emot från" + #: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "att ange en master-gren ger ingen mening med --mirror" @@ -4653,6 +7404,10 @@ msgstr " %-*s tvingar till %s" msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" +#: builtin/remote.c:1091 +msgid "do not query remotes" +msgstr "fråga inte fjärrar" + #: builtin/remote.c:1118 #, c-format msgid "* remote %s" @@ -4711,6 +7466,14 @@ 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:1199 +msgid "set refs/remotes/<name>/HEAD according to remote" +msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" + +#: builtin/remote.c:1201 +msgid "delete refs/remotes/<name>/HEAD" +msgstr "ta bort refs/remotes/<namn>/HEAD" + #: builtin/remote.c:1216 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" @@ -4764,15 +7527,35 @@ msgstr " * [skulle rensa] %s" msgid " * [pruned] %s" msgstr " * [rensad] %s" +#: builtin/remote.c:1321 +msgid "prune remotes after fetching" +msgstr "rensa fjärrar efter hämtning" + #: builtin/remote.c:1387 builtin/remote.c:1461 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" +#: builtin/remote.c:1407 +msgid "add branch" +msgstr "lägg till gren" + #: builtin/remote.c:1414 msgid "no remote specified" msgstr "ingen fjärr angavs" +#: builtin/remote.c:1436 +msgid "manipulate push URLs" +msgstr "manipulera URL:ar för sändning" + +#: builtin/remote.c:1438 +msgid "add URL" +msgstr "lägg till URL" + +#: builtin/remote.c:1440 +msgid "delete URLs" +msgstr "ta bort URL:ar" + #: builtin/remote.c:1447 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" @@ -4791,6 +7574,56 @@ msgstr "Ingen sådan URL hittades: %s" msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" +#: builtin/remote.c:1569 +msgid "be verbose; must be placed before a subcommand" +msgstr "var pratsam; måste skrivas före ett underkommando" + +#: builtin/replace.c:17 +msgid "git replace [-f] <object> <replacement>" +msgstr "git replace [-f] <objekt> <ersättning>" + +#: builtin/replace.c:18 +msgid "git replace -d <object>..." +msgstr "git replace -d <objekt>..." + +#: builtin/replace.c:19 +msgid "git replace -l [<pattern>]" +msgstr "git replace -l [<mönster>]" + +#: builtin/replace.c:121 +msgid "list replace refs" +msgstr "visa ersättningsreferenser" + +#: builtin/replace.c:122 +msgid "delete replace refs" +msgstr "ta bort ersättningsreferenser" + +#: builtin/replace.c:123 +msgid "replace the ref if it exists" +msgstr "ersätt referensen om den finns" + +#: builtin/rerere.c:11 +msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" +msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" + +#: builtin/rerere.c:56 +msgid "register clean resolutions in index" +msgstr "registrera rena lösningar i indexet" + +#: builtin/reset.c:25 +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]" + +#: builtin/reset.c:26 +msgid "git reset [-q] <commit> [--] <paths>..." +msgstr "git reset [-q] <incheckning> [--] <sökvägar>..." + +#: builtin/reset.c:27 +msgid "git reset --patch [<commit>] [--] [<paths>...]" +msgstr "git reset --patch [<incheckning>] [--] [<sökvägar>...]" + #: builtin/reset.c:33 msgid "mixed" msgstr "blandad" @@ -4846,6 +7679,26 @@ msgstr "Oköade ändringar efter återställning:" 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:238 +msgid "be quiet, only report errors" +msgstr "var tyst, rapportera endast fel" + +#: builtin/reset.c:240 +msgid "reset HEAD and index" +msgstr "återställ HEAD och index" + +#: builtin/reset.c:241 +msgid "reset only HEAD" +msgstr "återställ endast HEAD" + +#: builtin/reset.c:243 builtin/reset.c:245 +msgid "reset HEAD, index and working tree" +msgstr "återställ HEAD, index och arbetskatalog" + +#: builtin/reset.c:247 +msgid "reset HEAD but keep local changes" +msgstr "återställ HEAD men behåll lokala ändringar" + #: builtin/reset.c:303 #, c-format msgid "Could not parse object '%s'." @@ -4875,24 +7728,137 @@ msgstr "%s återställning tillåts inte i ett naket arkiv" msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." +#: builtin/rev-parse.c:339 +msgid "git rev-parse --parseopt [options] -- [<args>...]" +msgstr "git rev-parse --parseopt [options] -- [<argument>...]" + +#: builtin/rev-parse.c:344 +msgid "keep the `--` passed as an arg" +msgstr "behåll \"--\" sänt som argument" + +#: builtin/rev-parse.c:346 +msgid "stop parsing after the first non-option argument" +msgstr "sluta tolka efter första argument som inte är flagga" + +#: builtin/rev-parse.c:464 +msgid "" +"git rev-parse --parseopt [options] -- [<args>...]\n" +" or: git rev-parse --sq-quote [<arg>...]\n" +" or: git rev-parse [options] [<arg>...]\n" +"\n" +"Run \"git rev-parse --parseopt -h\" for more information on the first usage." +msgstr "" +"git rev-parse --parseopt [flaggor] -- [<argument>...]\n" +" eller: git rev-parse --sq-quote [<argument>...]\n" +" eller: git rev-parse [flaggor] [<argument>...]\n" +"\n" +"Kör \"git rev-parse --parseopt -h\" för mer information om den första " +"varianten." + +#: builtin/revert.c:22 +msgid "git revert [options] <commit-ish>" +msgstr "git revert [flaggor] <incheckning-igt>" + +#: builtin/revert.c:23 +msgid "git revert <subcommand>" +msgstr "git revert <underkommando>" + +#: builtin/revert.c:28 +msgid "git cherry-pick [options] <commit-ish>" +msgstr "git cherry-pick [flaggor] <incheckning-igt>" + +#: builtin/revert.c:29 +msgid "git cherry-pick <subcommand>" +msgstr "git cherry-pick <underkommando>" + #: builtin/revert.c:70 builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s kan inte användas med %s" -#: builtin/revert.c:131 +#: builtin/revert.c:103 +msgid "end revert or cherry-pick sequence" +msgstr "avsluta revert- eller cherry-pick-sekvens" + +#: builtin/revert.c:104 +msgid "resume revert or cherry-pick sequence" +msgstr "återuppta revert- eller cherry-pick-sekvens" + +#: builtin/revert.c:105 +msgid "cancel revert or cherry-pick sequence" +msgstr "avbryt revert- eller cherry-pick-sekvens" + +#: builtin/revert.c:106 +msgid "don't automatically commit" +msgstr "checka inte in automatiskt" + +#: builtin/revert.c:107 +msgid "edit the commit message" +msgstr "redigera incheckningsmeddelandet" + +#: builtin/revert.c:110 +msgid "parent number" +msgstr "nummer på förälder" + +#: builtin/revert.c:112 +msgid "merge strategy" +msgstr "sammanslagninsstrategi" + +#: builtin/revert.c:113 +msgid "option" +msgstr "alternativ" + +#: builtin/revert.c:114 +msgid "option for merge strategy" +msgstr "alternativ för sammanslagningsstrategi" + +#: builtin/revert.c:125 +msgid "append commit name" +msgstr "lägg till incheckningsnamn" + +#: builtin/revert.c:126 +msgid "allow fast-forward" +msgstr "tillåt snabbspolning" + +#: builtin/revert.c:127 +msgid "preserve initially empty commits" +msgstr "behåll incheckningar som börjar som tomma" + +#: builtin/revert.c:128 +msgid "allow commits with empty messages" +msgstr "tillåt incheckningar med tomt meddelande" + +#: builtin/revert.c:129 +msgid "keep redundant, empty commits" +msgstr "behåll redundanta, tomma incheckningar" + +#: builtin/revert.c:133 msgid "program error" msgstr "programfel" -#: builtin/revert.c:221 +#: builtin/revert.c:223 msgid "revert failed" msgstr "\"revert\" misslyckades" -#: builtin/revert.c:236 +#: builtin/revert.c:238 msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" -#: builtin/rm.c:109 +#: builtin/rm.c:15 +msgid "git rm [options] [--] <file>..." +msgstr "git rm [flaggor] [--] <fil>..." + +#: builtin/rm.c:64 builtin/rm.c:186 +#, c-format +msgid "" +"submodule '%s' (or one of its nested submodules) uses a .git directory\n" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "" +"undermodulen \"%s\" (eller en av dess undermoduler) använder en .git-" +"katalog\n" +"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" + +#: builtin/rm.c:174 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" @@ -4901,7 +7867,7 @@ msgstr "" "\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n" "(använd -f för att tvinga borttagning)" -#: builtin/rm.c:115 +#: builtin/rm.c:180 #, c-format msgid "" "'%s' has changes staged in the index\n" @@ -4910,7 +7876,7 @@ msgstr "" "\"%s\" har köade ändringar i indexet\n" "(använd --cached för att behålla filen eller -f för att tvinga borttagning)" -#: builtin/rm.c:119 +#: builtin/rm.c:191 #, c-format msgid "" "'%s' has local modifications\n" @@ -4919,21 +7885,241 @@ msgstr "" "\"%s\" har lokala ändringar\n" "(använd --cached för att behålla filen eller -f för att tvinga borttagning)" -#: builtin/rm.c:194 +#: builtin/rm.c:207 +msgid "do not list removed files" +msgstr "lista inte borttagna filer" + +#: builtin/rm.c:208 +msgid "only remove from the index" +msgstr "ta bara bort från indexet" + +#: builtin/rm.c:209 +msgid "override the up-to-date check" +msgstr "överstyr àjour-testet" + +#: builtin/rm.c:210 +msgid "allow recursive removal" +msgstr "tillåt rekursiv borttagning" + +#: builtin/rm.c:212 +msgid "exit with a zero status even if nothing matched" +msgstr "avsluta med nollstatus även om inget träffades" + +#: builtin/rm.c:283 #, c-format msgid "not removing '%s' recursively without -r" msgstr "tar inte bort \"%s\" rekursivt utan -r" -#: builtin/rm.c:230 +#: builtin/rm.c:322 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" +#: builtin/shortlog.c:13 +msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" +msgstr "" +"git shortlog [-n] [-s] [-e] [-w] [rev-flaggor] [--] [<incheckning-id>... ]" + #: builtin/shortlog.c:157 #, c-format msgid "Missing author: %s" msgstr "Författare saknas: %s" +#: builtin/shortlog.c:253 +msgid "sort output according to the number of commits per author" +msgstr "sortera utdata enligt antal incheckningar per författare" + +#: builtin/shortlog.c:255 +msgid "Suppress commit descriptions, only provides commit count" +msgstr "Undertryck beskrivningar, visa bara antal incheckningar" + +#: builtin/shortlog.c:257 +msgid "Show the email address of each author" +msgstr "Visa e-postadress för varje författare" + +#: builtin/shortlog.c:258 +msgid "w[,i1[,i2]]" +msgstr "w[,i1[,i2]]" + +#: builtin/shortlog.c:259 +msgid "Linewrap output" +msgstr "Radbryt utdata" + +#: builtin/show-branch.c:9 +msgid "" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" +"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " +"<glob>)...]" +msgstr "" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<när>] | --no-color] [--sparse] [--more=<n> | --list | --" +"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " +"<mönster>)...]" + +#: builtin/show-branch.c:10 +msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" +msgstr "git show-branch (-g|--reflog)[=<n>[,<bas>]] [--list] [<ref>]" + +#: builtin/show-branch.c:651 +msgid "show remote-tracking and local branches" +msgstr "visa fjärrspårande och lokala grenar" + +#: builtin/show-branch.c:653 +msgid "show remote-tracking branches" +msgstr "visa fjärrspårande grenar" + +#: builtin/show-branch.c:655 +msgid "color '*!+-' corresponding to the branch" +msgstr "färga \"*!+-\" enligt grenen" + +#: builtin/show-branch.c:657 +msgid "show <n> more commits after the common ancestor" +msgstr "visa <n> ytterligare incheckningar efter gemensam anfader" + +#: builtin/show-branch.c:659 +msgid "synonym to more=-1" +msgstr "synonym till more=-1" + +#: builtin/show-branch.c:660 +msgid "suppress naming strings" +msgstr "undertyck namnsträngar" + +#: builtin/show-branch.c:662 +msgid "include the current branch" +msgstr "inkludera aktuell gren" + +#: builtin/show-branch.c:664 +msgid "name commits with their object names" +msgstr "namnge incheckningar med deras objektnamn" + +#: builtin/show-branch.c:666 +msgid "show possible merge bases" +msgstr "visa möjliga sammanslaningsbaser" + +#: builtin/show-branch.c:668 +msgid "show refs unreachable from any other ref" +msgstr "visa referenser som inte kan nås från någon annan referens" + +#: builtin/show-branch.c:670 +msgid "show commits in topological order" +msgstr "visa incheckningar i topologisk ordning" + +#: builtin/show-branch.c:672 +msgid "show only commits not on the first branch" +msgstr "visa endast incheckningar inte på den första grenen" + +#: builtin/show-branch.c:674 +msgid "show merges reachable from only one tip" +msgstr "visa sammanslagningar som endast kan nås från en spets" + +#: builtin/show-branch.c:676 +msgid "show commits where no parent comes before its children" +msgstr "visa incheckningar där ingen förälder kommer före dess barn" + +#: builtin/show-branch.c:678 +msgid "<n>[,<base>]" +msgstr "<n>[,<bas>]" + +#: builtin/show-branch.c:679 +msgid "show <n> most recent ref-log entries starting at base" +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*] " +msgstr "" +"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" +msgstr "git show-ref --exclude-existing[=mönster] < reflista" + +#: builtin/show-ref.c:165 +msgid "only show tags (can be combined with heads)" +msgstr "visa endast taggar (kan kombineras med huvuden)" + +#: builtin/show-ref.c:166 +msgid "only show heads (can be combined with tags)" +msgstr "visa endast huvuden (kan kombineras med taggar)" + +#: builtin/show-ref.c:167 +msgid "stricter reference checking, requires exact ref path" +msgstr "striktare referenskontroll, kräver exakt referenssökväg" + +#: builtin/show-ref.c:170 builtin/show-ref.c:172 +msgid "show the HEAD reference" +msgstr "visa HEAD-referensen" + +#: builtin/show-ref.c:174 +msgid "dereference tags into object IDs" +msgstr "avreferera taggar till objekt-id" + +#: builtin/show-ref.c:176 +msgid "only show SHA1 hash using <n> digits" +msgstr "visa SHA1-hash endast med <n> siffror" + +#: builtin/show-ref.c:180 +msgid "do not print results to stdout (useful with --verify)" +msgstr "visa inte resultat på standard ut (användbart med --verify)" + +#: builtin/show-ref.c:182 +msgid "show refs from stdin that aren't in local repository" +msgstr "visa referenser från standard in som inte finns i lokalt arkiv" + +#: builtin/symbolic-ref.c:7 +msgid "git symbolic-ref [options] name [ref]" +msgstr "git symbolic-ref [flaggor] namn [ref]" + +#: builtin/symbolic-ref.c:8 +msgid "git symbolic-ref -d [-q] name" +msgstr "git symbolic-ref -d [-q] namn" + +#: builtin/symbolic-ref.c:40 +msgid "suppress error message for non-symbolic (detached) refs" +msgstr "" +"undertryck felmeddelanden för icke-symboliska (frånkopplade) referenser" + +#: builtin/symbolic-ref.c:41 +msgid "delete symbolic ref" +msgstr "ta bort symbolisk referens" + +#: builtin/symbolic-ref.c:42 +msgid "shorten ref output" +msgstr "förkorta ref-utdata" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +msgid "reason" +msgstr "skäl" + +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 +msgid "reason of the update" +msgstr "skäl till uppdateringen" + +#: builtin/tag.c:22 +msgid "" +"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" +msgstr "" +"git tag [-a|-s|-u <nyckel-id>] [-f] [-m <medd>|-F <fil>] <taggnamn> [<huvud>]" + +#: builtin/tag.c:23 +msgid "git tag -d <tagname>..." +msgstr "git tag -d <taggnamn>..." + +#: builtin/tag.c:24 +msgid "" +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" +"\t\t[<pattern>...]" +msgstr "" +"git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>] \n" +"\t\t[<mönster>...]" + +#: builtin/tag.c:26 +msgid "git tag -v <tagname>..." +msgstr "git tag -v <taggnamn>..." + #: builtin/tag.c:60 #, c-format msgid "malformed object at '%s'" @@ -5023,6 +8209,62 @@ msgstr "flaggan \"points-at\" behöver ett object" msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" +#: builtin/tag.c:447 +msgid "list tag names" +msgstr "lista taggnamn" + +#: builtin/tag.c:449 +msgid "print <n> lines of each tag message" +msgstr "visa <n> rader från varje taggmeddelande" + +#: builtin/tag.c:451 +msgid "delete tags" +msgstr "ta bort taggar" + +#: builtin/tag.c:452 +msgid "verify tags" +msgstr "verifiera taggar" + +#: builtin/tag.c:454 +msgid "Tag creation options" +msgstr "Alternativ för att skapa taggar" + +#: builtin/tag.c:456 +msgid "annotated tag, needs a message" +msgstr "annoterad tagg, behöver meddelande" + +#: builtin/tag.c:458 +msgid "tag message" +msgstr "taggmeddelande" + +#: builtin/tag.c:460 +msgid "annotated and GPG-signed tag" +msgstr "annoterad och GPG-signerad tagg" + +#: builtin/tag.c:464 +msgid "use another key to sign the tag" +msgstr "använd annan nyckel för att signera taggen" + +#: builtin/tag.c:465 +msgid "replace the tag if exists" +msgstr "ersätt taggen om den finns" + +#: builtin/tag.c:466 +msgid "show tag list in columns" +msgstr "lista taggar i spalter" + +#: builtin/tag.c:468 +msgid "Tag listing options" +msgstr "Alternativ för listning av taggar" + +#: builtin/tag.c:471 +msgid "print only tags that contain the commit" +msgstr "visa endast taggar som innehåller incheckningen" + +#: builtin/tag.c:477 +msgid "print only tags of the object" +msgstr "visa endast taggar för objektet" + #: builtin/tag.c:506 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" @@ -5072,27 +8314,182 @@ msgstr "%s: kan inte uppdatera referensen" msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" -#: git.c:16 -msgid "See 'git help <command>' for more information on a specific command." -msgstr "" -"Se \"git help <kommando>\" för mer information om ett specifikt kommando." +#: builtin/update-index.c:401 +msgid "git update-index [options] [--] [<file>...]" +msgstr "git update-index [flaggor] [--] [<fil>...]" -#: parse-options.h:133 parse-options.h:235 -msgid "n" -msgstr "n" +#: builtin/update-index.c:718 +msgid "continue refresh even when index needs update" +msgstr "fortsätt uppdatera även när index inte är àjour" -#: parse-options.h:141 -msgid "time" -msgstr "tid" +#: builtin/update-index.c:721 +msgid "refresh: ignore submodules" +msgstr "refresh: ignorera undermoduler" -# %s är ett verb ("Untracked"/"Ignored"); lägg till ett -e. -#: parse-options.h:149 -msgid "file" -msgstr "fil" +#: builtin/update-index.c:724 +msgid "do not ignore new files" +msgstr "ignorera inte nya filer" -#: parse-options.h:151 -msgid "when" -msgstr "när" +#: builtin/update-index.c:726 +msgid "let files replace directories and vice-versa" +msgstr "låt filer ersätta kataloger och omvänt" + +#: builtin/update-index.c:728 +msgid "notice files missing from worktree" +msgstr "lägg märke till filer som saknas i arbetskatalogen" + +#: builtin/update-index.c:730 +msgid "refresh even if index contains unmerged entries" +msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" + +#: builtin/update-index.c:733 +msgid "refresh stat information" +msgstr "uppdatera statusinformation" + +#: builtin/update-index.c:737 +msgid "like --refresh, but ignore assume-unchanged setting" +msgstr "som --refresh, men ignorera assume-unchanged-inställning" + +#: builtin/update-index.c:741 +msgid "<mode> <object> <path>" +msgstr "<läge> <objekt> <sökväg>" + +#: builtin/update-index.c:742 +msgid "add the specified entry to the index" +msgstr "lägg till angiven post i indexet" + +#: builtin/update-index.c:746 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/update-index.c:747 +msgid "override the executable bit of the listed files" +msgstr "överstyr exekveringsbiten för angivna filer" + +#: builtin/update-index.c:751 +msgid "mark files as \"not changing\"" +msgstr "markera filer som \"ändras inte\"" + +#: builtin/update-index.c:754 +msgid "clear assumed-unchanged bit" +msgstr "rensa \"assume-unchanged\"-biten" + +#: builtin/update-index.c:757 +msgid "mark files as \"index-only\"" +msgstr "markera filer som \"endast index\"" + +#: builtin/update-index.c:760 +msgid "clear skip-worktree bit" +msgstr "töm \"skip-worktree\"-biten" + +#: builtin/update-index.c:763 +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:765 +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:767 +msgid "with --stdin: input lines are terminated by null bytes" +msgstr "med --stdin: indatarader termineras med null-byte" + +#: builtin/update-index.c:769 +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:773 +msgid "add entries from standard input to the index" +msgstr "lägg poster från från standard in till indexet" + +#: builtin/update-index.c:777 +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:781 +msgid "only update entries that differ from HEAD" +msgstr "uppdatera endast poster som skiljer sig från HEAD" + +#: builtin/update-index.c:785 +msgid "ignore files missing from worktree" +msgstr "ignorera filer som saknas i arbetskatalogen" + +#: builtin/update-index.c:788 +msgid "report actions to standard output" +msgstr "raportera åtgärder på standard ut" + +#: builtin/update-index.c:790 +msgid "(for porcelains) forget saved unresolved conflicts" +msgstr "(för porslin) glöm sparade olösta konflikter" + +#: builtin/update-index.c:794 +msgid "write index in this format" +msgstr "skriv index i detta format" + +#: builtin/update-ref.c:7 +msgid "git update-ref [options] -d <refname> [<oldval>]" +msgstr "git update-ref [flaggor] -d <refnamn> [<gammaltvärde>]" + +#: builtin/update-ref.c:8 +msgid "git update-ref [options] <refname> <newval> [<oldval>]" +msgstr "git update-ref [flaggor] <refnamn> <gammaltvärde> [<nyttvärde>]" + +#: builtin/update-ref.c:19 +msgid "delete the reference" +msgstr "ta bort referensen" + +#: builtin/update-ref.c:21 +msgid "update <refname> not the one it points to" +msgstr "uppdatera <refnamn> inte det den pekar på" + +#: builtin/update-server-info.c:6 +msgid "git update-server-info [--force]" +msgstr "git update-server-info [--force]" + +#: builtin/update-server-info.c:14 +msgid "update the info files from scratch" +msgstr "uppdatera informationsfilerna från grunden" + +#: builtin/verify-pack.c:56 +msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." +msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <paket>..." + +#: builtin/verify-pack.c:66 +msgid "verbose" +msgstr "pratsam" + +#: builtin/verify-pack.c:68 +msgid "show statistics only" +msgstr "visa endast statistik" + +#: builtin/verify-tag.c:17 +msgid "git verify-tag [-v|--verbose] <tag>..." +msgstr "git verify-tag [-v|--verbose] <tagg>..." + +#: builtin/verify-tag.c:73 +msgid "print tag contents" +msgstr "visa innehåll för tag" + +#: builtin/write-tree.c:13 +msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" +msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]" + +#: builtin/write-tree.c:26 +msgid "<prefix>/" +msgstr "<prefix>/" + +#: builtin/write-tree.c:27 +msgid "write tree object for a subdirectory <prefix>" +msgstr "visa trädobjekt för underkatalogen <prefix>" + +#: builtin/write-tree.c:30 +msgid "only useful for debugging" +msgstr "endast användbart vid felsökning" + +#: git.c:16 +msgid "See 'git help <command>' for more information on a specific command." +msgstr "" +"Se \"git help <kommando>\" för mer information om ett specifikt kommando." #: parse-options.h:156 msgid "no-op (backward compatibility)" @@ -5350,6 +8747,15 @@ msgstr "Inga ändringar -- Patchen har redan tillämpats." msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE" +#: git-am.sh:858 +#, sh-format +msgid "" +"The copy of the patch that failed is found in:\n" +" $dotest/patch" +msgstr "" +"En kopia av patchen som misslyckades finns i:\n" +" $dotest/patch" + #: git-am.sh:876 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" @@ -5534,7 +8940,7 @@ msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:228 +#: git-pull.sh:229 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -5545,15 +8951,15 @@ msgstr "" "Varning: snabbspolar din arbetskatalog från\n" "Varning: incheckningen $orig_head." -#: git-pull.sh:253 +#: git-pull.sh:254 msgid "Cannot merge multiple branches into empty head" msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: git-pull.sh:257 +#: git-pull.sh:258 msgid "Cannot rebase onto multiple branches" msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar" -#: git-rebase.sh:52 +#: git-rebase.sh:53 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -5564,27 +8970,31 @@ msgstr "" "Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n" "För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"." -#: git-rebase.sh:159 +#: git-rebase.sh:160 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: git-rebase.sh:164 +#: git-rebase.sh:165 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Det verkar som en git-am körs. Kan inte ombasera." -#: git-rebase.sh:295 +#: git-rebase.sh:296 msgid "The --exec option must be used with the --interactive option" msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive" -#: git-rebase.sh:300 +#: git-rebase.sh:301 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: git-rebase.sh:313 +#: git-rebase.sh:312 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." + +#: git-rebase.sh:319 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: git-rebase.sh:316 +#: git-rebase.sh:322 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -5592,12 +9002,12 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: git-rebase.sh:334 +#: git-rebase.sh:340 #, sh-format msgid "Could not move back to $head_name" msgstr "Kunde inte flytta tillbaka till $head_name" -#: git-rebase.sh:350 +#: git-rebase.sh:359 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -5618,57 +9028,57 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där." -#: git-rebase.sh:395 +#: git-rebase.sh:404 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ogiltig uppström $upstream_name" -#: git-rebase.sh:419 +#: git-rebase.sh:428 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: mer än en sammanslagningsbas finns" -#: git-rebase.sh:422 git-rebase.sh:426 +#: git-rebase.sh:431 git-rebase.sh:435 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ingen sammanslagningsbas finns" -#: git-rebase.sh:431 +#: git-rebase.sh:440 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Peka på en giltig incheckning: $onto_name" -#: git-rebase.sh:454 +#: git-rebase.sh:463 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ödesdigert: ingen sådan gren: $branch_name" -#: git-rebase.sh:474 +#: git-rebase.sh:483 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: git-rebase.sh:492 +#: git-rebase.sh:501 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name är à jour." -#: git-rebase.sh:495 +#: git-rebase.sh:504 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad." -#: git-rebase.sh:506 +#: git-rebase.sh:515 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Ändringar från $mb till $onto:" #. Detach HEAD and reset the tree -#: git-rebase.sh:515 +#: git-rebase.sh:524 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..." -#: git-rebase.sh:523 +#: git-rebase.sh:532 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." @@ -5780,60 +9190,60 @@ msgstr "Kunde inte spara indexträd" msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-stash.sh:474 +#: git-stash.sh:475 msgid "Index was not unstashed." msgstr "Indexet har inte tagits ur kön." -#: git-stash.sh:491 +#: git-stash.sh:492 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-stash.sh:492 +#: git-stash.sh:493 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:499 +#: git-stash.sh:500 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: git-stash.sh:570 +#: git-stash.sh:571 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" -#: git-submodule.sh:88 +#: git-submodule.sh:89 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\"" -#: git-submodule.sh:145 +#: git-submodule.sh:168 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "" "Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$sm_path\"" -#: git-submodule.sh:189 +#: git-submodule.sh:211 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:201 +#: git-submodule.sh:223 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "Gitkatalog \"$a\" ingår i underkatalogsökvägen \"$b\" eller omvänt" -#: git-submodule.sh:290 +#: git-submodule.sh:316 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../" -#: git-submodule.sh:307 +#: git-submodule.sh:333 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:311 +#: git-submodule.sh:337 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5844,64 +9254,98 @@ msgstr "" "$sm_path\n" "Använd -f om du verkligen vill lägga till den" -#: git-submodule.sh:322 +#: git-submodule.sh:355 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet" -#: git-submodule.sh:324 +#: git-submodule.sh:357 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv" -#: git-submodule.sh:338 +#: git-submodule.sh:365 +#, sh-format +msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):" + +#: git-submodule.sh:367 +#, sh-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from" +msgstr "" +"För att återanvända den lokala git-katalogen istället för att på nytt klona " +"från" + +#: git-submodule.sh:369 +#, sh-format +msgid "" +"use the '--force' option. If the local git directory is not the correct repo" +msgstr "" +"använd flaggan \"--force\". Om den lokala git-katalogen inte är riktigt arkiv" + +#: git-submodule.sh:370 +#, sh-format +msgid "" +"or you are unsure what this means choose another name with the '--name' " +"option." +msgstr "" +"eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--name" +"\"." + +#: git-submodule.sh:372 +#, sh-format +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt." + +#: git-submodule.sh:384 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:343 +#: git-submodule.sh:389 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:348 +#: git-submodule.sh:394 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:390 +#: git-submodule.sh:437 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "Går in i \"$prefix$sm_path\"" -#: git-submodule.sh:404 +#: git-submodule.sh:451 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "" "Stoppar på \"$sm_path\"; skriptet returnerade en status skild från noll." -#: git-submodule.sh:447 +#: git-submodule.sh:495 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"$sm_path\" i .gitmodules" -#: git-submodule.sh:456 +#: git-submodule.sh:504 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "Misslyckades registrera url för underkatalogsökväg \"$sm_path\"" -#: git-submodule.sh:458 +#: git-submodule.sh:506 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$sm_path\"" -#: git-submodule.sh:466 +#: git-submodule.sh:514 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "" "Misslyckades registrera uppdateringsläge för undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:565 +#: git-submodule.sh:614 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -5910,92 +9354,154 @@ msgstr "" "Undermodulen \"$sm_path\" har inte initierats\n" "Kanske du vill köra \"update --init\"?" -#: git-submodule.sh:578 +#: git-submodule.sh:627 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:597 +#: git-submodule.sh:646 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:611 +#: git-submodule.sh:660 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:612 +#: git-submodule.sh:661 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$sm_path\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:617 +#: git-submodule.sh:666 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:618 +#: git-submodule.sh:667 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "Undermodulsökvägen \"$sm_path\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:623 +#: git-submodule.sh:672 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:624 +#: git-submodule.sh:673 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "Undermodulsökvägen \"$sm_path\": checkade ut \"$sha1\"" -#: git-submodule.sh:646 git-submodule.sh:969 +#: git-submodule.sh:695 git-submodule.sh:1017 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:754 +#: git-submodule.sh:803 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" #. unexpected type -#: git-submodule.sh:794 +#: git-submodule.sh:843 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:812 +#: git-submodule.sh:861 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " Varning: $name innehåller inte incheckning $sha1_src" -#: git-submodule.sh:815 +#: git-submodule.sh:864 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " Varning: $name innehåller inte incheckning $sha1_dst" -#: git-submodule.sh:818 +#: git-submodule.sh:867 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr " Varning: $name innehåller inte incheckningar $sha1_src och $sha1_dst" -#: git-submodule.sh:843 +#: git-submodule.sh:892 msgid "blob" msgstr "blob" -#: git-submodule.sh:881 +#: git-submodule.sh:930 msgid "# Submodules changed but not updated:" msgstr "# Undermoduler ändrade men inte uppdaterade:" -#: git-submodule.sh:883 +#: git-submodule.sh:932 msgid "# Submodule changes to be committed:" msgstr "# Undermodulers ändringar att checka in:" -#: git-submodule.sh:1027 +#: git-submodule.sh:1080 #, sh-format -msgid "Synchronizing submodule url for '$name'" -msgstr "Synkroniserar undermodul-url för \"$name\"" +msgid "Synchronizing submodule url for '$prefix$sm_path'" +msgstr "Synkroniserar undermodul-url för \"$prefix$sm_path\"" + +#~ msgid "git remote set-head <name> (-a | -d | <branch>])" +#~ msgstr "git remote set-head <namn> (-a | -d | <gren>])" + +#~ msgid " 0 files changed" +#~ msgstr " 0 filer ändrade" + +#~ msgid " %d file changed" +#~ msgid_plural " %d files changed" +#~ msgstr[0] " %d fil ändrad" +#~ msgstr[1] " %d filer ändrade" + +#~ msgid ", %d insertion(+)" +#~ msgid_plural ", %d insertions(+)" +#~ msgstr[0] ", %d tillägg(+)" +#~ msgstr[1] ", %d tillägg(+)" + +#~ msgid ", %d deletion(-)" +#~ msgid_plural ", %d deletions(-)" +#~ msgstr[0] ", %d borttagning(-)" +#~ msgstr[1] ", %d borttagningar(-)" + +#~ msgid "Auto packing the repository for optimum performance.\n" +#~ msgstr "Packar arkivet automatiskt för optimal prestanda.\n" + +#~ msgid " (use \"git add\" to track)" +#~ msgstr " (spåra med \"git add\")" + +#~ msgid "-B cannot be used with -b" +#~ msgstr "-B kan inte användas med -b" + +#~ msgid "--patch is incompatible with all other options" +#~ msgstr "--patch är inkompatibel med alla andra flaggor" + +#~ msgid "--detach cannot be used with -b/-B/--orphan" +#~ msgstr "--detcah kan inte användas med -b/-B/--orphan" + +#~ msgid "--detach cannot be used with -t" +#~ msgstr "--detach kan inte användas med -t" + +#~ msgid "--orphan and -b|-B are mutually exclusive" +#~ msgstr "--orphan och -b|-B kan inte användas samtidigt" + +#~ msgid "--orphan cannot be used with -t" +#~ msgstr "--orphan kan inte användas med -t" + +#~ msgid "git checkout: -f and -m are incompatible" +#~ msgstr "git checkout: -f och -m är inkompatibla" + +#~ msgid "" +#~ "git checkout: updating paths is incompatible with switching branches." +#~ msgstr "" +#~ "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren." + +#~ msgid "diff setup failed" +#~ msgstr "misslyckades sätta upp för diff" + +#~ msgid "merge-recursive: disk full?" +#~ msgstr "merge-recursive: disk full?" + +#~ msgid "diff_setup_done failed" +#~ msgstr "diff_setup_done misslyckades" #~ msgid "%s: has been deleted/renamed" #~ msgstr "%s: har tagits bort/ändrat namn" @@ -6018,9 +9524,6 @@ msgstr "Synkroniserar undermodul-url för \"$name\"" #~ msgid "--" #~ msgstr "--" -#~ msgid "Too many options specified" -#~ msgstr "För många flaggor angavs" - #~ msgid "# Changed but not updated:" #~ msgstr "# Ändrade men inte uppdaterade:" @@ -6045,26 +9548,17 @@ msgstr "Synkroniserar undermodul-url för \"$name\"" #~ msgid "cannot mix --fixed-strings and regexp" #~ msgstr "kan inte blanda --fixed-strings och reguljära uttryck" -#~ msgid "invalid --decorate option: %s" -#~ msgstr "felaktigt värde till --decorate: %s" - #~ msgid "%s; will overwrite!" #~ msgstr "%s; kommer skriva över!" #~ msgid "Failed to write current notes tree to database" #~ msgstr "Kunde inte skriva aktuellt anteckningsträd till databasen" -#~ msgid "Failed to commit notes tree to database" -#~ msgstr "Kunde inte checka in anteckningsträd i databasen" - # FIXME: Untranslatable! # #~ msgid "Refusing to %s notes in %s (outside of refs/notes/)" #~ msgstr "Vägrar %s anteckningar i %s (utanför refs/notes/)" -#~ msgid "list" -#~ msgstr "list" - #~ msgid "add" #~ msgstr "add" |