diff options
Diffstat (limited to 'po/sv.po')
| -rw-r--r-- | po/sv.po | 3235 |
1 files changed, 1933 insertions, 1302 deletions
@@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2012 Peter krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2013 Peter krefting <peter@softwolves.pp.se> # This file is distributed under the same license as the Git package. -# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012. +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013. # msgid "" msgstr "" -"Project-Id-Version: git 1.8.1\n" +"Project-Id-Version: git 1.8.3\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-11-30 12:40+0800\n" -"PO-Revision-Date: 2012-11-30 10:49+0100\n" +"POT-Creation-Date: 2013-04-30 08:25+0800\n" +"PO-Revision-Date: 2013-04-30 12:22+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:40 +#: advice.c:53 #, c-format msgid "hint: %.*s\n" msgstr "tips: %.*s\n" @@ -26,7 +26,7 @@ msgstr "tips: %.*s\n" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:70 +#: advice.c:83 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -57,82 +57,206 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:322 +#: archive.c:323 msgid "fmt" msgstr "fmt" -#: archive.c:322 +#: archive.c:323 msgid "archive format" msgstr "arkivformat" -#: archive.c:323 builtin/log.c:1084 +#: archive.c:324 builtin/log.c:1126 msgid "prefix" msgstr "prefix" -#: archive.c:324 +#: archive.c:325 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 +#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371 +#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665 +#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77 +#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536 +#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 msgid "file" msgstr "fil" -#: archive.c:326 builtin/archive.c:92 +#: archive.c:327 builtin/archive.c:89 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:328 +#: archive.c:329 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:329 +#: archive.c:330 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:330 +#: archive.c:331 msgid "store only" msgstr "endast spara" -#: archive.c:331 +#: archive.c:332 msgid "compress faster" msgstr "komprimera snabbare" -#: archive.c:339 +#: archive.c:340 msgid "compress better" msgstr "komprimera bättre" -#: archive.c:342 +#: archive.c:343 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85 +#: archive.c:345 builtin/archive.c:90 builtin/clone.c:86 msgid "repo" msgstr "arkiv" -#: archive.c:345 builtin/archive.c:94 +#: archive.c:346 builtin/archive.c:91 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 +#: archive.c:347 builtin/archive.c:92 builtin/notes.c:615 msgid "command" msgstr "kommando" -#: archive.c:347 builtin/archive.c:96 +#: archive.c:348 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "sökväg till kommandot git-upload-archive på fjärren" #: attr.c:259 msgid "" -"Negative patterns are forbidden in git attributes\n" +"Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -"Negativa mönster är förbjudna i git-attribut\n" +"Negativa mönster ignoreras i git-attribut\n" "Använd '\\!' för att inleda med ett utropstecken." +#: branch.c:60 +#, c-format +msgid "Not setting branch %s as its own upstream." +msgstr "Ställer inte in grenen %s som sin egen uppströmsgren." + +#: branch.c:82 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s by rebasing." +msgstr "" +"Grenen %s ställdes in att spåra fjärrgrenen %s från %s genom ombasering." + +#: branch.c:83 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s." +msgstr "Grenen %s ställdes in att spåra fjärrgrenen %s från %s." + +#: branch.c:87 +#, c-format +msgid "Branch %s set up to track local branch %s by rebasing." +msgstr "Grenen %s ställdes in att spåra den lokala grenen %s genom ombasering." + +#: branch.c:88 +#, c-format +msgid "Branch %s set up to track local branch %s." +msgstr "Grenen %s ställdes in att spåra den lokala grenen %s." + +#: branch.c:92 +#, c-format +msgid "Branch %s set up to track remote ref %s by rebasing." +msgstr "Grenen %s ställdes in att spåra fjärreferensen %s genom ombasering." + +#: branch.c:93 +#, c-format +msgid "Branch %s set up to track remote ref %s." +msgstr "Grenen %s ställdes in att spåra fjärreferensen %s." + +#: branch.c:97 +#, c-format +msgid "Branch %s set up to track local ref %s by rebasing." +msgstr "" +"Grenen %s ställdes in att spåra den lokala referensen %s genom ombasering." + +#: branch.c:98 +#, c-format +msgid "Branch %s set up to track local ref %s." +msgstr "Grenen %s ställdes in att spåra den lokala referensen %s." + +#: branch.c:118 +#, c-format +msgid "Tracking not set up: name too long: %s" +msgstr "Spårning har inte ställts in: namnet för långt: %s" + +#: branch.c:137 +#, c-format +msgid "Not tracking: ambiguous information for ref %s" +msgstr "Spårar inte: tvetydig information för referensen %s" + +#: branch.c:182 +#, c-format +msgid "'%s' is not a valid branch name." +msgstr "\"%s\" är inte ett giltigt grennamn." + +#: branch.c:187 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "Det finns redan en gren som heter \"%s\"" + +#: branch.c:195 +msgid "Cannot force update the current branch." +msgstr "Kan inte tvinga uppdatering av aktuell gren." + +#: branch.c:201 +#, c-format +msgid "Cannot setup tracking information; starting point '%s' is not a branch." +msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren." + +#: branch.c:203 +#, c-format +msgid "the requested upstream branch '%s' does not exist" +msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte" + +#: branch.c:205 +msgid "" +"\n" +"If you are planning on basing your work on an upstream\n" +"branch that already exists at the remote, you may need to\n" +"run \"git fetch\" to retrieve it.\n" +"\n" +"If you are planning to push out a new local branch that\n" +"will track its remote counterpart, you may want to use\n" +"\"git push -u\" to set the upstream config as you push." +msgstr "" +"\n" +"Om du har tänkt basera ditt arbete på en uppströmsgren\n" +"som redan finns på fjärren kan du behöva köra \"git fetch\"\n" +"för att hämta den.\n" +"\n" +"Om du har tänkt sända in en ny lokal gren som skall\n" +"spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n" +"för att ställa in uppströmskonfigurationen när du sänder in." + +#: branch.c:250 +#, c-format +msgid "Not a valid object name: '%s'." +msgstr "Objektnamnet är inte giltigt: \"%s\"." + +#: branch.c:270 +#, c-format +msgid "Ambiguous object name: '%s'." +msgstr "Objektnamnet är tvetydigt: \"%s\"." + +#: branch.c:275 +#, c-format +msgid "Not a valid branch point: '%s'." +msgstr "Avgreningspunkten är inte giltig: \"%s\"" + +#: branch.c:281 +msgid "Failed to lock ref for update" +msgstr "Misslyckades låsa referens för uppdatering" + +#: branch.c:299 +msgid "Failed to write ref" +msgstr "Misslyckades skriva referens" + #: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -143,7 +267,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:674 +#: bundle.c:89 builtin/commit.c:676 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -152,35 +276,35 @@ msgstr "kunde inte öppna \"%s\"" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: 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 +#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300 +#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349 +#: builtin/shortlog.c:155 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" #: bundle.c:186 #, c-format -msgid "The bundle contains %d ref" -msgid_plural "The bundle contains %d refs" -msgstr[0] "Paketet (bundlen) innehåller %d referens" -msgstr[1] "Paketet (bundlen) innehåller %d referenser" +msgid "The bundle contains this ref:" +msgid_plural "The bundle contains these %d refs:" +msgstr[0] "Paketet (bundlen) denna referens:" +msgstr[1] "Paketet (bundlen) dessa %d referenser:" -#: bundle.c:192 +#: bundle.c:193 msgid "The bundle records a complete history." msgstr "Paketet (bundlen) beskriver en komplett historik." #: bundle.c:195 #, c-format -msgid "The bundle requires this ref" -msgid_plural "The bundle requires these %d refs" -msgstr[0] "Paketet (bundlen) kräver denna referens" -msgstr[1] "Paketet (bundlen) kräver dessa %d referenser" +msgid "The bundle requires this ref:" +msgid_plural "The bundle requires these %d refs:" +msgstr[0] "Paketet (bundlen) kräver denna referens:" +msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:" #: bundle.c:294 msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:300 builtin/log.c:1215 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -306,22 +430,22 @@ msgid_plural "%lu years ago" msgstr[0] "%lu år sedan" msgstr[1] "%lu år sedan" -#: diff.c:111 +#: diff.c:112 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:116 +#: diff.c:117 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:194 +#: diff.c:210 #, 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 +#: diff.c:260 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -330,7 +454,7 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:3494 +#: diff.c:3481 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -339,12 +463,12 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3508 +#: diff.c:3495 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: gpg-interface.c:59 +#: gpg-interface.c:59 gpg-interface.c:131 msgid "could not run gpg." msgstr "kunde inte köra gpg." @@ -356,17 +480,27 @@ msgstr "gpg godtog inte data" msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" -#: grep.c:1622 +#: gpg-interface.c:115 +#, c-format +msgid "could not create temporary file '%s': %s" +msgstr "kunde inte skapa temporära filen \"%s\": %s" + +#: gpg-interface.c:118 +#, c-format +msgid "failed writing detached signature to '%s': %s" +msgstr "misslyckades skriva fristående signatur till \"%s\": %s" + +#: grep.c:1623 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1639 +#: grep.c:1640 #, c-format msgid "'%s': %s" msgstr "\"%s\": %s" -#: grep.c:1650 +#: grep.c:1651 #, c-format msgid "'%s': short read %s" msgstr "\"%s\": kort läsning %s" @@ -380,7 +514,11 @@ msgstr "git-kommandon tillgängliga i \"%s\"" msgid "git commands available from elsewhere on your $PATH" msgstr "git-kommandon från andra platser i din $PATH" -#: help.c:275 +#: help.c:235 +msgid "The most commonly used git commands are:" +msgstr "De mest använda git-kommandona är:" + +#: help.c:292 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -389,11 +527,11 @@ msgstr "" "\"%s\" verkar vara ett git-kommando, men vi kan inte\n" "köra det. Kanske git-%s är trasigt?" -#: help.c:332 +#: help.c:349 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls." -#: help.c:354 +#: help.c:371 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -402,17 +540,17 @@ msgstr "" "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n" "Fortsätter under förutsättningen att du menade \"%s\"" -#: help.c:359 +#: help.c:376 #, c-format msgid "in %0.1f seconds automatically..." msgstr "automatiskt om %0.1f sekunder..." -#: help.c:366 +#: help.c:383 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"." -#: help.c:370 +#: help.c:387 msgid "" "\n" "Did you mean this?" @@ -430,8 +568,8 @@ msgstr[1] "" 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 +#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566 +#: builtin/clone.c:645 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -480,7 +618,7 @@ msgstr "kan inte läsa objektet %s: \"%s\"" msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:773 builtin/clone.c:302 +#: merge-recursive.c:773 builtin/clone.c:313 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" @@ -614,7 +752,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)" msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1633 git-submodule.sh:893 +#: merge-recursive.c:1633 git-submodule.sh:1029 msgid "submodule" msgstr "undermodul" @@ -685,43 +823,62 @@ msgstr "sammanslagningen returnerade ingen incheckning" msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2009 builtin/merge.c:643 +#: merge-recursive.c:2009 builtin/merge.c:658 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." -#: parse-options.c:494 +#: object.c:195 +#, c-format +msgid "unable to parse object: %s" +msgstr "kunde inte tolka objektet: %s" + +#: parse-options.c:489 msgid "..." msgstr "..." -#: parse-options.c:512 +#: parse-options.c:507 #, c-format msgid "usage: %s" msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:516 +#: parse-options.c:511 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:519 +#: parse-options.c:514 #, c-format msgid " %s" msgstr " %s" -#: remote.c:1632 +#: parse-options.c:548 +msgid "-NUM" +msgstr "-TAL" + +#: pathspec.c:83 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\"" + +#: pathspec.c:99 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "\"%s\" är på andra sidan av en symbolisk länk" + +#: remote.c:1781 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n" msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n" -#: remote.c:1637 +#: remote.c:1787 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 +#: remote.c:1790 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -731,11 +888,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:1647 +#: remote.c:1798 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 +#: remote.c:1801 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -750,23 +907,23 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:1659 +#: remote.c:1811 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 +#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999 +#: builtin/merge.c:1009 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986 -#: builtin/merge.c:999 +#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779 +#: builtin/merge.c:1001 builtin/merge.c:1014 #, c-format msgid "Could not write to '%s'" msgstr "Kunde inte skriva till \"%s\"" -#: sequencer.c:146 +#: sequencer.c:229 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -774,7 +931,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:149 +#: sequencer.c:232 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -784,232 +941,238 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:162 sequencer.c:770 sequencer.c:853 +#: sequencer.c:245 sequencer.c:859 sequencer.c:942 #, c-format msgid "Could not write to %s" msgstr "Kunde inte skriva till %s" -#: sequencer.c:165 +#: sequencer.c:248 #, c-format msgid "Error wrapping up %s" msgstr "Fel vid ombrytning av %s" -#: sequencer.c:180 +#: sequencer.c:263 msgid "Your local changes would be overwritten by cherry-pick." msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"." -#: sequencer.c:182 +#: sequencer.c:265 msgid "Your local changes would be overwritten by revert." msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"." -#: sequencer.c:185 +#: sequencer.c:268 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:235 +#: sequencer.c:319 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:266 +#: sequencer.c:350 msgid "Could not resolve HEAD commit\n" msgstr "Kunde inte bestämma HEAD:s incheckning\n" -#: sequencer.c:287 +#: sequencer.c:371 msgid "Unable to update cache tree\n" msgstr "Kan inte uppdatera cacheträd\n" -#: sequencer.c:332 +#: sequencer.c:416 #, c-format msgid "Could not parse commit %s\n" msgstr "Kunde inte tolka incheckningen %s\n" -#: sequencer.c:337 +#: sequencer.c:421 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:403 +#: sequencer.c:487 msgid "Your index file is unmerged." msgstr "Din indexfil har inte slagits ihop." -#: sequencer.c:406 -msgid "You do not have a valid HEAD" -msgstr "Du har ingen giltig HEAD" - -#: sequencer.c:421 +#: sequencer.c:506 #, 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:429 +#: sequencer.c:514 #, c-format msgid "Commit %s does not have parent %d" msgstr "Incheckning %s har inte förälder %d" -#: sequencer.c:433 +#: sequencer.c:518 #, 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:444 +#: sequencer.c:531 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:448 +#: sequencer.c:535 #, c-format msgid "Cannot get commit message for %s" msgstr "Kan inte hämta incheckningsmeddelande för %s" -#: sequencer.c:532 +#: sequencer.c:621 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:533 +#: sequencer.c:622 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:565 +#: sequencer.c:654 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:573 +#: sequencer.c:662 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:578 +#: sequencer.c:667 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:636 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "kan inte %s under en %s" -#: sequencer.c:658 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "Kan inte tolka rad %d." -#: sequencer.c:663 +#: sequencer.c:752 msgid "No commits parsed." msgstr "Inga incheckningar lästes." -#: sequencer.c:676 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "Kunde inte öppna %s" -#: sequencer.c:680 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "kunde inte läsa %s." -#: sequencer.c:687 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Oanvändbart manus: %s" -#: sequencer.c:715 +#: sequencer.c:804 #, c-format msgid "Invalid key: %s" msgstr "Felaktig nyckel: %s" -#: sequencer.c:718 +#: sequencer.c:807 #, c-format msgid "Invalid value for %s: %s" msgstr "Felaktigt värde för %s: %s" -#: sequencer.c:730 +#: sequencer.c:819 #, c-format msgid "Malformed options sheet: %s" msgstr "Trasigt manus: %s" -#: sequencer.c:751 +#: sequencer.c:840 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:752 +#: sequencer.c:841 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:756 +#: sequencer.c:845 #, c-format msgid "Could not create sequencer directory %s" msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:772 sequencer.c:857 +#: sequencer.c:861 sequencer.c:946 #, c-format msgid "Error wrapping up %s." msgstr "Fel vid ombrytning av %s." -#: sequencer.c:791 sequencer.c:925 +#: sequencer.c:880 sequencer.c:1014 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:793 +#: sequencer.c:882 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:795 +#: sequencer.c:884 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:817 builtin/apply.c:4005 +#: sequencer.c:906 builtin/apply.c:4060 #, c-format msgid "cannot open %s: %s" msgstr "kan inte öppna %s: %s" -#: sequencer.c:820 +#: sequencer.c:909 #, c-format msgid "cannot read %s: %s" msgstr "kan inte läsa %s: %s" -#: sequencer.c:821 +#: sequencer.c:910 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:827 +#: sequencer.c:916 #, 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:850 +#: sequencer.c:939 #, c-format msgid "Could not format %s." msgstr "Kunde inte formatera %s." -#: sequencer.c:1012 +#: sequencer.c:1083 +#, c-format +msgid "%s: can't cherry-pick a %s" +msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" + +#: sequencer.c:1085 +#, c-format +msgid "%s: bad revision" +msgstr "%s: felaktig revision" + +#: sequencer.c:1119 msgid "Can't revert as initial commit" msgstr "Kan inte ångra som första incheckning" -#: sequencer.c:1013 +#: sequencer.c:1120 msgid "Can't cherry-pick into empty head" msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" -#: sha1_name.c:1044 +#: sha1_name.c:1036 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: sha1_name.c:1047 +#: sha1_name.c:1039 #, c-format msgid "No such branch: '%s'" msgstr "Okänd gren: \"%s\"" -#: sha1_name.c:1049 +#: sha1_name.c:1041 #, c-format msgid "No upstream configured for branch '%s'" msgstr "Ingen standarduppström angiven för grenen \"%s\"" -#: sha1_name.c:1052 +#: sha1_name.c:1044 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "Uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren" @@ -1019,12 +1182,17 @@ msgstr "Uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren" msgid "unable to access '%s': %s" msgstr "kan inte komma åt \"%s\": %s" -#: wrapper.c:426 +#: wrapper.c:423 +#, c-format +msgid "unable to access '%s'" +msgstr "kan inte komma åt \"%s\"" + +#: wrapper.c:434 #, 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:427 +#: wrapper.c:435 msgid "no such user" msgstr "okänd användare" @@ -1133,193 +1301,254 @@ msgstr "ändrat innehåll, " msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:303 +#: wt-status.c:306 #, c-format msgid "new file: %s" msgstr "ny fil: %s" -#: wt-status.c:306 +#: wt-status.c:309 #, c-format msgid "copied: %s -> %s" msgstr "kopierad: %s -> %s" -#: wt-status.c:309 +#: wt-status.c:312 #, c-format msgid "deleted: %s" msgstr "borttagen: %s" -#: wt-status.c:312 +#: wt-status.c:315 #, c-format msgid "modified: %s" msgstr "ändrad: %s" -#: wt-status.c:315 +#: wt-status.c:318 #, c-format msgid "renamed: %s -> %s" msgstr "namnbyte: %s -> %s" -#: wt-status.c:318 +#: wt-status.c:321 #, c-format msgid "typechange: %s" msgstr "typbyte: %s" -#: wt-status.c:321 +#: wt-status.c:324 #, c-format msgid "unknown: %s" msgstr "okänd: %s" -#: wt-status.c:324 +#: wt-status.c:327 #, c-format msgid "unmerged: %s" msgstr "osammansl.: %s" -#: wt-status.c:327 +#: wt-status.c:330 #, c-format msgid "bug: unhandled diff status %c" msgstr "programfel: diff-status %c ej hanterad" -#: wt-status.c:785 +#: wt-status.c:803 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:788 wt-status.c:912 +#: wt-status.c:806 wt-status.c:958 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:791 +#: wt-status.c:809 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." -#: wt-status.c:794 +#: wt-status.c:812 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:804 +#: wt-status.c:822 msgid "You are in the middle of an am session." msgstr "Du är i mitten av en körning av \"git am\"." -#: wt-status.c:807 +#: wt-status.c:825 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:811 +#: wt-status.c:829 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr " (rätta konflikter och kör sedan \"git am --resolved\")" -#: wt-status.c:813 +#: wt-status.c:831 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:815 +#: wt-status.c:833 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" -#: wt-status.c:873 wt-status.c:883 +#: wt-status.c:893 wt-status.c:910 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." + +#: wt-status.c:898 wt-status.c:915 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:876 +#: wt-status.c:901 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:878 +#: wt-status.c:903 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:880 +#: wt-status.c:905 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:886 +#: wt-status.c:918 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:888 +#: wt-status.c:922 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " +"ovanpå \"%s\"." + +#: wt-status.c:927 msgid "You are currently splitting a commit during a rebase." msgstr "Du håller på att dela upp en incheckning i en ombasering." -#: wt-status.c:891 +#: wt-status.c:930 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:893 +#: wt-status.c:934 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " +"ovanpå \"%s\"." + +#: wt-status.c:939 msgid "You are currently editing a commit during a rebase." msgstr "Du håller på att redigera en incheckning under en ombasering." -#: wt-status.c:896 +#: wt-status.c:942 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: wt-status.c:898 +#: wt-status.c:944 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:908 +#: wt-status.c:954 msgid "You are currently cherry-picking." msgstr "Du håller på med en \"cherry-pick\"." -#: wt-status.c:915 +#: wt-status.c:961 msgid " (all conflicts fixed: run \"git commit\")" msgstr " (alla konflikter har rättats: kör \"git commit\")" -#: wt-status.c:924 +#: wt-status.c:970 +#, c-format +msgid "You are currently reverting commit %s." +msgstr "Du håller på med att ångra incheckningen %s." + +#: wt-status.c:975 +msgid " (fix conflicts and run \"git revert --continue\")" +msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" + +#: wt-status.c:978 +msgid " (all conflicts fixed: run \"git revert --continue\")" +msgstr " (alla konflikter rättade: kör \"git revert --continue\")" + +#: wt-status.c:980 +msgid " (use \"git revert --abort\" to cancel the revert operation)" +msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" + +#: wt-status.c:991 +#, c-format +msgid "You are currently bisecting, started from branch '%s'." +msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"." + +#: wt-status.c:995 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:927 +#: wt-status.c:998 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)" -#: wt-status.c:978 +#: wt-status.c:1173 msgid "On branch " msgstr "På grenen " -#: wt-status.c:985 +#: wt-status.c:1184 +msgid "HEAD detached at " +msgstr "HEAD frånkopplad vid " + +#: wt-status.c:1186 +msgid "HEAD detached from " +msgstr "HEAD frånkopplad från " + +#: wt-status.c:1189 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:997 +#: wt-status.c:1206 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1011 +#: wt-status.c:1220 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1013 +#: wt-status.c:1222 msgid "Ignored files" msgstr "Ignorerade filer" +#: wt-status.c:1226 +#, c-format +msgid "" +"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" +"may speed it up, but you have to be careful not to forget to add\n" +"new files yourself (see 'git help status')." +msgstr "" +"Det tog %.2f sekunder att räkna upp ospårade filer. \"status -uno\"\n" +"kan gå snabbare, men du måste vara försiktig så du inte glömmer\n" +"lägga till nya filer själv (se \"git help status\")." + # %s är nästa sträng eller tom. -#: wt-status.c:1015 +#: wt-status.c:1232 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1017 +#: wt-status.c:1234 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1023 +#: wt-status.c:1240 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1028 +#: wt-status.c:1245 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1031 +#: wt-status.c:1248 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1034 +#: wt-status.c:1251 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1328,213 +1557,280 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1037 +#: wt-status.c:1254 #, 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:1040 +#: wt-status.c:1257 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" -#: wt-status.c:1043 wt-status.c:1048 +#: wt-status.c:1260 wt-status.c:1265 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1046 +#: wt-status.c:1263 #, 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:1050 +#: wt-status.c:1267 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1158 +#: wt-status.c:1375 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1164 +#: wt-status.c:1381 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1179 +#: wt-status.c:1396 msgid "behind " msgstr "efter " -#: wt-status.c:1182 wt-status.c:1185 +#: wt-status.c:1399 wt-status.c:1402 msgid "ahead " msgstr "före " -#: wt-status.c:1187 +#: wt-status.c:1404 msgid ", behind " msgstr ", efter " -#: compat/precompose_utf8.c:58 builtin/clone.c:341 +#: compat/precompose_utf8.c:58 builtin/clone.c:352 #, 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:20 +msgid "git add [options] [--] <pathspec>..." +msgstr "git add [flaggor] [--] <sökväg>..." -#: builtin/add.c:62 +#. +#. * To be consistent with "git add -p" and most Git +#. * commands, we should default to being tree-wide, but +#. * this is not the original behavior and can't be +#. * changed until users trained themselves not to type +#. * "git add -u" or "git add -A". For now, we warn and +#. * keep the old behavior. Later, the behavior can be changed +#. * to tree-wide, keeping the warning for a while, and +#. * eventually we can drop the warning. +#. +#: builtin/add.c:58 +#, c-format +msgid "" +"The behavior of 'git add %s (or %s)' with no path argument from a\n" +"subdirectory of the tree will change in Git 2.0 and should not be used " +"anymore.\n" +"To add content for the whole tree, run:\n" +"\n" +" git add %s :/\n" +" (or git add %s :/)\n" +"\n" +"To restrict the command to the current directory, run:\n" +"\n" +" git add %s .\n" +" (or git add %s .)\n" +"\n" +"With the current Git version, the command is restricted to the current " +"directory.\n" +msgstr "" +"Beteendet för \"git add %s (eller %s)\" utan sökvägsargument från en\n" +"underkatalog i ett träd kommer ändras i Git 2.0 och bör inte längre " +"användas.\n" +"För att lägga till innehållet för hela trädet, använd:\n" +"\n" +" git add %s :/\n" +" (eller git add %s :/)\n" +"\n" +"För att begränsa kommandot till aktuell katalog, använd:\n" +"\n" +" git add %s .\n" +" (eller git add %s .)\n" +"\n" +"I nuvarande version av Git begränsas kommandot till aktuell katalog.\n" + +#: builtin/add.c:100 +#, c-format +msgid "" +"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" +"whose behaviour will change in Git 2.0 with respect to paths you removed.\n" +"Paths like '%s' that are\n" +"removed from your working tree are ignored with this version of Git.\n" +"\n" +"* 'git add --ignore-removal <pathspec>', which is the current default,\n" +" ignores paths you removed from your working tree.\n" +"\n" +"* 'git add --all <pathspec>' will let you also record the removals.\n" +"\n" +"Run 'git status' to check the paths you removed from your working tree.\n" +msgstr "" +"Du körde \"git add\" utan varken \"-A (--all)\" eller \"--ignore-removal\".\n" +"Beteendet kommer ändras i Git 2.0 vad gäller sökvägar du tagit bort.\n" +"Sökvägar som \"%s\", som har\n" +"tagits bort från din arbetskatalog ignoreras i den här versionen av Git.\n" +"\n" +"* \"git add --ignore-removal <sökväg>\", som är förvalet just nu,\n" +" ignorerar sökvägar du har tagit bort från arbetskatalogen.\n" +"\n" +"* \"git add --all <sökväg>\" låter dig även registrera borttagningarna.\n" +"\n" +"Kör \"git status\" för att kontrollera sökvägarna du tagit bort från\n" +"arbetskatalogen.\n" + +#: builtin/add.c:144 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:67 builtin/commit.c:231 +#: builtin/add.c:149 builtin/commit.c:233 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:77 +#: builtin/add.c:163 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:176 -#, c-format -msgid "Path '%s' is in submodule '%.*s'" -msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\"" - -#: builtin/add.c:192 +#: builtin/add.c:253 msgid "Unstaged changes after refreshing the index:" msgstr "Ospårade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275 +#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: builtin/add.c:209 -#, c-format -msgid "'%s' is beyond a symbolic link" -msgstr "\"%s\" är på andra sidan av en symbolisk länk" - -#: builtin/add.c:276 +#: builtin/add.c:339 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:286 +#: builtin/add.c:349 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning" -#: builtin/add.c:290 +#: builtin/add.c:353 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:295 +#: builtin/add.c:358 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:297 +#: builtin/add.c:360 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:303 +#: builtin/add.c:366 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:313 +#: builtin/add.c:376 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: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/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:425 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 +#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19 +#: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613 +#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112 msgid "be verbose" msgstr "var pratsam" -#: builtin/add.c:322 +#: builtin/add.c:396 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:248 +#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:324 +#: builtin/add.c:398 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:325 +#: builtin/add.c:399 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:326 +#: builtin/add.c:400 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:327 +#: builtin/add.c:401 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 +#: builtin/add.c:402 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 +#. takes no arguments +#: builtin/add.c:405 +msgid "ignore paths removed in the working tree (same as --no-all)" +msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)" + +#: builtin/add.c:407 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:330 +#: builtin/add.c:408 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 +#: builtin/add.c:409 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 +#: builtin/add.c:431 #, 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:354 +#: builtin/add.c:432 msgid "no files added" msgstr "inga filer har lagts till" -#: builtin/add.c:360 +#: builtin/add.c:438 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:392 +#: builtin/add.c:477 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:394 +#: builtin/add.c:495 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:414 +#: builtin/add.c:525 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:415 +#: builtin/add.c:526 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:291 builtin/mv.c:82 -#: builtin/rm.c:235 +#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204 +#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:370 +#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" @@ -1587,17 +1883,17 @@ msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" 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:1420 +#: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: builtin/apply.c:1477 +#: builtin/apply.c:1479 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: builtin/apply.c:1494 +#: builtin/apply.c:1496 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1613,82 +1909,78 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: builtin/apply.c:1654 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: builtin/apply.c:1656 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: builtin/apply.c:1682 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: builtin/apply.c:1718 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: builtin/apply.c:1720 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: builtin/apply.c:1723 +#: builtin/apply.c:1725 #, 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:1869 +#: builtin/apply.c:1871 #, 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:1898 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: builtin/apply.c:1984 +#: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: builtin/apply.c:2074 +#: builtin/apply.c:2076 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/apply.c:2078 +#: builtin/apply.c:2080 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: builtin/apply.c:2149 -msgid "oops" -msgstr "hoppsan" - -#: builtin/apply.c:2671 +#: builtin/apply.c:2688 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: builtin/apply.c:2789 +#: builtin/apply.c:2806 #, 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:2801 +#: builtin/apply.c:2818 #, 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:2807 +#: builtin/apply.c:2824 #, c-format msgid "" "while searching for:\n" @@ -1697,318 +1989,318 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: builtin/apply.c:2826 +#: builtin/apply.c:2843 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: builtin/apply.c:2929 +#: builtin/apply.c:2946 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: builtin/apply.c:2935 +#: builtin/apply.c:2952 #, 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:2956 +#: builtin/apply.c:2973 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: builtin/apply.c:3078 +#: builtin/apply.c:3095 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176 +#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193 #, c-format msgid "read of %s failed" msgstr "misslyckades läsa %s" -#: builtin/apply.c:3156 builtin/apply.c:3378 +#: builtin/apply.c:3173 builtin/apply.c:3395 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: builtin/apply.c:3237 builtin/apply.c:3392 +#: builtin/apply.c:3254 builtin/apply.c:3409 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406 +#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3246 builtin/apply.c:3400 +#: builtin/apply.c:3263 builtin/apply.c:3417 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: builtin/apply.c:3348 +#: builtin/apply.c:3365 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: builtin/apply.c:3417 +#: builtin/apply.c:3434 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: builtin/apply.c:3419 +#: builtin/apply.c:3436 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: builtin/apply.c:3520 +#: builtin/apply.c:3537 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: builtin/apply.c:3523 +#: builtin/apply.c:3540 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: builtin/apply.c:3543 +#: builtin/apply.c:3560 #, 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:3548 +#: builtin/apply.c:3565 #, 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:3556 +#: builtin/apply.c:3573 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: builtin/apply.c:3569 +#: builtin/apply.c:3586 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158 +#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: builtin/apply.c:3767 +#: builtin/apply.c:3822 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: builtin/apply.c:3795 +#: builtin/apply.c:3850 #, c-format msgid "corrupt patch for subproject %s" msgstr "trasig patch för underprojektet %s" -#: builtin/apply.c:3799 +#: builtin/apply.c:3854 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: builtin/apply.c:3804 +#: builtin/apply.c:3859 #, 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:3807 builtin/apply.c:3915 +#: builtin/apply.c:3862 builtin/apply.c:3970 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: builtin/apply.c:3840 +#: builtin/apply.c:3895 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: builtin/apply.c:3889 +#: builtin/apply.c:3944 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: builtin/apply.c:3976 +#: builtin/apply.c:4031 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: builtin/apply.c:3984 +#: builtin/apply.c:4039 msgid "internal error" msgstr "internt fel" #. Say this even without --verbose -#: builtin/apply.c:3987 +#: builtin/apply.c:4042 #, 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:3997 +#: builtin/apply.c:4052 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: builtin/apply.c:4018 +#: builtin/apply.c:4073 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: builtin/apply.c:4021 +#: builtin/apply.c:4076 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: builtin/apply.c:4171 +#: builtin/apply.c:4226 msgid "unrecognized input" msgstr "indata känns inte igen" -#: builtin/apply.c:4182 +#: builtin/apply.c:4237 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91 +#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92 #: builtin/fetch.c:63 msgid "path" msgstr "sökväg" -#: builtin/apply.c:4302 +#: builtin/apply.c:4357 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: builtin/apply.c:4305 +#: builtin/apply.c:4360 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: builtin/apply.c:4307 +#: builtin/apply.c:4362 msgid "num" msgstr "antal" -#: builtin/apply.c:4308 +#: builtin/apply.c:4363 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:4311 +#: builtin/apply.c:4366 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: builtin/apply.c:4313 +#: builtin/apply.c:4368 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:4317 +#: builtin/apply.c:4372 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: builtin/apply.c:4319 +#: builtin/apply.c:4374 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:4321 +#: builtin/apply.c:4376 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:4323 +#: builtin/apply.c:4378 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:4325 +#: builtin/apply.c:4380 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: builtin/apply.c:4327 +#: builtin/apply.c:4382 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: builtin/apply.c:4329 +#: builtin/apply.c:4384 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:4331 +#: builtin/apply.c:4386 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460 +#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: builtin/apply.c:4336 +#: builtin/apply.c:4391 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: builtin/apply.c:4337 +#: builtin/apply.c:4392 msgid "action" msgstr "åtgärd" -#: builtin/apply.c:4338 +#: builtin/apply.c:4393 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: builtin/apply.c:4341 builtin/apply.c:4344 +#: builtin/apply.c:4396 builtin/apply.c:4399 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: builtin/apply.c:4347 +#: builtin/apply.c:4402 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: builtin/apply.c:4349 +#: builtin/apply.c:4404 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: builtin/apply.c:4351 +#: builtin/apply.c:4406 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: builtin/apply.c:4353 +#: builtin/apply.c:4408 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: builtin/apply.c:4356 +#: builtin/apply.c:4411 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: builtin/apply.c:4359 +#: builtin/apply.c:4414 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: builtin/apply.c:4361 +#: builtin/apply.c:4416 msgid "root" msgstr "rot" -#: builtin/apply.c:4362 +#: builtin/apply.c:4417 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: builtin/apply.c:4384 +#: builtin/apply.c:4439 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: builtin/apply.c:4392 +#: builtin/apply.c:4447 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: builtin/apply.c:4395 +#: builtin/apply.c:4450 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: builtin/apply.c:4411 +#: builtin/apply.c:4466 #, c-format msgid "can't open patch '%s'" msgstr "kan inte öppna patchen \"%s\"" -#: builtin/apply.c:4425 +#: builtin/apply.c:4480 #, 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:4431 builtin/apply.c:4441 +#: builtin/apply.c:4486 builtin/apply.c:4496 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2032,21 +2324,21 @@ msgstr "git archive: Fjärr utan URL" msgid "git archive: expected ACK/NAK, got EOF" msgstr "git archive: förväntade ACK/NAK, fick EOF" -#: builtin/archive.c:63 +#: builtin/archive.c:61 #, c-format msgid "git archive: NACK %s" msgstr "git archive: NACK %s" -#: builtin/archive.c:65 +#: builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "fjärrfel: %s" -#: builtin/archive.c:66 +#: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "git archive: protokollfel" -#: builtin/archive.c:71 +#: builtin/archive.c:68 msgid "git archive: expected a flush" msgstr "git archive: förväntade en tömning (flush)" @@ -2066,119 +2358,119 @@ msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning" msgid "git blame [options] [rev-opts] [rev] [--] file" msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil" -#: builtin/blame.c:30 builtin/shortlog.c:15 +#: builtin/blame.c:30 msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)" -#: builtin/blame.c:2374 +#: builtin/blame.c:2355 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:2375 +#: builtin/blame.c:2356 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 +#: builtin/blame.c:2357 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:2377 +#: builtin/blame.c:2358 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:2378 +#: builtin/blame.c:2359 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:2379 +#: builtin/blame.c:2360 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:2380 +#: builtin/blame.c:2361 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:2381 +#: builtin/blame.c:2362 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:2382 +#: builtin/blame.c:2363 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:2383 +#: builtin/blame.c:2364 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 +#: builtin/blame.c:2365 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:2385 +#: builtin/blame.c:2366 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:2386 +#: builtin/blame.c:2367 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:2387 +#: builtin/blame.c:2368 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 +#: builtin/blame.c:2369 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:2389 +#: builtin/blame.c:2370 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:2390 +#: builtin/blame.c:2371 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 +#: builtin/blame.c:2372 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 +#: builtin/blame.c:2373 builtin/blame.c:2374 msgid "score" msgstr "poäng" -#: builtin/blame.c:2392 +#: builtin/blame.c:2373 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:2393 +#: builtin/blame.c:2374 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:2394 +#: builtin/blame.c:2375 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2394 +#: builtin/blame.c:2375 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 +#: builtin/branch.c:24 msgid "git branch [options] [-r | -a] [--merged | --no-merged]" msgstr "git branch [flaggor] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:24 +#: builtin/branch.c:25 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" msgstr "git branch [flaggor] [-l] [-f] <grennamn> [<startpunkt>]" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [options] [-r] (-d | -D) <branchname>..." msgstr "git branch [flaggor] [-r] (-d | -D) <grennamn>..." -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" msgstr "git branch [flaggor] (-m | -M) [<gammal_gren>] <ny_gren>" -#: builtin/branch.c:145 +#: builtin/branch.c:150 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -2187,7 +2479,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:149 +#: builtin/branch.c:154 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2196,12 +2488,12 @@ msgstr "" "tar inte bort grenen \"%s\" som inte har slagits ihop med\n" " \"%s\", trots att den har slagits ihop med HEAD." -#: builtin/branch.c:163 +#: builtin/branch.c:168 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" -#: builtin/branch.c:167 +#: builtin/branch.c:172 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -2210,253 +2502,332 @@ 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 +#: builtin/branch.c:185 msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" -#: builtin/branch.c:208 +#: builtin/branch.c:213 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:214 +#: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:222 +#: builtin/branch.c:227 #, 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:235 +#: builtin/branch.c:240 #, c-format msgid "remote branch '%s' not found." msgstr "fjärrgrenen \"%s\" hittades inte." -#: builtin/branch.c:236 +#: builtin/branch.c:241 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:250 +#: builtin/branch.c:255 #, c-format msgid "Error deleting remote branch '%s'" msgstr "Fel vid borttagning av fjärrgrenen \"%s\"" -#: builtin/branch.c:251 +#: builtin/branch.c:256 #, c-format msgid "Error deleting branch '%s'" msgstr "Fel vid borttagning av grenen \"%s\"" -#: builtin/branch.c:258 +#: builtin/branch.c:263 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "Tog bort fjärrgrenen %s (var %s).\n" -#: builtin/branch.c:259 +#: builtin/branch.c:264 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:361 +#: builtin/branch.c:366 #, c-format msgid "branch '%s' does not point at a commit" msgstr "grenen \"%s\" pekar inte på en incheckning" -#: builtin/branch.c:433 +#: builtin/branch.c:453 #, c-format msgid "[%s: behind %d]" msgstr "[%s: bakom %d] " -#: builtin/branch.c:435 +#: builtin/branch.c:455 #, c-format msgid "[behind %d]" msgstr "[bakom %d] " -#: builtin/branch.c:439 +#: builtin/branch.c:459 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: före %d] " -#: builtin/branch.c:441 +#: builtin/branch.c:461 #, c-format msgid "[ahead %d]" msgstr "[före %d] " -#: builtin/branch.c:444 +#: builtin/branch.c:464 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: före %d, bakom %d] " -#: builtin/branch.c:447 +#: builtin/branch.c:467 #, c-format msgid "[ahead %d, behind %d]" msgstr "[före %d, bakom %d] " -#: builtin/branch.c:560 +#: builtin/branch.c:490 +msgid " **** invalid ref ****" +msgstr " **** ogiltig ref ****" + +#: builtin/branch.c:582 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "(ingen gren, ombaserar %s)" + +#: builtin/branch.c:585 +#, c-format +msgid "(no branch, bisect started on %s)" +msgstr "(ingen gren, \"bisect\" startad på %s)" + +#: builtin/branch.c:588 +#, c-format +msgid "(detached from %s)" +msgstr "(frånkopplad från %s)" + +#: builtin/branch.c:591 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:625 +#: builtin/branch.c:637 +#, c-format +msgid "object '%s' does not point to a commit" +msgstr "objektet \"%s\" pekar på en incheckning" + +#: builtin/branch.c:669 msgid "some refs could not be read" msgstr "vissa referenser kunde inte läsas" -#: builtin/branch.c:638 +#: builtin/branch.c:682 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:648 +#: builtin/branch.c:692 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:663 +#: builtin/branch.c:707 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:667 +#: builtin/branch.c:711 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:671 +#: builtin/branch.c:715 #, 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:678 +#: builtin/branch.c:722 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:693 +#: builtin/branch.c:737 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: builtin/branch.c:717 +#: builtin/branch.c:761 #, c-format msgid "could not write branch description template: %s" msgstr "kunde inte skriva grenbeskrivningsmall: %s" -#: builtin/branch.c:747 +#: builtin/branch.c:791 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:749 +#: builtin/branch.c:793 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 +#: builtin/branch.c:794 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:751 +#: builtin/branch.c:795 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:753 +#: builtin/branch.c:797 msgid "change upstream info" msgstr "ändra uppströmsinformation" -#: builtin/branch.c:757 +#: builtin/branch.c:801 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:758 +#: builtin/branch.c:802 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 +#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832 +#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369 +#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468 msgid "commit" msgstr "incheckning" -#: builtin/branch.c:762 builtin/branch.c:768 +#: builtin/branch.c:806 builtin/branch.c:812 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:774 +#: builtin/branch.c:818 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:775 +#: builtin/branch.c:819 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:777 +#: builtin/branch.c:821 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:778 +#: builtin/branch.c:822 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:779 +#: builtin/branch.c:823 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:780 +#: builtin/branch.c:824 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:781 +#: builtin/branch.c:825 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:782 +#: builtin/branch.c:826 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:784 +#: builtin/branch.c:828 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:785 +#: builtin/branch.c:829 msgid "force creation (when already exists)" msgstr "tvinga skapande (när den redan finns)" -#: builtin/branch.c:788 +#: builtin/branch.c:832 msgid "print only not merged branches" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:794 +#: builtin/branch.c:838 msgid "print only merged branches" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:798 +#: builtin/branch.c:842 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:811 +#: builtin/branch.c:855 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:816 builtin/clone.c:561 +#: builtin/branch.c:860 builtin/clone.c:619 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:836 +#: builtin/branch.c:883 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:887 +#: builtin/branch.c:889 builtin/branch.c:928 +msgid "branch name required" +msgstr "grennamn krävs" + +#: builtin/branch.c:904 +msgid "Cannot give description to detached HEAD" +msgstr "Kan inte beskriva frånkopplad HEAD" + +#: builtin/branch.c:909 +msgid "cannot edit description of more than one branch" +msgstr "kan inte redigera beskrivning för mer än en gren" + +#: builtin/branch.c:916 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Inga incheckningar på grenen \"%s\" ännu" + +#: builtin/branch.c:919 +#, c-format +msgid "No branch named '%s'." +msgstr "Ingen gren vid namnet \"%s\"." + +#: builtin/branch.c:934 +msgid "too many branches for a rename operation" +msgstr "för många grenar för namnbyte" + +#: builtin/branch.c:939 +msgid "too many branches to set new upstream" +msgstr "för många grenar för att byta uppström" + +#: builtin/branch.c:943 +#, c-format +msgid "" +"could not set upstream of HEAD to %s when it does not point to any branch." +msgstr "" +"kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren." + +#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990 +#, c-format +msgid "no such branch '%s'" +msgstr "okänd gren \"%s\"" + +#: builtin/branch.c:950 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:899 +#: builtin/branch.c:962 +msgid "too many branches to unset upstream" +msgstr "för många grenar för att ta bort uppström" + +#: builtin/branch.c:966 +msgid "could not unset upstream of HEAD when it does not point to any branch." +msgstr "" +"kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren." + +#: builtin/branch.c:972 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:914 +#: builtin/branch.c:987 +msgid "it does not make sense to create 'HEAD' manually" +msgstr "kan inte skapa \"HEAD\" manuellt" + +#: builtin/branch.c:993 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 +#: builtin/branch.c:996 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -2465,7 +2836,7 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to\n" -#: builtin/branch.c:934 +#: builtin/branch.c:1013 #, c-format msgid "" "\n" @@ -2476,12 +2847,12 @@ msgstr "" "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" "\n" -#: builtin/branch.c:935 +#: builtin/branch.c:1014 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:936 +#: builtin/branch.c:1015 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -2499,43 +2870,43 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/cat-file.c:247 +#: builtin/cat-file.c:176 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 +#: builtin/cat-file.c:177 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <objektlista>" -#: builtin/cat-file.c:266 +#: builtin/cat-file.c:195 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 +#: builtin/cat-file.c:196 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:268 +#: builtin/cat-file.c:197 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:270 +#: builtin/cat-file.c:199 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 +#: builtin/cat-file.c:200 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:273 +#: builtin/cat-file.c:202 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 +#: builtin/cat-file.c:204 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 +#: builtin/cat-file.c:207 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" @@ -2555,14 +2926,38 @@ msgstr "visa alla attribut som satts på filen" msgid "use .gitattributes only from the index" msgstr "använd .gitattributes endast från indexet" -#: builtin/check-attr.c:21 builtin/hash-object.c:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 msgid "read file names from stdin" msgstr "läs filnamn från standard in" -#: builtin/check-attr.c:23 +#: builtin/check-attr.c:23 builtin/check-ignore.c:24 msgid "input paths are terminated by a null character" msgstr "sökvägar avdelas med null-tecken" +#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "undertryck förloppsrapportering" + +#: builtin/check-ignore.c:146 +msgid "cannot specify pathnames with --stdin" +msgstr "kan inte ange sökvägsnamn med --stdin" + +#: builtin/check-ignore.c:149 +msgid "-z only makes sense with --stdin" +msgstr "-z kan endast användas tillsammans med --stdin" + +#: builtin/check-ignore.c:151 +msgid "no path specified" +msgstr "ingen sökväg angavs" + +#: builtin/check-ignore.c:155 +msgid "--quiet is only valid with a single pathname" +msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn" + +#: builtin/check-ignore.c:157 +msgid "cannot have both --quiet and --verbose" +msgstr "kan inte använda både --quiet och --verbose" + #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [<file>...]" msgstr "git checkout-index [flaggor] [--] [<fil>...]" @@ -2615,106 +3010,106 @@ msgstr "git checkout [flaggor] <gren>" msgid "git checkout [options] [<branch>] -- <file>..." msgstr "git checkout [flaggor] [<gren>] -- <fil>..." -#: builtin/checkout.c:116 builtin/checkout.c:149 +#: builtin/checkout.c:117 builtin/checkout.c:150 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:118 builtin/checkout.c:151 +#: builtin/checkout.c:119 builtin/checkout.c:152 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:134 +#: builtin/checkout.c:135 #, 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:178 +#: builtin/checkout.c:179 #, 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:195 +#: builtin/checkout.c:196 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:212 +#: builtin/checkout.c:213 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242 -#: builtin/checkout.c:245 +#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243 +#: builtin/checkout.c:246 #, 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 +#: builtin/checkout.c:249 builtin/checkout.c:252 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:254 +#: builtin/checkout.c:255 #, 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 +#: builtin/checkout.c:266 builtin/checkout.c:458 msgid "corrupt index file" msgstr "indexfilen är trasig" -#: builtin/checkout.c:295 builtin/checkout.c:302 +#: builtin/checkout.c:329 builtin/checkout.c:336 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:448 +#: builtin/checkout.c:480 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:569 +#: builtin/checkout.c:601 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Kan inte skapa referenslog för \"%s\"\n" -#: builtin/checkout.c:602 +#: builtin/checkout.c:634 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:609 +#: builtin/checkout.c:641 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:612 +#: builtin/checkout.c:644 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:616 +#: builtin/checkout.c:648 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:618 builtin/checkout.c:955 +#: builtin/checkout.c:650 builtin/checkout.c:987 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:620 +#: builtin/checkout.c:652 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:676 +#: builtin/checkout.c:708 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" #. The singular version -#: builtin/checkout.c:682 +#: builtin/checkout.c:714 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -2737,7 +3132,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:700 +#: builtin/checkout.c:732 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -2752,136 +3147,136 @@ msgstr "" " git branch nytt_grennamn %s\n" "\n" -#: builtin/checkout.c:730 +#: builtin/checkout.c:762 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:734 +#: builtin/checkout.c:766 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:761 builtin/checkout.c:950 +#: builtin/checkout.c:793 builtin/checkout.c:982 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:886 +#: builtin/checkout.c:918 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" #. case (1): want a tree -#: builtin/checkout.c:925 +#: builtin/checkout.c:957 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:964 +#: builtin/checkout.c:996 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:967 builtin/checkout.c:971 +#: builtin/checkout.c:999 builtin/checkout.c:1003 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983 -#: builtin/checkout.c:986 +#: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015 +#: builtin/checkout.c:1018 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:991 +#: builtin/checkout.c:1023 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1012 builtin/gc.c:177 -msgid "suppress progress reporting" -msgstr "undertryck förloppsrapportering" - -#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89 +#: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90 #: builtin/remote.c:169 builtin/remote.c:171 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1014 +#: builtin/checkout.c:1046 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1016 +#: builtin/checkout.c:1048 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1017 +#: builtin/checkout.c:1049 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1018 +#: builtin/checkout.c:1050 msgid "detach the HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1019 +#: builtin/checkout.c:1051 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1053 msgid "new branch" msgstr "ny gren" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1053 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1022 +#: builtin/checkout.c:1054 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1024 +#: builtin/checkout.c:1056 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1026 +#: builtin/checkout.c:1058 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1027 +#: builtin/checkout.c:1059 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 +#: builtin/checkout.c:1060 builtin/merge.c:217 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1029 builtin/log.c:1116 parse-options.h:241 +#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245 msgid "style" msgstr "stil" -#: builtin/checkout.c:1030 +#: builtin/checkout.c:1062 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1033 +#: builtin/checkout.c:1065 +msgid "do not limit pathspecs to sparse entries only" +msgstr "begränsa inte sökvägar till endast glesa poster" + +#: builtin/checkout.c:1067 msgid "second guess 'git checkout no-such-branch'" msgstr "förutspå \"git checkout gren-saknas\"" -#: builtin/checkout.c:1057 +#: builtin/checkout.c:1091 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1074 +#: builtin/checkout.c:1108 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1115 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1150 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1123 +#: builtin/checkout.c:1157 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -2890,12 +3285,12 @@ msgstr "" "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n" "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1162 #, 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:1132 +#: builtin/checkout.c:1166 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -2903,52 +3298,77 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/clean.c:19 +#: builtin/clean.c:20 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 +#: builtin/clean.c:24 +#, c-format +msgid "Removing %s\n" +msgstr "Tar bort %s\n" + +#: builtin/clean.c:25 +#, c-format +msgid "Would remove %s\n" +msgstr "Skulle ta bort %s\n" + +#: builtin/clean.c:26 +#, c-format +msgid "Skipping repository %s\n" +msgstr "Hoppar över arkivet %s\n" + +#: builtin/clean.c:27 +#, c-format +msgid "Would skip repository %s\n" +msgstr "Skulle hoppa över arkivet %s\n" + +#: builtin/clean.c:28 +#, c-format +msgid "failed to remove %s" +msgstr "misslyckades ta bort %s" + +#: builtin/clean.c:160 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:53 +#: builtin/clean.c:162 msgid "force" msgstr "tvinga" -#: builtin/clean.c:55 +#: builtin/clean.c:164 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: 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 +#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717 +#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:57 +#: builtin/clean.c:166 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:58 +#: builtin/clean.c:167 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:60 +#: builtin/clean.c:169 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:78 +#: builtin/clean.c:187 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:82 +#: builtin/clean.c:191 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" "clean.requireForce satt till true, men varken -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:85 +#: builtin/clean.c:194 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" @@ -2956,237 +3376,234 @@ msgstr "" "clean.requireForce har standardvärdet true, men varken -n eller -f angavs; " "vägrar städa" -#: builtin/clean.c:155 builtin/clean.c:176 -#, c-format -msgid "Would remove %s\n" -msgstr "Skulle ta bort %s\n" - -#: builtin/clean.c:159 builtin/clean.c:179 -#, c-format -msgid "Removing %s\n" -msgstr "Tar bort %s\n" - -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" -msgstr "misslyckades ta bort %s" - -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" -msgstr "Skulle inte ta bort %s\n" - -#: builtin/clean.c:168 -#, c-format -msgid "Not removing %s\n" -msgstr "Tar inte bort %s\n" - -#: builtin/clone.c:36 +#: builtin/clone.c:37 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [flaggor] [--] <arkiv> [<kat>]" -#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 -#: builtin/push.c:399 +#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214 +#: builtin/push.c:436 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/clone.c:66 +#: builtin/clone.c:67 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:72 +#: builtin/clone.c:73 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:74 +#: builtin/clone.c:75 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:76 +#: builtin/clone.c:77 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:78 +#: builtin/clone.c:79 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:80 builtin/clone.c:82 +#: builtin/clone.c:81 builtin/clone.c:83 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:83 builtin/init-db.c:485 +#: builtin/clone.c:84 builtin/init-db.c:485 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:84 builtin/init-db.c:486 +#: builtin/clone.c:85 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 +#: builtin/clone.c:87 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "namn" -#: builtin/clone.c:88 +#: builtin/clone.c:89 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 +#: builtin/clone.c:91 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:92 +#: builtin/clone.c:93 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 +#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662 msgid "depth" msgstr "djup" -#: builtin/clone.c:94 +#: builtin/clone.c:95 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:96 +#: builtin/clone.c:97 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 +#: builtin/clone.c:98 builtin/init-db.c:494 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:98 builtin/init-db.c:495 +#: builtin/clone.c:99 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:100 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:243 +#: builtin/clone.c:254 #, c-format -msgid "reference repository '%s' is not a local directory." -msgstr "referensarkivet \"%s\" är inte en lokal katalog." +msgid "reference repository '%s' is not a local repository." +msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: builtin/clone.c:306 +#: builtin/clone.c:317 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/clone.c:308 builtin/diff.c:77 +#: builtin/clone.c:319 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: builtin/clone.c:310 +#: builtin/clone.c:321 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:324 +#: builtin/clone.c:335 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:346 +#: builtin/clone.c:357 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:350 +#: builtin/clone.c:361 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:373 +#: builtin/clone.c:384 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:443 +#: builtin/clone.c:397 +msgid "" +"Clone succeeded, but checkout failed.\n" +"You can inspect what was checked out with 'git status'\n" +"and retry the checkout with 'git checkout -f HEAD'\n" +msgstr "" +"Klonen lyckades, men utcheckningen misslyckades.\n" +"Du kan inspektera det som checkades ut med \"git status\"\n" +"och försöka checka ut igen med \"git checkout -f HEAD\"\n" + +#: builtin/clone.c:476 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." -#: builtin/clone.c:552 +#: builtin/clone.c:550 +msgid "remote did not send all necessary objects" +msgstr "fjärren sände inte alla nödvändiga objekt" + +#: builtin/clone.c:610 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:690 +#: builtin/clone.c:641 +msgid "unable to checkout working tree" +msgstr "kunde inte checka ut arbetskatalogen" + +#: builtin/clone.c:749 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:694 +#: builtin/clone.c:753 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:705 +#: builtin/clone.c:764 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:719 +#: builtin/clone.c:767 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." + +#: builtin/clone.c:780 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:724 +#: builtin/clone.c:785 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:734 +#: builtin/clone.c:795 #, 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:744 +#: builtin/clone.c:805 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:757 builtin/clone.c:771 +#: builtin/clone.c:818 builtin/clone.c:830 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:760 +#: builtin/clone.c:821 #, c-format msgid "could not create work tree dir '%s'." msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:779 +#: builtin/clone.c:840 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:781 +#: builtin/clone.c:842 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:823 +#: builtin/clone.c:877 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:872 +#: builtin/clone.c:926 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:879 +#: builtin/clone.c:933 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -3223,12 +3640,12 @@ msgid "--command must be the first argument" msgstr "--command måste vara första argument" #: builtin/commit.c:34 -msgid "git commit [options] [--] <filepattern>..." -msgstr "git commit [flaggor] [--] <filmöster>..." +msgid "git commit [options] [--] <pathspec>..." +msgstr "git commit [flaggor] [--] <sökväg>..." #: builtin/commit.c:39 -msgid "git status [options] [--] <filepattern>..." -msgstr "git status [flaggor] [--] <filmönster>..." +msgid "git status [options] [--] <pathspec>..." +msgstr "git status [flaggor] [--] <sökväg>..." #: builtin/commit.c:44 msgid "" @@ -3281,93 +3698,93 @@ msgstr "" "\n" "Annars använder du \"git reset\"\n" -#: builtin/commit.c:258 +#: builtin/commit.c:260 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:300 +#: builtin/commit.c:302 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:306 +#: builtin/commit.c:308 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410 +#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:391 +#: builtin/commit.c:393 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:393 +#: builtin/commit.c:395 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:403 +#: builtin/commit.c:405 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:423 +#: builtin/commit.c:425 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:511 builtin/commit.c:517 +#: builtin/commit.c:513 builtin/commit.c:519 #, c-format msgid "invalid commit: %s" msgstr "felaktig incheckning: %s" -#: builtin/commit.c:540 +#: builtin/commit.c:542 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:560 +#: builtin/commit.c:562 #, c-format msgid "Malformed ident string: '%s'" msgstr "Felaktig indragningssträng: \"%s\"" -#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954 +#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:610 builtin/shortlog.c:296 +#: builtin/commit.c:612 builtin/shortlog.c:270 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:612 +#: builtin/commit.c:614 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:616 +#: builtin/commit.c:618 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:622 +#: builtin/commit.c:624 msgid "commit has empty message" msgstr "incheckningen har ett tomt meddelande" -#: builtin/commit.c:638 +#: builtin/commit.c:640 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:642 +#: builtin/commit.c:644 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:646 +#: builtin/commit.c:648 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/commit.c:707 +#: builtin/commit.c:709 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:718 +#: builtin/commit.c:720 #, c-format msgid "" "\n" @@ -3382,7 +3799,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:723 +#: builtin/commit.c:725 #, c-format msgid "" "\n" @@ -3397,157 +3814,160 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:735 +#: builtin/commit.c:737 +#, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" -"med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n" +"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " +"incheckningen.\n" -#: builtin/commit.c:740 +#: builtin/commit.c:742 +#, c-format 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" +"with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" -"med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n" +"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:753 +#: builtin/commit.c:755 #, c-format msgid "%sAuthor: %s" msgstr "%sFörfattare: %s" -#: builtin/commit.c:760 +#: builtin/commit.c:762 #, c-format msgid "%sCommitter: %s" msgstr "%sIncheckare: %s" -#: builtin/commit.c:780 +#: builtin/commit.c:782 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:817 +#: builtin/commit.c:819 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:832 builtin/tag.c:361 +#: builtin/commit.c:834 builtin/tag.c:359 #, 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:929 +#: builtin/commit.c:931 #, c-format msgid "No existing author found with '%s'" msgstr "Hittade ingen befintlig författare med \"%s\"" -#: builtin/commit.c:944 builtin/commit.c:1148 +#: builtin/commit.c:946 builtin/commit.c:1140 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:984 +#: builtin/commit.c:976 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:995 +#: builtin/commit.c:987 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:998 +#: builtin/commit.c:990 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:1000 +#: builtin/commit.c:992 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:1003 +#: builtin/commit.c:995 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1013 +#: builtin/commit.c:1005 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:1015 +#: builtin/commit.c:1007 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:1023 +#: builtin/commit.c:1015 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:1040 +#: builtin/commit.c:1032 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:1042 +#: builtin/commit.c:1034 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:1044 +#: builtin/commit.c:1036 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:1046 +#: builtin/commit.c:1038 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:1056 builtin/tag.c:577 +#: builtin/commit.c:1048 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1061 +#: builtin/commit.c:1053 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1067 builtin/commit.c:1202 +#: builtin/commit.c:1059 builtin/commit.c:1194 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1162 builtin/commit.c:1398 +#: builtin/commit.c:1154 builtin/commit.c:1390 msgid "show status concisely" msgstr "vis koncis status" -#: builtin/commit.c:1164 builtin/commit.c:1400 +#: builtin/commit.c:1156 builtin/commit.c:1392 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/push.c:389 +#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1169 builtin/commit.c:1404 +#: builtin/commit.c:1161 builtin/commit.c:1396 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1172 builtin/commit.c:1407 +#: builtin/commit.c:1164 builtin/commit.c:1399 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 +#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659 +#: builtin/fast-export.c:662 builtin/tag.c:459 msgid "mode" msgstr "läge" -#: builtin/commit.c:1175 builtin/commit.c:1410 +#: builtin/commit.c:1167 builtin/commit.c:1402 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 +#: builtin/commit.c:1170 msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1179 parse-options.h:151 +#: builtin/commit.c:1171 parse-options.h:151 msgid "when" msgstr "när" -#: builtin/commit.c:1180 +#: builtin/commit.c:1172 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -3555,217 +3975,217 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1182 +#: builtin/commit.c:1174 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1256 +#: builtin/commit.c:1248 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1258 +#: builtin/commit.c:1250 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1299 +#: builtin/commit.c:1291 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1301 +#: builtin/commit.c:1293 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1368 +#: builtin/commit.c:1360 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1369 +#: builtin/commit.c:1361 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1371 +#: builtin/commit.c:1363 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1372 builtin/tag.c:459 +#: builtin/commit.c:1364 builtin/tag.c:457 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1373 +#: builtin/commit.c:1365 msgid "author" msgstr "författare" -#: builtin/commit.c:1373 +#: builtin/commit.c:1365 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1374 builtin/gc.c:178 +#: builtin/commit.c:1366 builtin/gc.c:178 msgid "date" msgstr "datum" -#: builtin/commit.c:1374 +#: builtin/commit.c:1366 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 +#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533 +#: builtin/notes.c:690 builtin/tag.c:455 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1375 +#: builtin/commit.c:1367 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1376 +#: builtin/commit.c:1368 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1377 +#: builtin/commit.c:1369 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1378 +#: builtin/commit.c:1370 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 +#: builtin/commit.c:1371 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 +#: builtin/commit.c:1372 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 +#: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1382 +#: builtin/commit.c:1374 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1383 +#: builtin/commit.c:1375 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1384 +#: builtin/commit.c:1376 msgid "default" msgstr "standard" -#: builtin/commit.c:1384 builtin/tag.c:462 +#: builtin/commit.c:1376 builtin/tag.c:460 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" -#: builtin/commit.c:1385 +#: builtin/commit.c:1377 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 +#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461 msgid "key id" msgstr "nyckel-id" -#: builtin/commit.c:1387 builtin/merge.c:214 +#: builtin/commit.c:1379 builtin/merge.c:216 msgid "GPG sign commit" msgstr "GPG-signera incheckning" #. end commit message options -#: builtin/commit.c:1390 +#: builtin/commit.c:1382 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1391 +#: builtin/commit.c:1383 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1392 +#: builtin/commit.c:1384 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1393 +#: builtin/commit.c:1385 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1394 +#: builtin/commit.c:1386 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1395 +#: builtin/commit.c:1387 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1396 +#: builtin/commit.c:1388 msgid "bypass pre-commit hook" msgstr "förbigå pre-commit-krok" -#: builtin/commit.c:1397 +#: builtin/commit.c:1389 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1408 +#: builtin/commit.c:1400 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1409 +#: builtin/commit.c:1401 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1414 +#: builtin/commit.c:1406 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1417 +#: builtin/commit.c:1409 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1449 +#: builtin/commit.c:1441 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1487 builtin/merge.c:508 +#: builtin/commit.c:1479 builtin/merge.c:510 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: builtin/commit.c:1494 +#: builtin/commit.c:1486 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1501 +#: builtin/commit.c:1493 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1520 +#: builtin/commit.c:1512 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1534 +#: builtin/commit.c:1526 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1539 +#: builtin/commit.c:1531 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1554 builtin/merge.c:832 builtin/merge.c:857 +#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/commit.c:1575 +#: builtin/commit.c:1567 msgid "cannot lock HEAD ref" msgstr "kunde inte låsa HEAD-referens" -#: builtin/commit.c:1579 +#: builtin/commit.c:1571 msgid "cannot update HEAD ref" msgstr "kunde inte uppdatera HEAD-referens" -#: builtin/commit.c:1590 +#: builtin/commit.c:1582 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -3892,9 +4312,13 @@ msgstr "terminera värden med NUL-byte" 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/count-objects.c:82 +msgid "git count-objects [-v] [-H | --human-readable]" +msgstr "git count-objects [-v] [-H | --human-readable]" + +#: builtin/count-objects.c:97 +msgid "print sizes in human readable format" +msgstr "skriv storlekar i människoläsbart format" #: builtin/describe.c:15 msgid "git describe [options] <committish>*" @@ -3904,47 +4328,47 @@ msgstr "git describe [flaggor] <incheckning-igt>*" msgid "git describe [options] --dirty" msgstr "git describe [flaggor] --dirty" -#: builtin/describe.c:234 +#: builtin/describe.c:233 #, c-format msgid "annotated tag %s not available" msgstr "den annoterade taggen %s inte tillgänglig" -#: builtin/describe.c:238 +#: builtin/describe.c:237 #, c-format msgid "annotated tag %s has no embedded name" msgstr "den annoterade taggen %s har inget inbäddat namn" -#: builtin/describe.c:240 +#: builtin/describe.c:239 #, c-format msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" är i verkligheten \"%s\" här" -#: builtin/describe.c:267 +#: builtin/describe.c:266 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" -#: builtin/describe.c:270 +#: builtin/describe.c:269 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: builtin/describe.c:287 +#: builtin/describe.c:286 #, c-format msgid "no tag exactly matches '%s'" msgstr "ingen tagg motsvarar \"%s\" exakt" -#: builtin/describe.c:289 +#: builtin/describe.c:288 #, c-format msgid "searching to describe %s\n" msgstr "söker för att beskriva %s\n" -#: builtin/describe.c:329 +#: builtin/describe.c:328 #, c-format msgid "finished search at %s\n" msgstr "avslutade sökning på %s\n" -#: builtin/describe.c:353 +#: builtin/describe.c:352 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -3953,7 +4377,7 @@ msgstr "" "Inga annoterade taggar kan beskriva \"%s\".\n" "Det finns dock oannoterade taggar: testa --tags." -#: builtin/describe.c:357 +#: builtin/describe.c:356 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -3962,12 +4386,12 @@ msgstr "" "Inga taggar kan beskriva \"%s\".\n" "Testa --always, eller skapa några taggar." -#: builtin/describe.c:378 +#: builtin/describe.c:377 #, c-format msgid "traversed %lu commits\n" msgstr "traverserade %lu incheckningar\n" -#: builtin/describe.c:381 +#: builtin/describe.c:380 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -3976,59 +4400,59 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" -#: builtin/describe.c:403 +#: builtin/describe.c:402 msgid "find the tag that comes after the commit" msgstr "hitta taggen som kommer efter incheckningen" -#: builtin/describe.c:404 +#: builtin/describe.c:403 msgid "debug search strategy on stderr" msgstr "felsök sökstrategin på standard fel" +#: builtin/describe.c:404 +msgid "use any ref" +msgstr "använd alla referenser" + #: builtin/describe.c:405 -msgid "use any ref in .git/refs" -msgstr "använd alla referenser i .git/refs" +msgid "use any tag, even unannotated" +msgstr "använd alla taggar, även oannoterade" #: 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 +#: builtin/describe.c:409 msgid "only output exact matches" msgstr "skriv endast ut exakta träffar" -#: builtin/describe.c:412 +#: builtin/describe.c:411 msgid "consider <n> most recent tags (default: 10)" msgstr "överväg de <n> nyaste taggarna (standard: 10)" -#: builtin/describe.c:414 +#: builtin/describe.c:413 msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: builtin/describe.c:416 builtin/name-rev.c:238 +#: builtin/describe.c:415 builtin/name-rev.c:238 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" -#: builtin/describe.c:417 +#: builtin/describe.c:416 msgid "mark" msgstr "märke" -#: builtin/describe.c:418 +#: builtin/describe.c:417 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 +#: builtin/describe.c:435 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" -#: builtin/describe.c:462 +#: builtin/describe.c:461 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." -#: builtin/describe.c:482 +#: builtin/describe.c:481 msgid "--dirty is incompatible with committishes" msgstr "--dirty är inkompatibelt med \"committish\"-värden" @@ -4070,39 +4494,39 @@ msgstr "ej hanterat objekt \"%s\" angavs." msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" -#: builtin/fast-export.c:635 +#: builtin/fast-export.c:658 msgid "show progress after <n> objects" msgstr "visa förlopp efter <n> objekt" -#: builtin/fast-export.c:637 +#: builtin/fast-export.c:660 msgid "select handling of signed tags" msgstr "välj hantering av signerade taggar" -#: builtin/fast-export.c:640 +#: builtin/fast-export.c:663 msgid "select handling of tags that tag filtered objects" msgstr "välj hantering av taggar som har taggfiltrerade objekt" -#: builtin/fast-export.c:643 +#: builtin/fast-export.c:666 msgid "Dump marks to this file" msgstr "Dump märken till filen" -#: builtin/fast-export.c:645 +#: builtin/fast-export.c:668 msgid "Import marks from this file" msgstr "Importera märken från filen" -#: builtin/fast-export.c:647 +#: builtin/fast-export.c:670 msgid "Fake a tagger when tags lack one" msgstr "Fejka taggare när taggen saknar en" -#: builtin/fast-export.c:649 +#: builtin/fast-export.c:672 msgid "Output full tree for each commit" msgstr "Skriv ut hela trädet för varje incheckning" -#: builtin/fast-export.c:651 +#: builtin/fast-export.c:674 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 +#: builtin/fast-export.c:675 msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" @@ -4174,88 +4598,92 @@ msgstr "tillåt uppdatering av HEAD-referens" msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:85 builtin/log.c:1088 +#: builtin/fetch.c:86 +msgid "convert to a complete repository" +msgstr "konvertera till komplett arkiv" + +#: builtin/fetch.c:88 builtin/log.c:1130 msgid "dir" msgstr "kat" -#: builtin/fetch.c:86 +#: builtin/fetch.c:89 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:89 +#: builtin/fetch.c:92 msgid "default mode for recursion" msgstr "standardläge för rekursion" -#: builtin/fetch.c:201 +#: builtin/fetch.c:204 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:254 +#: builtin/fetch.c:257 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:259 +#: builtin/fetch.c:262 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:273 +#: builtin/fetch.c:276 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)" -#: builtin/fetch.c:274 builtin/fetch.c:360 +#: builtin/fetch.c:277 builtin/fetch.c:363 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:285 +#: builtin/fetch.c:288 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 msgid " (unable to update local ref)" msgstr " (kunde inte uppdatera lokal ref)" -#: builtin/fetch.c:305 +#: builtin/fetch.c:308 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:308 +#: builtin/fetch.c:311 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:311 +#: builtin/fetch.c:314 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:362 +#: builtin/fetch.c:365 msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:393 builtin/fetch.c:685 +#: builtin/fetch.c:396 builtin/fetch.c:688 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: builtin/fetch.c:402 +#: builtin/fetch.c:405 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s sände inte alla nödvändiga objekt\n" -#: builtin/fetch.c:488 +#: builtin/fetch.c:491 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:499 +#: builtin/fetch.c:502 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -4264,55 +4692,55 @@ msgstr "" "vissa lokala referenser kunde inte uppdateras; testa att köra\n" " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" -#: builtin/fetch.c:549 +#: builtin/fetch.c:552 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:550 +#: builtin/fetch.c:553 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:557 +#: builtin/fetch.c:560 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:558 builtin/remote.c:1055 +#: builtin/fetch.c:561 builtin/remote.c:1055 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:675 +#: builtin/fetch.c:678 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" -#: builtin/fetch.c:709 +#: builtin/fetch.c:712 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:786 +#: builtin/fetch.c:789 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:789 +#: builtin/fetch.c:792 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:891 +#: builtin/fetch.c:894 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:893 builtin/remote.c:100 +#: builtin/fetch.c:896 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:912 +#: builtin/fetch.c:915 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -4320,24 +4748,32 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar skall hämtas från." -#: builtin/fetch.c:932 +#: builtin/fetch.c:935 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:984 +#: builtin/fetch.c:981 +msgid "--depth and --unshallow cannot be used together" +msgstr "--depth och --unshallow kan inte användas samtidigt" + +#: builtin/fetch.c:983 +msgid "--unshallow on a complete repository does not make sense" +msgstr "--unshallow kan inte användas på ett komplett arkiv" + +#: builtin/fetch.c:1002 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:986 +#: builtin/fetch.c:1004 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1015 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1005 +#: builtin/fetch.c:1023 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -4346,29 +4782,29 @@ 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 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701 +#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 msgid "n" msgstr "n" -#: builtin/fmt-merge-msg.c:654 +#: builtin/fmt-merge-msg.c:664 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 +#: builtin/fmt-merge-msg.c:667 msgid "alias for --log (deprecated)" msgstr "alias för --log (avråds)" -#: builtin/fmt-merge-msg.c:660 +#: builtin/fmt-merge-msg.c:670 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:661 +#: builtin/fmt-merge-msg.c:671 msgid "use <text> as start of message" msgstr "inled meddelande med <text>" -#: builtin/fmt-merge-msg.c:662 +#: builtin/fmt-merge-msg.c:672 msgid "file to read from" msgstr "fil att läsa från" @@ -4704,11 +5140,6 @@ msgstr "visa användning" msgid "no pattern given." msgstr "inget mönster angavs." -#: builtin/grep.c:825 -#, c-format -msgid "bad object %s" -msgstr "felaktigt objekt %s" - #: builtin/grep.c:866 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" @@ -4770,45 +5201,49 @@ msgid "print all available commands" msgstr "visa alla tillgängliga kommandon" #: builtin/help.c:44 +msgid "print list of useful guides" +msgstr "lista användbara vägledningar" + +#: builtin/help.c:45 msgid "show man page" msgstr "visa manualsida" -#: builtin/help.c:45 +#: builtin/help.c:46 msgid "show manual in web browser" msgstr "visa manual i webbläsare" -#: builtin/help.c:47 +#: builtin/help.c:48 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:54 +msgid "git help [--all] [--guides] [--man|--web|--info] [command]" +msgstr "git help [--all] [--guides] [--man|--web|--info] [kommando]" -#: builtin/help.c:65 +#: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "okänt hjälpformat: %s" -#: builtin/help.c:93 +#: builtin/help.c:94 msgid "Failed to start emacsclient." msgstr "Misslyckades starta emacsclient." -#: builtin/help.c:106 +#: builtin/help.c:107 msgid "Failed to parse emacsclient version." msgstr "Kunde inte tolka emacsclient-version." -#: builtin/help.c:114 +#: builtin/help.c:115 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient version \"%d\" för gammal (< 22)." -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178 #, c-format msgid "failed to exec '%s': %s" msgstr "exec misslyckades för \"%s\": %s" -#: builtin/help.c:217 +#: builtin/help.c:218 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -4817,7 +5252,7 @@ msgstr "" "\"%s\": sökväg för man-visare som ej stöds.\n" "Använd \"man.<verktyg>.cmd\" istället." -#: builtin/help.c:229 +#: builtin/help.c:230 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -4826,307 +5261,335 @@ msgstr "" "\"%s\": kommando för man-visare som stöds.\n" "Använd \"man.<verktyg>.path\" istället." -#: builtin/help.c:299 -msgid "The most commonly used git commands are:" -msgstr "De mest använda git-kommandona är:" - -#: builtin/help.c:367 +#: builtin/help.c:351 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:384 +#: builtin/help.c:368 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:392 +#: builtin/help.c:376 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:447 builtin/help.c:454 +#: builtin/help.c:422 +msgid "Defining attributes per path" +msgstr "Definierar attribut per sökväg" + +#: builtin/help.c:423 +msgid "A Git glossary" +msgstr "En Git-ordlista" + +#: builtin/help.c:424 +msgid "Specifies intentionally untracked files to ignore" +msgstr "Ange avsiktligen ospårade filer att ignorera" + +#: builtin/help.c:425 +msgid "Defining submodule properties" +msgstr "Ange egenskaper för undermoduler" + +#: builtin/help.c:426 +msgid "Specifying revisions and ranges for Git" +msgstr "Ange versioner och intervall i Git" + +#: builtin/help.c:427 +msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" +msgstr "Introduktion till Git (för version 1.5.1 och senare)" + +#: builtin/help.c:428 +msgid "An overview of recommended workflows with Git" +msgstr "Översikt över rekommenderade arbetsflöden med Git" + +#: builtin/help.c:440 +msgid "The common Git guides are:\n" +msgstr "De vanliga Git-vägledningarna är:\n" + +#: builtin/help.c:462 builtin/help.c:478 #, c-format msgid "usage: %s%s" msgstr "användning: %s%s" -#: builtin/help.c:470 +#: builtin/help.c:494 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "\"git %s\" är ett alias för \"%s\"" -#: builtin/index-pack.c:170 +#: builtin/index-pack.c:182 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" -#: builtin/index-pack.c:190 +#: builtin/index-pack.c:202 msgid "object of unexpected type" msgstr "objekt av oväntad typ" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:239 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "kan inte fylla %d byte" msgstr[1] "kan inte fylla %d byte" -#: builtin/index-pack.c:237 +#: builtin/index-pack.c:249 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:238 +#: builtin/index-pack.c:250 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:250 +#: builtin/index-pack.c:262 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:257 +#: builtin/index-pack.c:269 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" -#: builtin/index-pack.c:273 +#: builtin/index-pack.c:285 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: builtin/index-pack.c:278 +#: builtin/index-pack.c:290 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:292 +#: builtin/index-pack.c:304 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:294 +#: builtin/index-pack.c:306 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:324 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "paketet har felaktigt objekt vid index %lu: %s" -#: builtin/index-pack.c:434 +#: builtin/index-pack.c:446 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:483 +#: builtin/index-pack.c:495 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:491 +#: builtin/index-pack.c:503 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:499 +#: builtin/index-pack.c:511 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:542 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:532 +#: builtin/index-pack.c:544 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "för tidigt slut på paketfilen, %lu byte saknas" msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas" -#: builtin/index-pack.c:558 +#: builtin/index-pack.c:570 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678 -#: builtin/index-pack.c:712 builtin/index-pack.c:721 +#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690 +#: builtin/index-pack.c:724 builtin/index-pack.c:733 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:652 builtin/pack-objects.c:170 +#: builtin/index-pack.c:664 builtin/pack-objects.c:170 #: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:718 +#: builtin/index-pack.c:730 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:732 +#: builtin/index-pack.c:744 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:747 +#: builtin/index-pack.c:759 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/index-pack.c:749 +#: builtin/index-pack.c:761 msgid "Error in object" msgstr "Fel i objekt" -#: builtin/index-pack.c:751 +#: builtin/index-pack.c:763 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Inte alla barnobjekt för %s kan nås" -#: builtin/index-pack.c:821 builtin/index-pack.c:847 +#: builtin/index-pack.c:833 builtin/index-pack.c:863 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:986 +#: builtin/index-pack.c:1004 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:986 +#: builtin/index-pack.c:1004 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1012 +#: builtin/index-pack.c:1030 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1017 +#: builtin/index-pack.c:1035 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1020 +#: builtin/index-pack.c:1038 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1031 +#: builtin/index-pack.c:1049 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1054 +#: builtin/index-pack.c:1072 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1064 +#: builtin/index-pack.c:1082 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1106 +#: builtin/index-pack.c:1124 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1112 +#: builtin/index-pack.c:1132 #, c-format msgid "completed with %d local objects" msgstr "slutfördes med %d lokala objekt" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1142 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1125 +#: builtin/index-pack.c:1146 #, 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:1150 +#: builtin/index-pack.c:1171 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1229 +#: builtin/index-pack.c:1250 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1253 +#: builtin/index-pack.c:1274 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1266 +#: builtin/index-pack.c:1287 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1274 +#: builtin/index-pack.c:1295 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1287 +#: builtin/index-pack.c:1308 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1319 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1331 +#: builtin/index-pack.c:1352 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1337 +#: builtin/index-pack.c:1358 #, 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 +#: builtin/index-pack.c:1362 builtin/index-pack.c:1535 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/index-pack.c:1399 +#: builtin/index-pack.c:1420 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1422 #, 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:1448 +#: builtin/index-pack.c:1469 #, 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:1455 +#: builtin/index-pack.c:1476 #, 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:1482 +#: builtin/index-pack.c:1503 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1526 builtin/index-pack.c:1529 -#: builtin/index-pack.c:1541 builtin/index-pack.c:1545 +#: builtin/index-pack.c:1547 builtin/index-pack.c:1550 +#: builtin/index-pack.c:1562 builtin/index-pack.c:1566 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1559 +#: builtin/index-pack.c:1580 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1563 builtin/index-pack.c:1573 +#: builtin/index-pack.c:1584 builtin/index-pack.c:1594 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1582 +#: builtin/index-pack.c:1603 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -5294,337 +5757,340 @@ 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:40 +msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" +msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]\n" -#: builtin/log.c:38 +#: builtin/log.c:41 msgid " or: git show [options] <object>..." msgstr " eller: git show [flaggor] <objekt>..." -#: builtin/log.c:100 +#: builtin/log.c:103 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: builtin/log.c:101 +#: builtin/log.c:104 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:102 +#: builtin/log.c:105 +msgid "Use mail map file" +msgstr "Använd e-postmappningsfil" + +#: builtin/log.c:106 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:189 +#: builtin/log.c:199 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:405 builtin/log.c:497 +#: builtin/log.c:422 builtin/log.c:514 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:521 +#: builtin/log.c:538 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:613 +#: builtin/log.c:638 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:687 +#: builtin/log.c:720 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:698 +#: builtin/log.c:736 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:712 +#: builtin/log.c:750 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:720 +#: builtin/log.c:758 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:794 +#: builtin/log.c:860 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:867 +#: builtin/log.c:936 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:895 +#: builtin/log.c:964 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:940 +#: builtin/log.c:1009 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1068 +#: builtin/log.c:1108 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 +#: builtin/log.c:1111 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1075 +#: builtin/log.c:1115 msgid "print patches to standard out" msgstr "skriv patcharna på stnadard ut" -#: builtin/log.c:1077 +#: builtin/log.c:1117 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1079 +#: builtin/log.c:1119 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1080 +#: builtin/log.c:1120 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1081 +#: builtin/log.c:1121 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1083 +#: builtin/log.c:1123 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 +#: builtin/log.c:1125 +msgid "mark the series as Nth re-roll" +msgstr "markera serien som N:te försök" + +#: builtin/log.c:1127 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1088 +#: builtin/log.c:1130 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1091 +#: builtin/log.c:1133 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1094 +#: builtin/log.c:1136 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1096 +#: builtin/log.c:1138 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1098 +#: builtin/log.c:1140 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1100 +#: builtin/log.c:1142 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1101 +#: builtin/log.c:1143 msgid "header" msgstr "huvud" -#: builtin/log.c:1102 +#: builtin/log.c:1144 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1103 builtin/log.c:1105 +#: builtin/log.c:1145 builtin/log.c:1147 msgid "email" msgstr "epost" -#: builtin/log.c:1103 +#: builtin/log.c:1145 msgid "add To: header" msgstr "Lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1105 +#: builtin/log.c:1147 msgid "add Cc: header" msgstr "Lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1107 +#: builtin/log.c:1149 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1108 +#: builtin/log.c:1150 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 +#: builtin/log.c:1151 builtin/log.c:1154 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1110 +#: builtin/log.c:1152 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1113 +#: builtin/log.c:1155 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1117 +#: builtin/log.c:1159 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1119 +#: builtin/log.c:1161 msgid "signature" msgstr "signatur" -#: builtin/log.c:1120 +#: builtin/log.c:1162 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1122 +#: builtin/log.c:1164 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:1208 +#: builtin/log.c:1248 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1210 +#: builtin/log.c:1250 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix och -k kan inte användas samtidigt." -#: builtin/log.c:1218 +#: builtin/log.c:1258 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1220 +#: builtin/log.c:1260 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1222 +#: builtin/log.c:1262 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1245 +#: builtin/log.c:1285 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1247 +#: builtin/log.c:1287 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1400 +#: builtin/log.c:1435 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1449 +#: builtin/log.c:1484 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1504 +#: builtin/log.c:1539 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" -#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531 +#: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" -#: builtin/ls-files.c:408 +#: builtin/ls-files.c:402 msgid "git ls-files [options] [<file>...]" msgstr "git ls-files [flaggor] [<fil>...]" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:459 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:461 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 +#: builtin/ls-files.c:463 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:465 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:467 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:469 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:471 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:478 +#: builtin/ls-files.c:474 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:476 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 +#: builtin/ls-files.c:478 msgid "show 'other' directories' name only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:481 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:488 +#: builtin/ls-files.c:484 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:486 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:492 +#: builtin/ls-files.c:488 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:491 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:494 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 +#: builtin/ls-files.c:496 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:499 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:506 +#: builtin/ls-files.c:502 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 +#: builtin/ls-files.c:503 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:508 +#: builtin/ls-files.c:504 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 +#: builtin/ls-files.c:506 msgid "show debugging data" msgstr "visa felsökningsutdata" @@ -5732,171 +6198,176 @@ msgstr "tillåt snabbspolning (standard)" 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 +#: builtin/merge.c:203 +msgid "Verify that the named commit has a valid GPG signature" +msgstr "Bekräfta att den namngivna incheckningen har en giltig GPG-signatur" + +#: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:203 +#: builtin/merge.c:205 msgid "merge strategy to use" msgstr "sammanslagninsstrategi att använda" -#: builtin/merge.c:204 +#: builtin/merge.c:206 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:205 +#: builtin/merge.c:207 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:207 +#: builtin/merge.c:209 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:211 +#: builtin/merge.c:213 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:240 +#: builtin/merge.c:242 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:245 +#: builtin/merge.c:247 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:250 +#: builtin/merge.c:252 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:269 builtin/merge.c:286 +#: builtin/merge.c:271 builtin/merge.c:288 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:316 +#: builtin/merge.c:318 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:329 +#: builtin/merge.c:331 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:361 +#: builtin/merge.c:363 msgid "Writing SQUASH_MSG" msgstr "Skriver SQUASH_MSG" -#: builtin/merge.c:363 +#: builtin/merge.c:365 msgid "Finishing SQUASH_MSG" msgstr "Avslutar SQUASH_MSG" -#: builtin/merge.c:386 +#: builtin/merge.c:388 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:436 +#: builtin/merge.c:438 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:535 +#: builtin/merge.c:550 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:628 +#: builtin/merge.c:643 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/merge.c:656 +#: builtin/merge.c:671 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:670 +#: builtin/merge.c:685 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:684 +#: builtin/merge.c:699 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:773 +#: builtin/merge.c:788 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:782 +#: builtin/merge.c:797 #, 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:788 +#: builtin/merge.c:803 +#, c-format 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" "\n" -"Lines starting with '#' will be ignored, and an empty message aborts\n" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" "Ange ett incheckningsmeddelande för att förklara varför sammanslagningen\n" "är nödvändig, speciellt om den slår in en uppdaterad uppström i en\n" "temagren.\n" "\n" -"Rader som inleds med \"#\" kommer ignoreras, och ett tomt meddelande\n" +"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:827 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:824 +#: builtin/merge.c:839 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:889 +#: builtin/merge.c:904 #, 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:905 +#: builtin/merge.c:920 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" -#: builtin/merge.c:946 +#: builtin/merge.c:961 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:948 +#: builtin/merge.c:963 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:950 +#: builtin/merge.c:965 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:955 +#: builtin/merge.c:970 #, 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:1042 builtin/merge.c:1199 +#: builtin/merge.c:1057 builtin/merge.c:1214 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1110 +#: builtin/merge.c:1125 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1126 git-pull.sh:31 +#: builtin/merge.c:1141 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -5904,11 +6375,11 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du kan slå ihop." -#: builtin/merge.c:1129 git-pull.sh:34 +#: builtin/merge.c:1144 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:1133 +#: builtin/merge.c:1148 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -5916,79 +6387,102 @@ 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:1136 +#: builtin/merge.c:1151 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:1145 +#: builtin/merge.c:1160 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1150 +#: builtin/merge.c:1165 msgid "You cannot combine --no-ff with --ff-only." msgstr "Du kan inte kombinera --no-ff med --ff-only." -#: builtin/merge.c:1157 +#: builtin/merge.c:1172 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1189 +#: builtin/merge.c:1204 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:1192 +#: builtin/merge.c:1207 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1194 +#: builtin/merge.c:1209 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:1309 +#: builtin/merge.c:1265 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "" +"Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s." + +#: builtin/merge.c:1268 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "" +"Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s." + +#. 'N' +#: builtin/merge.c:1271 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "Incheckning %s har inte någon GPG-signatur." + +#: builtin/merge.c:1274 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" + +#: builtin/merge.c:1358 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1348 +#: builtin/merge.c:1397 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1355 +#: builtin/merge.c:1404 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1387 +#: builtin/merge.c:1436 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1410 builtin/merge.c:1489 +#: builtin/merge.c:1459 builtin/merge.c:1538 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1414 +#: builtin/merge.c:1463 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagninsstrategin %s...\n" -#: builtin/merge.c:1480 +#: builtin/merge.c:1529 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1482 +#: builtin/merge.c:1531 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1491 +#: builtin/merge.c:1540 #, 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:1503 +#: builtin/merge.c:1552 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -6303,139 +6797,134 @@ msgstr "git notes prune [<flaggor>]" msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:142 +#: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "kunde inte starta \"show\" för objektet \"%s\"" -#: builtin/notes.c:148 -msgid "can't fdopen 'show' output fd" -msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag" +#: builtin/notes.c:143 +msgid "could not read 'show' output" +msgstr "kunde inte läsa utdata från \"show\"" -#: 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:161 +#: builtin/notes.c:151 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" -#: builtin/notes.c:178 builtin/tag.c:347 +#: builtin/notes.c:169 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: builtin/notes.c:192 +#: builtin/notes.c:188 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:213 builtin/notes.c:976 +#: builtin/notes.c:209 builtin/notes.c:972 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" -#: builtin/notes.c:218 +#: builtin/notes.c:214 msgid "unable to write note object" msgstr "kunde inte skriva anteckningsobjekt" -#: builtin/notes.c:220 +#: builtin/notes.c:216 #, c-format msgid "The note contents has been left in %s" msgstr "Anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:254 builtin/tag.c:542 +#: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:256 builtin/tag.c:545 +#: builtin/notes.c:252 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" -#: 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 +#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 +#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 +#: builtin/notes.c:967 builtin/tag.c:556 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/notes.c:278 +#: builtin/notes.c:274 #, c-format msgid "Failed to read object '%s'." msgstr "Kunde inte läsa objektet \"%s\"." -#: builtin/notes.c:302 +#: builtin/notes.c:298 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd" -#: builtin/notes.c:343 +#: builtin/notes.c:339 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Felaktigt värde för notes.rewriteMode: '%s'" -#: builtin/notes.c:353 +#: builtin/notes.c:349 #, 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:380 +#: builtin/notes.c:376 #, c-format msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" -#: builtin/notes.c:444 +#: builtin/notes.c:440 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/notes.c:459 +#: builtin/notes.c:455 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: 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 +#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 +#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 +#: builtin/notes.c:1032 msgid "too many parameters" msgstr "för många parametrar" -#: builtin/notes.c:516 builtin/notes.c:775 +#: builtin/notes.c:512 builtin/notes.c:771 #, c-format msgid "No note found for object %s." msgstr "Inga anteckningar hittades för objektet %s." -#: builtin/notes.c:538 builtin/notes.c:695 +#: builtin/notes.c:534 builtin/notes.c:691 msgid "note contents as a string" msgstr "anteckningsinnehåll som sträng" -#: builtin/notes.c:541 builtin/notes.c:698 +#: builtin/notes.c:537 builtin/notes.c:694 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 +#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 +#: builtin/notes.c:699 builtin/tag.c:474 msgid "object" msgstr "objekt" -#: builtin/notes.c:544 builtin/notes.c:701 +#: builtin/notes.c:540 builtin/notes.c:697 msgid "reuse and edit specified note object" msgstr "återanvänd och redigera angivet anteckningsobjekt" -#: builtin/notes.c:547 builtin/notes.c:704 +#: builtin/notes.c:543 builtin/notes.c:700 msgid "reuse specified note object" msgstr "återanvänd angivet anteckningsobjekt" -#: builtin/notes.c:549 builtin/notes.c:617 +#: builtin/notes.c:545 builtin/notes.c:613 msgid "replace existing notes" msgstr "ersätt befintliga anteckningar" -#: builtin/notes.c:583 +#: builtin/notes.c:579 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -6444,24 +6933,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:588 builtin/notes.c:665 +#: builtin/notes.c:584 builtin/notes.c:661 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:618 +#: builtin/notes.c:614 msgid "read objects from stdin" msgstr "läs objekt från standard in" -#: builtin/notes.c:620 +#: builtin/notes.c:616 msgid "load rewriting config for <command> (implies --stdin)" msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)" -#: builtin/notes.c:638 +#: builtin/notes.c:634 msgid "too few parameters" msgstr "för få parametrar" -#: builtin/notes.c:659 +#: builtin/notes.c:655 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -6470,12 +6959,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:671 +#: builtin/notes.c:667 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: builtin/notes.c:720 +#: builtin/notes.c:716 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -6484,15 +6973,15 @@ msgstr "" "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" -#: builtin/notes.c:867 +#: builtin/notes.c:863 msgid "General options" msgstr "Allmänna flaggor" -#: builtin/notes.c:869 +#: builtin/notes.c:865 msgid "Merge options" msgstr "Flaggor för sammanslagning" -#: builtin/notes.c:871 +#: builtin/notes.c:867 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -6500,46 +6989,46 @@ msgstr "" "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:873 +#: builtin/notes.c:869 msgid "Committing unmerged notes" msgstr "Checkar in ej sammanslagna anteckningar" -#: builtin/notes.c:875 +#: builtin/notes.c:871 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 +#: builtin/notes.c:873 msgid "Aborting notes merge resolution" msgstr "Avbryt lösning av sammanslagning av anteckningar" -#: builtin/notes.c:879 +#: builtin/notes.c:875 msgid "abort notes merge" msgstr "avbryt sammanslagning av anteckningar" -#: builtin/notes.c:974 +#: builtin/notes.c:970 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:986 +#: builtin/notes.c:982 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 +#: builtin/notes.c:985 msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:1070 +#: builtin/notes.c:1066 msgid "notes_ref" msgstr "anteckningar-ref" -#: builtin/notes.c:1071 +#: builtin/notes.c:1067 msgid "use notes from <notes_ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1106 builtin/remote.c:1598 +#: builtin/notes.c:1102 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" @@ -6898,22 +7387,51 @@ 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:258 +#: builtin/push.c:224 +msgid "" +"Updates were rejected because the remote contains work that you do\n" +"not have locally. This is usually caused by another repository pushing\n" +"to the same ref. You may want to first merge the remote changes (e.g.,\n" +"'git pull') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"Uppdateringar avvisades då fjärren innehåller ändringar som du inte\n" +"har lokalt. Det beror oftast på att ett annat arkiv har sänt in samma\n" +"referenser. Det kan vara en idé att först slå ihop fjärrändringarna\n" +"(t.ex. \"git pull\") innan du sänder igen.\n" +"Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer." + +#: builtin/push.c:231 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren." + +#: builtin/push.c:234 +msgid "" +"You cannot update a remote ref that points at a non-commit object,\n" +"or update a remote ref to make it point at a non-commit object,\n" +"without using the '--force' option.\n" +msgstr "" +"Du kan inte uppdatera en fjärr-referens som pekar på ett objekt som\n" +"inte är en incheckning, eller uppdatera en fjärr-referens så att den\n" +"pekar på något som inte är en incheckning, utan att använda flaggan\n" +"\"--force\".\n" + +#: builtin/push.c:294 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:262 +#: builtin/push.c:298 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:294 +#: builtin/push.c:331 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:295 +#: builtin/push.c:332 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -6934,79 +7452,87 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:310 +#: builtin/push.c:347 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:311 +#: builtin/push.c:348 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:316 +#: builtin/push.c:353 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:317 +#: builtin/push.c:354 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:322 +#: builtin/push.c:359 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:382 +#: builtin/push.c:419 msgid "repository" msgstr "arkiv" -#: builtin/push.c:383 +#: builtin/push.c:420 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:384 +#: builtin/push.c:421 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:386 +#: builtin/push.c:423 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:387 +#: builtin/push.c:424 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 +#: builtin/push.c:427 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:391 +#: builtin/push.c:428 msgid "check" msgstr "kontrollera" -#: builtin/push.c:392 +#: builtin/push.c:429 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:394 +#: builtin/push.c:431 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:395 builtin/push.c:396 +#: builtin/push.c:432 builtin/push.c:433 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:397 +#: builtin/push.c:434 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:400 +#: builtin/push.c:437 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:410 +#: builtin/push.c:439 +msgid "bypass pre-push hook" +msgstr "förbigå pre-push-krok" + +#: builtin/push.c:440 +msgid "push missing but relevant tags" +msgstr "sänd in saknade men relevanta taggar" + +#: builtin/push.c:450 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är imkompatibel med --all, --mirror och --tags" -#: builtin/push.c:412 +#: builtin/push.c:452 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" @@ -7617,12 +8143,12 @@ 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>..." +msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgstr "git reset [-q] <träd-igt> [--] <sökvägar>..." #: builtin/reset.c:27 -msgid "git reset --patch [<commit>] [--] [<paths>...]" -msgstr "git reset --patch [<incheckning>] [--] [<sökvägar>...]" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]" #: builtin/reset.c:33 msgid "mixed" @@ -7644,90 +8170,96 @@ msgstr "sammanslagning" msgid "keep" msgstr "behåll" -#: builtin/reset.c:77 +#: builtin/reset.c:73 msgid "You do not have a valid HEAD." msgstr "Du har inte en giltig HEAD." -#: builtin/reset.c:79 +#: builtin/reset.c:75 msgid "Failed to find tree of HEAD." msgstr "Kunde inte hitta träder för HEAD." -#: builtin/reset.c:85 +#: builtin/reset.c:81 #, c-format msgid "Failed to find tree of %s." msgstr "Kunde inte hitta träder för %s." -#: builtin/reset.c:96 -msgid "Could not write new index file." -msgstr "Kunde inte skriva ny indexfil." - -#: builtin/reset.c:106 +#: builtin/reset.c:98 #, c-format msgid "HEAD is now at %s" msgstr "HEAD är nu på %s" -#: builtin/reset.c:130 -msgid "Could not read index" -msgstr "Kunde inte läsa indexet" - -#: builtin/reset.c:133 -msgid "Unstaged changes after reset:" -msgstr "Oköade ändringar efter återställning:" - -#: builtin/reset.c:223 +#: builtin/reset.c:169 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." -#: builtin/reset.c:238 +#: builtin/reset.c:248 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" -#: builtin/reset.c:240 +#: builtin/reset.c:250 msgid "reset HEAD and index" msgstr "återställ HEAD och index" -#: builtin/reset.c:241 +#: builtin/reset.c:251 msgid "reset only HEAD" msgstr "återställ endast HEAD" -#: builtin/reset.c:243 builtin/reset.c:245 +#: builtin/reset.c:253 builtin/reset.c:255 msgid "reset HEAD, index and working tree" msgstr "återställ HEAD, index och arbetskatalog" -#: builtin/reset.c:247 +#: builtin/reset.c:257 msgid "reset HEAD but keep local changes" msgstr "återställ HEAD men behåll lokala ändringar" -#: builtin/reset.c:303 +#: builtin/reset.c:275 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "Kunde inte slå upp \"%s\" som en giltig revision." + +#: builtin/reset.c:278 builtin/reset.c:286 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"" -#: builtin/reset.c:308 +#: builtin/reset.c:283 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd." + +#: builtin/reset.c:292 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch är inkompatibel med --{hard,mixed,soft}" -#: builtin/reset.c:317 +#: builtin/reset.c:301 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"." -#: builtin/reset.c:319 +#: builtin/reset.c:303 #, c-format msgid "Cannot do %s reset with paths." msgstr "Kan inte göra %s återställning med sökvägar." -#: builtin/reset.c:331 +#: builtin/reset.c:313 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s återställning tillåts inte i ett naket arkiv" -#: builtin/reset.c:347 +#: builtin/reset.c:333 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." +#: builtin/reset.c:339 +msgid "Unstaged changes after reset:" +msgstr "Oköade ändringar efter återställning:" + +#: builtin/reset.c:344 +msgid "Could not write new index file." +msgstr "Kunde inte skriva ny indexfil." + #: builtin/rev-parse.c:339 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [options] -- [<argument>...]" @@ -7756,16 +8288,16 @@ msgstr "" "varianten." #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>" -msgstr "git revert [flaggor] <incheckning-igt>" +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>" +msgid "git cherry-pick [options] <commit-ish>..." +msgstr "git cherry-pick [flaggor] <incheckning-igt>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" @@ -7916,32 +8448,31 @@ 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>... ]" +msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" +msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/shortlog.c:157 +#: builtin/shortlog.c:131 #, c-format msgid "Missing author: %s" msgstr "Författare saknas: %s" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:227 msgid "sort output according to the number of commits per author" msgstr "sortera utdata enligt antal incheckningar per författare" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:229 msgid "Suppress commit descriptions, only provides commit count" msgstr "Undertryck beskrivningar, visa bara antal incheckningar" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:231 msgid "Show the email address of each author" msgstr "Visa e-postadress för varje författare" -#: builtin/shortlog.c:258 +#: builtin/shortlog.c:232 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:259 +#: builtin/shortlog.c:233 msgid "Linewrap output" msgstr "Radbryt utdata" @@ -7961,67 +8492,67 @@ msgstr "" msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g|--reflog)[=<n>[,<bas>]] [--list] [<ref>]" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:650 msgid "show remote-tracking and local branches" msgstr "visa fjärrspårande och lokala grenar" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:652 msgid "show remote-tracking branches" msgstr "visa fjärrspårande grenar" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:654 msgid "color '*!+-' corresponding to the branch" msgstr "färga \"*!+-\" enligt grenen" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:656 msgid "show <n> more commits after the common ancestor" msgstr "visa <n> ytterligare incheckningar efter gemensam anfader" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "synonym to more=-1" msgstr "synonym till more=-1" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:659 msgid "suppress naming strings" msgstr "undertyck namnsträngar" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:661 msgid "include the current branch" msgstr "inkludera aktuell gren" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:663 msgid "name commits with their object names" msgstr "namnge incheckningar med deras objektnamn" -#: builtin/show-branch.c:666 +#: builtin/show-branch.c:665 msgid "show possible merge bases" msgstr "visa möjliga sammanslaningsbaser" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:667 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 +#: builtin/show-branch.c:669 msgid "show commits in topological order" msgstr "visa incheckningar i topologisk ordning" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:671 msgid "show only commits not on the first branch" msgstr "visa endast incheckningar inte på den första grenen" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:673 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 +#: builtin/show-branch.c:675 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 +#: builtin/show-branch.c:677 msgid "<n>[,<base>]" msgstr "<n>[,<bas>]" -#: builtin/show-branch.c:679 +#: builtin/show-branch.c:678 msgid "show <n> most recent ref-log entries starting at base" msgstr "visa <n> nyaste refloggposter med början på bas" @@ -8146,170 +8677,164 @@ msgid "could not verify the tag '%s'" msgstr "kunde inte bekräfta taggen \"%s\"" #: builtin/tag.c:249 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be ignored.\n" -"#\n" +"Write a tag message\n" +"Lines starting with '%c' will be ignored.\n" msgstr "" "\n" -"#\n" -"# Skriv ett taggmeddelande\n" -"# Rader som inleds med \"#\" ignoreras.\n" -"#\n" +"Skriv ett taggmeddelande\n" +"Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:256 +#: builtin/tag.c:253 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be kept; you may remove them yourself if you " +"Write a tag message\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" -"#\n" msgstr "" "\n" -"#\n" -"# Skriv ett taggmeddelande\n" -"# Rader som inleds med \"#\" kommer behållas; du kan själv ta bort dem om\n" -"# du vill.\n" -"#\n" +"Skriv ett taggmeddelande\n" +"Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" +"du vill.\n" -#: builtin/tag.c:298 +#: builtin/tag.c:292 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:300 +#: builtin/tag.c:294 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" -#: builtin/tag.c:325 +#: builtin/tag.c:319 msgid "bad object type." msgstr "felaktig objekttyp" -#: builtin/tag.c:338 +#: builtin/tag.c:332 msgid "tag header too big." msgstr "tagghuvud för stort." -#: builtin/tag.c:370 +#: builtin/tag.c:368 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:376 +#: builtin/tag.c:374 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:425 +#: builtin/tag.c:423 msgid "switch 'points-at' requires an object" msgstr "flaggan \"points-at\" behöver ett object" -#: builtin/tag.c:427 +#: builtin/tag.c:425 #, c-format msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: builtin/tag.c:447 +#: builtin/tag.c:445 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:449 +#: builtin/tag.c:447 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:451 +#: builtin/tag.c:449 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:452 +#: builtin/tag.c:450 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:454 +#: builtin/tag.c:452 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:456 +#: builtin/tag.c:454 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:458 +#: builtin/tag.c:456 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:460 +#: builtin/tag.c:458 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:464 +#: builtin/tag.c:462 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:465 +#: builtin/tag.c:463 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:466 +#: builtin/tag.c:464 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:468 +#: builtin/tag.c:466 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:471 +#: builtin/tag.c:469 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:477 +#: builtin/tag.c:475 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:506 +#: builtin/tag.c:504 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:523 +#: builtin/tag.c:521 msgid "-n option is only allowed with -l." msgstr "Flaggan -n är endast tillåten tillsammans med -l." -#: builtin/tag.c:525 +#: builtin/tag.c:523 msgid "--contains option is only allowed with -l." msgstr "Flaggan --contains är endast tillåten tillsammans med -l" -#: builtin/tag.c:527 +#: builtin/tag.c:525 msgid "--points-at option is only allowed with -l." msgstr "Flaggan --points-at är endast tillåten tillsammans med -l." -#: builtin/tag.c:535 +#: builtin/tag.c:533 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:555 +#: builtin/tag.c:553 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:561 +#: builtin/tag.c:559 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:566 +#: builtin/tag.c:564 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:584 +#: builtin/tag.c:582 #, c-format msgid "%s: cannot lock the ref" msgstr "%s: kan inte låsa referensen" -#: builtin/tag.c:586 +#: builtin/tag.c:584 #, c-format msgid "%s: cannot update the ref" msgstr "%s: kan inte uppdatera referensen" -#: builtin/tag.c:588 +#: builtin/tag.c:586 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" @@ -8487,23 +9012,28 @@ 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." +msgid "" +"'git help -a' and 'git help -g' lists available subcommands and some\n" +"concept guides. See 'git help <command>' or 'git help <concept>'\n" +"to read about a specific subcommand or concept." msgstr "" -"Se \"git help <kommando>\" för mer information om ett specifikt kommando." +"\"git help -a\" och \"git help -g\" visar tillgängliga underkommandon och\n" +"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n" +"<koncept>\" för att läsa mer om specifika underkommandon och koncept." #: parse-options.h:156 msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:228 +#: parse-options.h:232 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:230 +#: parse-options.h:234 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:236 +#: parse-options.h:240 msgid "use <n> digits to display SHA-1s" msgstr "använd <n> siffror för att visa SHA-1:or" @@ -8544,8 +9074,8 @@ msgid "Print lines matching a pattern" msgstr "Visa rader som motsvarar mönster" #: common-cmds.h:17 -msgid "Create an empty git repository or reinitialize an existing one" -msgstr "Skapa tomt git-arkiv eller ominitiera ett befintligt" +msgid "Create an empty Git repository or reinitialize an existing one" +msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt" #: common-cmds.h:18 msgid "Show commit logs" @@ -8856,16 +9386,16 @@ msgstr "" "Du måste sedan ange åtminstone en bra och en dålig version.\n" "(Du kan använda \"git bisect bad\" och \"git bisect good\" för detta.)" -#: git-bisect.sh:347 git-bisect.sh:474 +#: git-bisect.sh:363 git-bisect.sh:490 msgid "We are not bisecting." msgstr "Vi utför ingen bisect för tillfället." -#: git-bisect.sh:354 +#: git-bisect.sh:370 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "\"$invalid\" är inte en giltig incheckning" -#: git-bisect.sh:363 +#: git-bisect.sh:379 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" @@ -8874,25 +9404,25 @@ msgstr "" "Kunde inte checka ut original-HEAD \"$branch\".\n" "Försök \"git bisect reset <incheckning>\"." -#: git-bisect.sh:390 +#: git-bisect.sh:406 msgid "No logfile given" msgstr "Ingen loggfil angiven" -#: git-bisect.sh:391 +#: git-bisect.sh:407 #, sh-format msgid "cannot read $file for replaying" msgstr "kan inte läsa $file för uppspelning" -#: git-bisect.sh:408 +#: git-bisect.sh:424 msgid "?? what are you talking about?" msgstr "?? vad menar du?" -#: git-bisect.sh:420 +#: git-bisect.sh:436 #, sh-format msgid "running $command" msgstr "kör $command" -#: git-bisect.sh:427 +#: git-bisect.sh:443 #, sh-format msgid "" "bisect run failed:\n" @@ -8901,11 +9431,11 @@ msgstr "" "\"bisect\"-körningen misslyckades:\n" "felkod $res från \"$command\" är < 0 eller >= 128" -#: git-bisect.sh:453 +#: git-bisect.sh:469 msgid "bisect run cannot continue any more" msgstr "\"bisect\"-körningen kan inte fortsätta längre" -#: git-bisect.sh:459 +#: git-bisect.sh:475 #, sh-format msgid "" "bisect run failed:\n" @@ -8914,7 +9444,7 @@ msgstr "" "\"bisect\"-körningen misslyckades:\n" "\"bisect_state $state\" avslutades med felkoden $res" -#: git-bisect.sh:466 +#: git-bisect.sh:482 msgid "bisect run success" msgstr "\"bisect\"-körningen lyckades" @@ -8932,7 +9462,7 @@ msgstr "" msgid "Pull is not possible because you have unmerged files." msgstr "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in." -#: git-pull.sh:197 +#: git-pull.sh:203 msgid "updating an unborn branch with changes added to the index" msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet" @@ -8940,7 +9470,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:229 +#: git-pull.sh:235 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -8951,11 +9481,11 @@ msgstr "" "Varning: snabbspolar din arbetskatalog från\n" "Varning: incheckningen $orig_head." -#: git-pull.sh:254 +#: git-pull.sh:260 msgid "Cannot merge multiple branches into empty head" msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: git-pull.sh:258 +#: git-pull.sh:264 msgid "Cannot rebase onto multiple branches" msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar" @@ -9212,38 +9742,38 @@ msgstr "Inget grennamn angavs" msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" -#: git-submodule.sh:89 +#: git-submodule.sh:91 #, 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:168 +#: git-submodule.sh:196 #, 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:211 +#: git-submodule.sh:239 #, 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:223 +#: git-submodule.sh:251 #, 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:316 +#: git-submodule.sh:349 #, 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:333 +#: git-submodule.sh:366 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:337 +#: git-submodule.sh:370 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -9254,22 +9784,22 @@ msgstr "" "$sm_path\n" "Använd -f om du verkligen vill lägga till den" -#: git-submodule.sh:355 +#: git-submodule.sh:388 #, 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:357 +#: git-submodule.sh:390 #, 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:365 +#: git-submodule.sh:398 #, 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 +#: git-submodule.sh:400 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" @@ -9277,14 +9807,14 @@ msgstr "" "För att återanvända den lokala git-katalogen istället för att på nytt klona " "från" -#: git-submodule.sh:369 +#: git-submodule.sh:402 #, 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 +#: git-submodule.sh:403 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " @@ -9293,154 +9823,261 @@ msgstr "" "eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--name" "\"." -#: git-submodule.sh:372 +#: git-submodule.sh:405 #, 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 +#: git-submodule.sh:417 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:389 +#: git-submodule.sh:422 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:394 +#: git-submodule.sh:431 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:437 +#: git-submodule.sh:474 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "Går in i \"$prefix$sm_path\"" -#: git-submodule.sh:451 +#: git-submodule.sh:488 #, 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:495 +#: git-submodule.sh:532 #, 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:504 +#: git-submodule.sh:541 #, 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:506 +#: git-submodule.sh:543 #, 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:514 +#: git-submodule.sh:551 #, 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:588 +#, sh-format +msgid "Use '.' if you really want to deinitialize all submodules" +msgstr "Använd \".\" om du verkligen vill avinitiera alla undermoduler" + +#: git-submodule.sh:603 +#, sh-format +msgid "Submodule work tree '$sm_path' contains a .git directory" +msgstr "Undermodulens arbetskatalog \"$sm_path\" innehåller katalogen \".git\"" + +#: git-submodule.sh:604 +#, sh-format +msgid "" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "" +"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" + +#: git-submodule.sh:610 +#, sh-format +msgid "" +"Submodule work tree '$sm_path' contains local modifications; use '-f' to " +"discard them" +msgstr "" +"Undermodulens arbetskatalog \"$sm_path\" har lokala ändringar; \"-f\" kastar " +"bort dem" + +#: git-submodule.sh:613 +#, sh-format +msgid "Cleared directory '$sm_path'" +msgstr "Rensade katalogen \"$sm_path\"" + #: git-submodule.sh:614 #, sh-format +msgid "Could not remove submodule work tree '$sm_path'" +msgstr "Kunde inte ta bort underkatalogens arbetskatalog \"$sm_path\"" + +#: git-submodule.sh:617 +#, sh-format +msgid "Could not create empty submodule directory '$sm_path'" +msgstr "Kunde inte skapa tom undermodulskatalog \"$sm_path\"" + +#: git-submodule.sh:626 +#, sh-format +msgid "Submodule '$name' ($url) unregistered for path '$sm_path'" +msgstr "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$sm_path\"" + +#: git-submodule.sh:731 +#, sh-format msgid "" -"Submodule path '$sm_path' not initialized\n" +"Submodule path '$prefix$sm_path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -"Undermodulen \"$sm_path\" har inte initierats\n" +"Undermodulen \"$prefix$sm_path\" har inte initierats\n" "Kanske du vill köra \"update --init\"?" -#: git-submodule.sh:627 +#: git-submodule.sh:744 #, 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\"" +msgid "Unable to find current revision in submodule path '$prefix$sm_path'" +msgstr "" +"Kan inte hitta aktuell revision i undermodulsökvägen \"$prefix$sm_path\"" -#: git-submodule.sh:646 +#: git-submodule.sh:753 #, 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:660 +#: git-submodule.sh:777 #, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" -msgstr "Kan inte ombasera \"$sha1\" i undermodulsökväg \"$sm_path\"" +msgid "Unable to fetch in submodule path '$prefix$sm_path'" +msgstr "Kan inte hämta i undermodulsökväg \"$prefix$sm_path\"" -#: git-submodule.sh:661 +#: git-submodule.sh:791 #, sh-format -msgid "Submodule path '$sm_path': rebased into '$sha1'" -msgstr "Undermodulsökvägen \"$sm_path\": ombaserade in i \"$sha1\"" +msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'" +msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$prefix$sm_path\"" -#: git-submodule.sh:666 +#: git-submodule.sh:792 #, sh-format -msgid "Unable to merge '$sha1' in submodule path '$sm_path'" -msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$sm_path\"" +msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'" +msgstr "Undermodulsökvägen \"$prefix$sm_path\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:667 +#: git-submodule.sh:797 #, sh-format -msgid "Submodule path '$sm_path': merged in '$sha1'" -msgstr "Undermodulsökvägen \"$sm_path\": sammanslagen i \"$sha1\"" +msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'" +msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$prefix$sm_path\"" -#: git-submodule.sh:672 +#: git-submodule.sh:798 #, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" -msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$sm_path\"" +msgid "Submodule path '$prefix$sm_path': merged in '$sha1'" +msgstr "Undermodulsökvägen \"$prefix$sm_path\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:673 +#: git-submodule.sh:803 #, sh-format -msgid "Submodule path '$sm_path': checked out '$sha1'" -msgstr "Undermodulsökvägen \"$sm_path\": checkade ut \"$sha1\"" +msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'" +msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$prefix$sm_path\"" -#: git-submodule.sh:695 git-submodule.sh:1017 +#: git-submodule.sh:804 #, sh-format -msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" +msgid "Submodule path '$prefix$sm_path': checked out '$sha1'" +msgstr "Undermodulsökvägen \"$prefix$sm_path\": checkade ut \"$sha1\"" -#: git-submodule.sh:803 +#: git-submodule.sh:831 +#, sh-format +msgid "Failed to recurse into submodule path '$prefix$sm_path'" +msgstr "Misslyckades rekursera in i undermodulsökvägen \"$prefix$sm_path\"" + +#: git-submodule.sh:939 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:843 +#: git-submodule.sh:979 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:861 +#: git-submodule.sh:997 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " Varning: $name innehåller inte incheckning $sha1_src" -#: git-submodule.sh:864 +#: git-submodule.sh:1000 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " Varning: $name innehåller inte incheckning $sha1_dst" -#: git-submodule.sh:867 +#: git-submodule.sh:1003 #, 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:892 +#: git-submodule.sh:1028 msgid "blob" msgstr "blob" -#: git-submodule.sh:930 -msgid "# Submodules changed but not updated:" -msgstr "# Undermoduler ändrade men inte uppdaterade:" +#: git-submodule.sh:1066 +msgid "Submodules changed but not updated:" +msgstr "Undermoduler ändrade men inte uppdaterade:" -#: git-submodule.sh:932 -msgid "# Submodule changes to be committed:" -msgstr "# Undermodulers ändringar att checka in:" +#: git-submodule.sh:1068 +msgid "Submodule changes to be committed:" +msgstr "Undermodulers ändringar att checka in:" -#: git-submodule.sh:1080 +#: git-submodule.sh:1153 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" +msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" + +#: git-submodule.sh:1216 #, sh-format msgid "Synchronizing submodule url for '$prefix$sm_path'" msgstr "Synkroniserar undermodul-url för \"$prefix$sm_path\"" +#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'" +#~ msgstr "Det tog %.2f sekunder att räkna ospårade filer. \"status -uno\"" + +#~ msgid "may speed it up, but you have to be careful not to forget to add" +#~ msgstr "kanske gör det snabbare, men du måste vara försiktig så att du" + +#~ msgid "new files yourself (see 'git help status')." +#~ msgstr "inte glömmer lägga till filer själv (se \"git help status\")" + +#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" +#~ msgstr "" +#~ "git shortlog [-n] [-s] [-e] [-w] [rev-flaggor] [--] [<incheckning-id>... ]" + +#~ 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." + +#~ msgid "use any ref in .git/refs" +#~ msgstr "använd alla referenser i .git/refs" + +#~ msgid "use any tag in .git/refs/tags" +#~ msgstr "använd alla taggar i .git/refs/tags" + +#~ msgid "bad object %s" +#~ msgstr "felaktigt objekt %s" + +#~ msgid "bogus committer info %s" +#~ msgstr "felaktig incheckarinformation %s" + +#~ msgid "can't fdopen 'show' output fd" +#~ msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag" + +#~ msgid "failed to close pipe to 'show' for object '%s'" +#~ msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\"" + +#~ msgid "You do not have a valid HEAD" +#~ msgstr "Du har ingen giltig HEAD" + +#~ msgid "oops" +#~ msgstr "hoppsan" + +#~ msgid "Would not remove %s\n" +#~ msgstr "Skulle inte ta bort %s\n" + +#~ msgid "Not removing %s\n" +#~ msgstr "Tar inte bort %s\n" + +#~ msgid "Could not read index" +#~ msgstr "Kunde inte läsa indexet" + #~ msgid "git remote set-head <name> (-a | -d | <branch>])" #~ msgstr "git remote set-head <namn> (-a | -d | <gren>])" @@ -9527,9 +10164,6 @@ msgstr "Synkroniserar undermodul-url för \"$prefix$sm_path\"" #~ msgid "# Changed but not updated:" #~ msgstr "# Ändrade men inte uppdaterade:" -#~ msgid "A branch named '%s' already exists." -#~ msgstr "Det finns redan en gren som heter \"%s\"" - #~ msgid "path '%s' does not have all 3 versions" #~ msgstr "sökvägen \"%s\" har inte alla 3 versionerna" @@ -9592,9 +10226,6 @@ msgstr "Synkroniserar undermodul-url för \"$prefix$sm_path\"" #~ msgid "Could not extract author time from %s" #~ msgstr "Kunde inte hämta författartid från %s" -#~ msgid "No author information found in %s" -#~ msgstr "Hittade ingen författarinformation i %s" - #~ msgid "cherry-pick --ff cannot be used with --signoff" #~ msgstr "cherry-pick --ff kan inte användas med --signoff" |