diff options
| -rw-r--r-- | po/sv.po | 3136 |
1 files changed, 1682 insertions, 1454 deletions
@@ -7,10 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: git 2.6.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-09-05 09:16+0800\n" -"PO-Revision-Date: 2015-09-09 21:45+0100\n" +"POT-Creation-Date: 2015-12-11 23:36+0800\n" +"PO-Revision-Date: 2015-12-18 09:06+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" -"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" +"Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,13 +31,13 @@ msgstr "" "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n" "som lämpligt för att ange lösning och checka in." -#: advice.c:101 builtin/merge.c:1227 +#: advice.c:101 builtin/merge.c:1225 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." #: advice.c:103 -msgid "Please, commit your changes before you can merge." -msgstr "Ange ett incheckningsmeddelande för dina ändringar." +msgid "Please, commit your changes before merging." +msgstr "Checka in dina ändringar innan du utför sammanslagningen." #: advice.c:104 msgid "Exiting because of unfinished merge." @@ -62,76 +62,76 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: archive.c:428 +#: archive.c:429 msgid "fmt" msgstr "fmt" -#: archive.c:428 +#: archive.c:429 msgid "archive format" msgstr "arkivformat" -#: archive.c:429 builtin/log.c:1229 +#: archive.c:430 builtin/log.c:1228 msgid "prefix" msgstr "prefix" -#: archive.c:430 +#: archive.c:431 msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516 -#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535 +#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987 +#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395 #: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153 msgid "file" msgstr "fil" -#: archive.c:432 builtin/archive.c:89 +#: archive.c:433 builtin/archive.c:89 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:434 +#: archive.c:435 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:435 +#: archive.c:436 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:436 +#: archive.c:437 msgid "store only" msgstr "endast spara" -#: archive.c:437 +#: archive.c:438 msgid "compress faster" msgstr "komprimera snabbare" -#: archive.c:445 +#: archive.c:446 msgid "compress better" msgstr "komprimera bättre" -#: archive.c:448 +#: archive.c:449 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77 msgid "repo" msgstr "arkiv" -#: archive.c:451 builtin/archive.c:91 +#: archive.c:452 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479 msgid "command" msgstr "kommando" -#: archive.c:453 builtin/archive.c:93 +#: archive.c:454 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" @@ -143,83 +143,83 @@ msgstr "" "Negativa mönster ignoreras i git-attribut\n" "Använd '\\!' för att inleda med ett utropstecken." -#: branch.c:60 +#: branch.c:61 #, 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:83 +#: branch.c:84 #, 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:84 +#: branch.c:85 #, 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:88 +#: branch.c:89 #, 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:89 +#: branch.c:90 #, 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:94 +#: branch.c:95 #, 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:95 +#: branch.c:96 #, 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:99 +#: branch.c:100 #, 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:100 +#: branch.c:101 #, 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:133 +#: branch.c:134 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "Spårar inte: tvetydig information för referensen %s" -#: branch.c:162 +#: branch.c:163 #, c-format msgid "'%s' is not a valid branch name." msgstr "\"%s\" är inte ett giltigt grennamn." -#: branch.c:167 +#: branch.c:168 #, c-format msgid "A branch named '%s' already exists." msgstr "Det finns redan en gren som heter \"%s\"" -#: branch.c:175 +#: branch.c:176 msgid "Cannot force update the current branch." msgstr "Kan inte tvinga uppdatering av aktuell gren." -#: branch.c:195 +#: branch.c:196 #, 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:197 +#: branch.c:198 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte" -#: branch.c:199 +#: branch.c:200 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -239,22 +239,22 @@ msgstr "" "spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n" "för att ställa in uppströmskonfigurationen när du sänder in." -#: branch.c:243 +#: branch.c:244 #, c-format msgid "Not a valid object name: '%s'." msgstr "Objektnamnet är inte giltigt: \"%s\"." -#: branch.c:263 +#: branch.c:264 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Objektnamnet är tvetydigt: \"%s\"." -#: branch.c:268 +#: branch.c:269 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten är inte giltig: \"%s\"" -#: branch.c:399 +#: branch.c:322 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad på \"%s\"" @@ -269,7 +269,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:765 +#: bundle.c:87 builtin/commit.c:766 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -278,9 +278,9 @@ msgstr "kunde inte öppna \"%s\"" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708 -#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334 -#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358 +#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083 +#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334 +#: builtin/log.c:849 builtin/log.c:1456 builtin/log.c:1689 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -320,7 +320,7 @@ msgstr "rev-list dog" msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -338,13 +338,13 @@ msgstr "kan inte skapa \"%s\"" msgid "index-pack died" msgstr "index-pack dog" -#: color.c:260 +#: color.c:275 #, c-format msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1489 -#: builtin/am.c:2101 +#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520 +#: builtin/am.c:2149 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -502,22 +502,22 @@ msgstr "kunde inte läsa orderfilen \"%s\"" msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" -#: diff.c:116 +#: diff.c:115 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:121 +#: diff.c:120 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:216 +#: diff.c:215 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:268 +#: diff.c:267 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -526,16 +526,16 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:2998 +#: diff.c:3000 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:3394 +#: diff.c:3396 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:3557 +#: diff.c:3559 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -544,16 +544,16 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3571 +#: diff.c:3573 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: dir.c:1853 +#: dir.c:1915 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:1936 +#: dir.c:1998 msgid "Untracked cache is disabled on this system." msgstr "Ospårad cache är inaktiverad på detta system." @@ -662,8 +662,8 @@ msgstr "%s: %s - %s" msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:94 builtin/am.c:1974 builtin/am.c:2009 builtin/checkout.c:375 -#: builtin/checkout.c:586 builtin/clone.c:715 +#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376 +#: builtin/checkout.c:587 builtin/clone.c:722 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -681,64 +681,64 @@ msgstr "addinfo_cache misslyckades för sökvägen \"%s\"" msgid "error building trees" msgstr "fel vid byggande av träd" -#: merge-recursive.c:687 +#: merge-recursive.c:686 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:698 +#: merge-recursive.c:697 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Tar bort %s för att göra plats för underkatalog\n" -#: merge-recursive.c:712 merge-recursive.c:733 +#: merge-recursive.c:711 merge-recursive.c:732 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:723 +#: merge-recursive.c:722 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:763 +#: merge-recursive.c:762 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:765 +#: merge-recursive.c:764 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:788 builtin/clone.c:364 +#: merge-recursive.c:787 builtin/clone.c:369 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: merge-recursive.c:796 +#: merge-recursive.c:795 #, c-format msgid "failed to symlink '%s'" msgstr "misslyckades skapa symboliska länken \"%s\"" -#: merge-recursive.c:799 +#: merge-recursive.c:798 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" skall hanteras" -#: merge-recursive.c:937 +#: merge-recursive.c:936 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:941 +#: merge-recursive.c:940 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:957 +#: merge-recursive.c:956 msgid "unsupported object type in the tree" msgstr "objekttyp som ej stöds upptäcktes i trädet" -#: merge-recursive.c:1032 merge-recursive.c:1046 +#: merge-recursive.c:1031 merge-recursive.c:1045 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -747,7 +747,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet." -#: merge-recursive.c:1038 merge-recursive.c:1051 +#: merge-recursive.c:1037 merge-recursive.c:1050 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -756,20 +756,20 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet vid %s." -#: merge-recursive.c:1092 +#: merge-recursive.c:1091 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1092 +#: merge-recursive.c:1091 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1148 +#: merge-recursive.c:1147 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s är en katalog i %s lägger till som %s istället" -#: merge-recursive.c:1170 +#: merge-recursive.c:1169 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -778,144 +778,144 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1175 +#: merge-recursive.c:1174 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1229 +#: merge-recursive.c:1228 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s" -#: merge-recursive.c:1259 +#: merge-recursive.c:1258 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Byter namn på %s till %s och %s till %s istället" -#: merge-recursive.c:1458 +#: merge-recursive.c:1457 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s" -#: merge-recursive.c:1468 +#: merge-recursive.c:1467 #, c-format msgid "Adding merged %s" msgstr "Lägger till sammanslagen %s" -#: merge-recursive.c:1473 merge-recursive.c:1671 +#: merge-recursive.c:1472 merge-recursive.c:1674 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:1524 +#: merge-recursive.c:1523 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:1527 +#: merge-recursive.c:1526 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:1575 +#: merge-recursive.c:1578 msgid "modify" msgstr "ändra" -#: merge-recursive.c:1575 +#: merge-recursive.c:1578 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:1585 +#: merge-recursive.c:1588 msgid "content" msgstr "innehåll" -#: merge-recursive.c:1592 +#: merge-recursive.c:1595 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:1626 +#: merge-recursive.c:1629 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:1640 +#: merge-recursive.c:1643 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1644 git-submodule.sh:1150 +#: merge-recursive.c:1647 git-submodule.sh:1025 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:1645 +#: merge-recursive.c:1648 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:1731 +#: merge-recursive.c:1734 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:1756 +#: merge-recursive.c:1759 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:1762 +#: merge-recursive.c:1765 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:1767 +#: merge-recursive.c:1770 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s" -#: merge-recursive.c:1777 +#: merge-recursive.c:1780 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1794 +#: merge-recursive.c:1797 msgid "Fatal merge failure, shouldn't happen." msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa." -#: merge-recursive.c:1813 +#: merge-recursive.c:1816 msgid "Already up-to-date!" msgstr "Redan à jour!" -#: merge-recursive.c:1822 +#: merge-recursive.c:1825 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:1852 +#: merge-recursive.c:1855 #, c-format msgid "Unprocessed path??? %s" msgstr "Obehandlad sökväg??? %s" -#: merge-recursive.c:1900 +#: merge-recursive.c:1903 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:1913 +#: merge-recursive.c:1916 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "hittade %u gemensam förfader:" msgstr[1] "hittade %u gemensamma förfäder:" -#: merge-recursive.c:1950 +#: merge-recursive.c:1953 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2007 +#: merge-recursive.c:2010 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2018 builtin/merge.c:645 +#: merge-recursive.c:2021 builtin/merge.c:645 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -945,31 +945,41 @@ msgstr "Felaktigt värde på %s: \"%s\"" msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" -#: parse-options.c:563 +#: parse-options.c:570 msgid "..." msgstr "..." -#: parse-options.c:581 +#: parse-options.c:588 #, 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:585 +#: parse-options.c:592 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:588 +#: parse-options.c:595 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:622 +#: parse-options.c:629 msgid "-NUM" msgstr "-TAL" +#: parse-options-cb.c:108 +#, c-format +msgid "malformed object name '%s'" +msgstr "felformat objektnamn \"%s\"" + +#: path.c:752 +#, c-format +msgid "Could not make %s writable by group" +msgstr "Kunde inte göra %s skrivbar för gruppen" + #: pathspec.c:133 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" @@ -1039,11 +1049,11 @@ msgstr "" msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: progress.c:236 +#: progress.c:235 msgid "done" msgstr "klart" -#: read-cache.c:1296 +#: read-cache.c:1281 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1052,7 +1062,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1306 +#: read-cache.c:1291 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1061,118 +1071,163 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 +#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 #: builtin/merge.c:983 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: refs.c:3001 +#: refs/files-backend.c:2359 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs.c:3004 +#: refs/files-backend.c:2362 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" -#: refs.c:3013 +#: refs/files-backend.c:2371 #, c-format msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" -#: ref-filter.c:660 +#: ref-filter.c:245 +#, c-format +msgid "format: %%(end) atom used without corresponding atom" +msgstr "format: atomen %%(end) använd utan motsvarande atom" + +#: ref-filter.c:704 +#, c-format +msgid "positive value expected contents:lines=%s" +msgstr "positivt värde förväntat contents:lines=%s" + +#: ref-filter.c:833 +#, c-format +msgid "expected format: %%(color:<color>)" +msgstr "förväntat format: %%(color:<color>)" + +#: ref-filter.c:835 msgid "unable to parse format" msgstr "kan inte tolka formatet" -#: remote.c:792 +#: ref-filter.c:870 +#, c-format +msgid "expected format: %%(align:<width>,<position>)" +msgstr "förväntat format: %%(align:<bredd>,<position>)" + +#: ref-filter.c:893 +#, c-format +msgid "improper format entered align:%s" +msgstr "felaktigt format angivet align:%s" + +#: ref-filter.c:898 +#, c-format +msgid "positive width expected with the %%(align) atom" +msgstr "positiv bredd förväntad med atomen %%(align)" + +#: ref-filter.c:1219 +#, c-format +msgid "malformed object at '%s'" +msgstr "felformat objekt vid \"%s\"" + +#: ref-filter.c:1561 +#, c-format +msgid "format: %%(end) atom missing" +msgstr "format: atomen %%(end) saknas" + +#: ref-filter.c:1615 +#, c-format +msgid "malformed object name %s" +msgstr "felformat objektnamn %s" + +#: remote.c:756 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Kan inte hämta både %s och %s till %s" -#: remote.c:796 +#: remote.c:760 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:800 +#: remote.c:764 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:808 +#: remote.c:772 msgid "Internal error" msgstr "Internt fel" -#: remote.c:1723 remote.c:1766 +#: remote.c:1687 remote.c:1730 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1732 +#: remote.c:1696 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1735 +#: remote.c:1699 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1741 +#: remote.c:1705 #, 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" -#: remote.c:1756 +#: remote.c:1720 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren" -#: remote.c:1771 +#: remote.c:1735 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjärr för \"push\"" -#: remote.c:1782 +#: remote.c:1746 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" -#: remote.c:1795 +#: remote.c:1759 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1817 +#: remote.c:1781 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:2124 +#: remote.c:2083 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n" -#: remote.c:2128 +#: remote.c:2087 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:2131 +#: remote.c:2090 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:2135 +#: remote.c:2094 #, 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:2141 +#: remote.c:2100 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:2144 +#: remote.c:2103 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1182,11 +1237,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2152 +#: remote.c:2111 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:2155 +#: remote.c:2114 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1201,28 +1256,28 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2165 +#: remote.c:2124 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" -#: revision.c:2198 +#: revision.c:2191 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2201 +#: revision.c:2194 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar" -#: revision.c:2395 +#: revision.c:2388 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" -#: run-command.c:83 +#: run-command.c:90 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:85 +#: run-command.c:92 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) misslyckades" @@ -1440,7 +1495,7 @@ msgstr "kan inte bestämma HEAD" 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:887 builtin/apply.c:4291 +#: sequencer.c:887 builtin/apply.c:4287 #, c-format msgid "cannot open %s: %s" msgstr "kan inte öppna %s: %s" @@ -1482,12 +1537,12 @@ msgstr "Kan inte ångra som första incheckning" msgid "Can't cherry-pick into empty head" msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" -#: setup.c:243 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: sha1_name.c:453 +#: sha1_name.c:463 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -1534,7 +1589,7 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s" msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:1045 +#: submodule.c:1040 #, c-format msgid "Could not set core.worktree in %s" msgstr "Kunde inte sätta core.worktree i %s" @@ -1545,7 +1600,7 @@ msgstr "Kunde inte sätta core.worktree i %s" msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" -#: trailer.c:543 trailer.c:548 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:296 #, c-format msgid "more than one %s" msgstr "mer än en %s" @@ -1612,8 +1667,8 @@ msgstr "kunde inte öppna \"%s\" för läsning och skrivning" msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" -#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688 -#: builtin/merge.c:1076 builtin/pull.c:380 +#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691 +#: builtin/merge.c:1074 builtin/pull.c:380 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" @@ -1641,17 +1696,17 @@ msgstr "okänd användare" msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" -#: wrapper.c:631 +#: wrapper.c:647 #, c-format msgid "could not open %s for writing" msgstr "kunde inte öppna %s för skrivning" -#: wrapper.c:642 builtin/am.c:424 +#: wrapper.c:658 builtin/am.c:425 #, c-format msgid "could not write to %s" msgstr "kunde inte skriva till %s" -#: wrapper.c:648 +#: wrapper.c:664 #, c-format msgid "could not close %s" msgstr "kunde inte stänga %s" @@ -1994,27 +2049,27 @@ 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:1437 +#: wt-status.c:1438 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1445 +#: wt-status.c:1444 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå" -#: wt-status.c:1447 +#: wt-status.c:1446 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå" -#: wt-status.c:1452 +#: wt-status.c:1451 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1454 +#: wt-status.c:1453 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1457 +#: wt-status.c:1456 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." @@ -2101,23 +2156,23 @@ msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" msgid "nothing to commit, working directory clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1644 -msgid "HEAD (no branch)" -msgstr "HEAD (ingen gren)" - -#: wt-status.c:1650 +#: wt-status.c:1642 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1677 +#: wt-status.c:1646 +msgid "HEAD (no branch)" +msgstr "HEAD (ingen gren)" + +#: wt-status.c:1675 msgid "gone" msgstr "försvunnen" -#: wt-status.c:1679 wt-status.c:1687 +#: wt-status.c:1677 wt-status.c:1685 msgid "behind " msgstr "efter " -#: compat/precompose_utf8.c:55 builtin/clone.c:403 +#: compat/precompose_utf8.c:56 builtin/clone.c:408 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -2131,7 +2186,7 @@ msgstr "git add [<flaggor>] [--] <sökväg>..." msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:70 builtin/commit.c:277 +#: builtin/add.c:70 builtin/commit.c:278 msgid "updating files failed" msgstr "misslyckades uppdatera filer" @@ -2144,7 +2199,7 @@ msgstr "ta bort \"%s\"\n" msgid "Unstaged changes after refreshing the index:" msgstr "Ospårade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:194 builtin/rev-parse.c:799 +#: builtin/add.c:194 builtin/rev-parse.c:796 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" @@ -2179,15 +2234,15 @@ msgstr "Kunde inte tillämpa \"%s\"" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" -#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110 +#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110 #: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545 -#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19 -#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636 -#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114 +#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 +#: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "var pratsam" @@ -2195,7 +2250,7 @@ msgstr "var pratsam" msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286 msgid "select hunks interactively" msgstr "välj stycken interaktivt" @@ -2252,148 +2307,148 @@ msgstr "-A och -u är ömsesidigt inkompatibla" 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:358 +#: builtin/add.c:352 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:359 +#: builtin/add.c:353 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940 -#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938 +#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:40 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: builtin/am.c:41 +#: builtin/am.c:42 #, c-format msgid "could not stat %s" msgstr "kunde inte ta status på %s" -#: builtin/am.c:270 builtin/am.c:1318 builtin/commit.c:737 -#: builtin/merge.c:1079 +#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/am.c:444 +#: builtin/am.c:445 msgid "could not parse author script" msgstr "kunde inte tolka författarskript" -#: builtin/am.c:521 +#: builtin/am.c:522 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:562 builtin/notes.c:300 +#: builtin/am.c:563 builtin/notes.c:300 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:599 builtin/notes.c:315 +#: builtin/am.c:600 builtin/notes.c:315 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:625 +#: builtin/am.c:626 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:786 builtin/am.c:874 +#: builtin/am.c:787 builtin/am.c:875 #, c-format msgid "could not open '%s' for reading: %s" msgstr "kunde inte öppna \"%s\" för läsning: %s" -#: builtin/am.c:793 +#: builtin/am.c:794 #, c-format msgid "could not open '%s' for writing: %s" msgstr "Kunde inte öppna \"%s\" för skrivning: %s" -#: builtin/am.c:802 +#: builtin/am.c:803 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:867 +#: builtin/am.c:868 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: builtin/am.c:915 +#: builtin/am.c:916 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:918 builtin/am.c:926 +#: builtin/am.c:919 builtin/am.c:927 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:923 +#: builtin/am.c:924 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:1010 +#: builtin/am.c:1011 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:1015 builtin/clone.c:368 +#: builtin/am.c:1016 builtin/clone.c:373 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:1019 +#: builtin/am.c:1020 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1151 builtin/commit.c:362 +#: builtin/am.c:1152 builtin/commit.c:363 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1202 +#: builtin/am.c:1203 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "När du har löst problemet, kör \"%s --continue\"." -#: builtin/am.c:1203 +#: builtin/am.c:1204 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället." -#: builtin/am.c:1204 +#: builtin/am.c:1205 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"." -#: builtin/am.c:1312 +#: builtin/am.c:1343 msgid "Patch is empty. Was it split wrong?" msgstr "Patchen är tom. Delades den upp felaktigt?" -#: builtin/am.c:1386 builtin/log.c:1345 +#: builtin/am.c:1417 builtin/log.c:1344 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/am.c:1413 +#: builtin/am.c:1444 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: builtin/am.c:1587 +#: builtin/am.c:1646 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: builtin/am.c:1589 +#: builtin/am.c:1648 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1608 +#: builtin/am.c:1667 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2401,39 +2456,39 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1614 +#: builtin/am.c:1673 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1639 +#: builtin/am.c:1688 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1664 builtin/merge.c:632 +#: builtin/am.c:1712 builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/am.c:1671 +#: builtin/am.c:1719 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1684 builtin/commit.c:1752 builtin/merge.c:829 +#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829 #: builtin/merge.c:854 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/am.c:1716 builtin/am.c:1720 +#: builtin/am.c:1764 builtin/am.c:1768 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1736 +#: builtin/am.c:1784 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "kan inte vara interaktiv om standard in inte är ansluten till en terminal." -#: builtin/am.c:1741 +#: builtin/am.c:1789 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -2441,35 +2496,35 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1751 +#: builtin/am.c:1799 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " -#: builtin/am.c:1801 +#: builtin/am.c:1849 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1836 builtin/am.c:1907 +#: builtin/am.c:1884 builtin/am.c:1955 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1852 +#: builtin/am.c:1900 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1860 +#: builtin/am.c:1908 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1866 +#: builtin/am.c:1914 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "En kopia av patchen som misslyckades finns i: %s" -#: builtin/am.c:1910 +#: builtin/am.c:1958 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2479,7 +2534,7 @@ msgstr "" "Om det inte är något kvar att köa kan det hända att något annat redan\n" "introducerat samma ändringar; kanske du bör hoppa över patchen." -#: builtin/am.c:1917 +#: builtin/am.c:1965 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2487,17 +2542,17 @@ msgstr "" "Du har fortfarande sökvägar som inte slagits samman i ditt index.\n" "Glömde du använda \"git add\"?" -#: builtin/am.c:2025 builtin/am.c:2029 builtin/am.c:2041 builtin/reset.c:308 +#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"" -#: builtin/am.c:2077 +#: builtin/am.c:2125 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2111 +#: builtin/am.c:2159 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2505,150 +2560,152 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2172 +#: builtin/am.c:2220 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2194 -msgid "git am [options] [(<mbox>|<Maildir>)...]" -msgstr "git am [flaggor] [(<mbox>|<Maildir>)...]" +#: builtin/am.c:2253 +msgid "git am [<options>] [(<mbox>|<Maildir>)...]" +msgstr "git am [<flaggor>] [(<mbox>|<Maildir>)...]" -#: builtin/am.c:2195 -msgid "git am [options] (--continue | --skip | --abort)" -msgstr "git am [flaggor] (--continue | --skip | --abort)" +#: builtin/am.c:2254 +msgid "git am [<options>] (--continue | --skip | --abort)" +msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2201 +#: builtin/am.c:2260 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2203 +#: builtin/am.c:2262 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2205 +#: builtin/am.c:2264 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2206 builtin/init-db.c:509 builtin/prune-packed.c:57 +#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2208 +#: builtin/am.c:2267 msgid "add a Signed-off-by line to the commit message" msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2211 +#: builtin/am.c:2270 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2213 +#: builtin/am.c:2272 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2215 +#: builtin/am.c:2274 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2217 +#: builtin/am.c:2276 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2219 +#: builtin/am.c:2278 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet" -#: builtin/am.c:2222 +#: builtin/am.c:2281 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr" -#: builtin/am.c:2225 +#: builtin/am.c:2284 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2226 builtin/apply.c:4563 +#: builtin/am.c:2285 builtin/apply.c:4554 msgid "action" msgstr "åtgärd" -#: builtin/am.c:2227 builtin/am.c:2230 builtin/am.c:2233 builtin/am.c:2236 -#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248 -#: builtin/am.c:2254 +#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295 +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 +#: builtin/am.c:2313 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2235 builtin/apply.c:4587 +#: builtin/am.c:2294 builtin/apply.c:4578 msgid "root" msgstr "rot" -#: builtin/am.c:2238 builtin/am.c:2241 builtin/apply.c:4525 -#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93 -#: builtin/pull.c:167 +#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516 +#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93 +#: builtin/pull.c:167 builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 msgid "path" msgstr "sökväg" -#: builtin/am.c:2244 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672 -#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127 -#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664 -#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132 -#: parse-options.h:134 parse-options.h:243 +#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127 +#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645 +#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 +#: parse-options.h:134 parse-options.h:244 msgid "n" msgstr "n" -#: builtin/am.c:2247 builtin/apply.c:4531 +#: builtin/am.c:2306 builtin/apply.c:4522 msgid "num" msgstr "antal" -#: builtin/am.c:2250 builtin/for-each-ref.c:34 builtin/replace.c:438 +#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/tag.c:372 msgid "format" msgstr "format" -#: builtin/am.c:2251 +#: builtin/am.c:2310 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2257 +#: builtin/am.c:2316 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2259 +#: builtin/am.c:2318 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2262 +#: builtin/am.c:2321 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2265 +#: builtin/am.c:2324 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2268 +#: builtin/am.c:2327 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2272 +#: builtin/am.c:2331 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2274 +#: builtin/am.c:2333 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2276 builtin/commit.c:1590 builtin/merge.c:225 -#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606 +#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225 +#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2277 +#: builtin/am.c:2336 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2280 +#: builtin/am.c:2339 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2295 +#: builtin/am.c:2354 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -2656,16 +2713,16 @@ msgstr "" "Flaggan -b/--binary har varit utan funktion länge, och\n" "kommer tas bort. Vi ber dig att inte använda den längre." -#: builtin/am.c:2302 +#: builtin/am.c:2361 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2317 +#: builtin/am.c:2376 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs." -#: builtin/am.c:2341 +#: builtin/am.c:2400 #, c-format msgid "" "Stray %s directory found.\n" @@ -2674,7 +2731,7 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2347 +#: builtin/am.c:2406 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." @@ -2682,62 +2739,62 @@ msgstr "Lösningsoperation pågår inte, vi återupptar inte." msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<flaggor>] [<patch>...]" -#: builtin/apply.c:112 +#: builtin/apply.c:111 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "okänt alternativ för whitespace: \"%s\"" -#: builtin/apply.c:127 +#: builtin/apply.c:126 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: builtin/apply.c:822 +#: builtin/apply.c:818 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: builtin/apply.c:831 +#: builtin/apply.c:827 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: builtin/apply.c:912 +#: builtin/apply.c:908 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: builtin/apply.c:944 +#: builtin/apply.c:940 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d" -#: builtin/apply.c:949 +#: builtin/apply.c:945 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" -#: builtin/apply.c:956 +#: builtin/apply.c:952 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" -#: builtin/apply.c:1419 +#: builtin/apply.c:1415 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: builtin/apply.c:1476 +#: builtin/apply.c:1472 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: builtin/apply.c:1493 +#: builtin/apply.c:1489 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2753,77 +2810,77 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: builtin/apply.c:1659 +#: builtin/apply.c:1655 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: builtin/apply.c:1661 +#: builtin/apply.c:1657 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: builtin/apply.c:1687 +#: builtin/apply.c:1683 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: builtin/apply.c:1723 +#: builtin/apply.c:1719 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: builtin/apply.c:1725 +#: builtin/apply.c:1721 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: builtin/apply.c:1728 +#: builtin/apply.c:1724 #, 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:1874 +#: builtin/apply.c:1870 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: builtin/apply.c:1903 +#: builtin/apply.c:1899 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: builtin/apply.c:2054 +#: builtin/apply.c:2050 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: builtin/apply.c:2144 +#: builtin/apply.c:2140 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/apply.c:2148 +#: builtin/apply.c:2144 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: builtin/apply.c:2781 +#: builtin/apply.c:2777 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: builtin/apply.c:2900 +#: builtin/apply.c:2896 #, 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:2912 +#: builtin/apply.c:2908 #, 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:2918 +#: builtin/apply.c:2914 #, c-format msgid "" "while searching for:\n" @@ -2832,319 +2889,319 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: builtin/apply.c:2938 +#: builtin/apply.c:2934 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: builtin/apply.c:3039 +#: builtin/apply.c:3035 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: builtin/apply.c:3045 +#: builtin/apply.c:3041 #, 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:3066 +#: builtin/apply.c:3062 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: builtin/apply.c:3190 +#: builtin/apply.c:3186 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291 +#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 #, c-format msgid "read of %s failed" msgstr "misslyckades läsa %s" -#: builtin/apply.c:3243 +#: builtin/apply.c:3239 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk" -#: builtin/apply.c:3271 builtin/apply.c:3493 +#: builtin/apply.c:3267 builtin/apply.c:3489 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: builtin/apply.c:3352 builtin/apply.c:3507 +#: builtin/apply.c:3348 builtin/apply.c:3503 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521 +#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3361 builtin/apply.c:3515 +#: builtin/apply.c:3357 builtin/apply.c:3511 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: builtin/apply.c:3463 +#: builtin/apply.c:3459 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: builtin/apply.c:3532 +#: builtin/apply.c:3528 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: builtin/apply.c:3534 +#: builtin/apply.c:3530 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: builtin/apply.c:3693 builtin/apply.c:3695 +#: builtin/apply.c:3689 builtin/apply.c:3691 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg: %s" -#: builtin/apply.c:3750 +#: builtin/apply.c:3746 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: builtin/apply.c:3753 +#: builtin/apply.c:3749 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: builtin/apply.c:3773 +#: builtin/apply.c:3769 #, 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:3778 +#: builtin/apply.c:3774 #, 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:3798 +#: builtin/apply.c:3794 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk" -#: builtin/apply.c:3802 +#: builtin/apply.c:3798 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: builtin/apply.c:3816 +#: builtin/apply.c:3812 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135 +#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: builtin/apply.c:4052 +#: builtin/apply.c:4048 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: builtin/apply.c:4081 +#: builtin/apply.c:4077 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: builtin/apply.c:4085 +#: builtin/apply.c:4081 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: builtin/apply.c:4090 +#: builtin/apply.c:4086 #, 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:4093 builtin/apply.c:4201 +#: builtin/apply.c:4089 builtin/apply.c:4197 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: builtin/apply.c:4126 +#: builtin/apply.c:4122 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: builtin/apply.c:4175 +#: builtin/apply.c:4171 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: builtin/apply.c:4262 +#: builtin/apply.c:4258 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: builtin/apply.c:4270 +#: builtin/apply.c:4266 msgid "internal error" msgstr "internt fel" -#: builtin/apply.c:4273 +#: builtin/apply.c:4269 #, 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:4283 +#: builtin/apply.c:4279 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: builtin/apply.c:4304 +#: builtin/apply.c:4300 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: builtin/apply.c:4307 +#: builtin/apply.c:4303 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: builtin/apply.c:4397 +#: builtin/apply.c:4393 msgid "unrecognized input" msgstr "indata känns inte igen" -#: builtin/apply.c:4408 +#: builtin/apply.c:4404 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: builtin/apply.c:4526 +#: builtin/apply.c:4517 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: builtin/apply.c:4529 +#: builtin/apply.c:4520 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: builtin/apply.c:4532 +#: builtin/apply.c:4523 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:4535 +#: builtin/apply.c:4526 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: builtin/apply.c:4537 +#: builtin/apply.c:4528 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:4541 +#: builtin/apply.c:4532 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: builtin/apply.c:4543 +#: builtin/apply.c:4534 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:4545 +#: builtin/apply.c:4536 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:4547 +#: builtin/apply.c:4538 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:4549 +#: builtin/apply.c:4540 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: builtin/apply.c:4551 +#: builtin/apply.c:4542 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: builtin/apply.c:4553 +#: builtin/apply.c:4544 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: builtin/apply.c:4555 +#: builtin/apply.c:4546 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:4557 +#: builtin/apply.c:4548 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412 +#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: builtin/apply.c:4562 +#: builtin/apply.c:4553 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: builtin/apply.c:4564 +#: builtin/apply.c:4555 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: builtin/apply.c:4567 builtin/apply.c:4570 +#: builtin/apply.c:4558 builtin/apply.c:4561 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: builtin/apply.c:4573 +#: builtin/apply.c:4564 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: builtin/apply.c:4575 +#: builtin/apply.c:4566 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: builtin/apply.c:4577 +#: builtin/apply.c:4568 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: builtin/apply.c:4579 +#: builtin/apply.c:4570 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: builtin/apply.c:4582 +#: builtin/apply.c:4573 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: builtin/apply.c:4585 +#: builtin/apply.c:4576 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: builtin/apply.c:4588 +#: builtin/apply.c:4579 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: builtin/apply.c:4610 +#: builtin/apply.c:4601 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: builtin/apply.c:4618 +#: builtin/apply.c:4609 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: builtin/apply.c:4621 +#: builtin/apply.c:4612 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: builtin/apply.c:4640 +#: builtin/apply.c:4631 #, c-format msgid "can't open patch '%s'" msgstr "kan inte öppna patchen \"%s\"" -#: builtin/apply.c:4654 +#: builtin/apply.c:4645 #, 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:4660 builtin/apply.c:4670 +#: builtin/apply.c:4651 builtin/apply.c:4661 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3206,95 +3263,95 @@ msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" -#: builtin/blame.c:2500 +#: builtin/blame.c:2519 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:2501 +#: builtin/blame.c:2520 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:2502 +#: builtin/blame.c:2521 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:2503 +#: builtin/blame.c:2522 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:2504 +#: builtin/blame.c:2523 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:2505 +#: builtin/blame.c:2524 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:2506 +#: builtin/blame.c:2525 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:2507 +#: builtin/blame.c:2526 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:2508 +#: builtin/blame.c:2527 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:2509 +#: builtin/blame.c:2528 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:2510 +#: builtin/blame.c:2529 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:2511 +#: builtin/blame.c:2530 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:2512 +#: builtin/blame.c:2531 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:2513 +#: builtin/blame.c:2532 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:2514 +#: builtin/blame.c:2533 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:2515 +#: builtin/blame.c:2534 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:2516 +#: builtin/blame.c:2535 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:2517 +#: builtin/blame.c:2536 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:2518 builtin/blame.c:2519 +#: builtin/blame.c:2537 builtin/blame.c:2538 msgid "score" msgstr "poäng" -#: builtin/blame.c:2518 +#: builtin/blame.c:2537 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:2519 +#: builtin/blame.c:2538 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:2520 +#: builtin/blame.c:2539 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2520 +#: builtin/blame.c:2539 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" @@ -3304,27 +3361,31 @@ msgstr "Behandla endast radintervallet n,m, med början på 1" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2601 +#: builtin/blame.c:2620 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" -#: builtin/branch.c:24 +#: builtin/branch.c:25 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..." -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>" -#: builtin/branch.c:150 +#: builtin/branch.c:29 +msgid "git branch [<options>] [-r | -a] [--points-at]" +msgstr "git branch [<flaggor>] [-r | -a] [--points-at]" + +#: builtin/branch.c:142 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3333,7 +3394,7 @@ msgstr "" "tar bort grenen \"%s\" som har slagits ihop med\n" " \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:154 +#: builtin/branch.c:146 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3342,12 +3403,12 @@ msgstr "" "tar inte bort grenen \"%s\" som inte har slagits ihop med\n" " \"%s\", trots att den har slagits ihop med HEAD." -#: builtin/branch.c:168 +#: builtin/branch.c:160 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" -#: builtin/branch.c:172 +#: builtin/branch.c:164 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3356,348 +3417,340 @@ msgstr "" "Grenen \"%s\" har inte slagits samman i sin helhet.\n" "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"." -#: builtin/branch.c:185 +#: builtin/branch.c:177 msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" -#: builtin/branch.c:213 +#: builtin/branch.c:205 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:219 +#: builtin/branch.c:211 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:227 +#: builtin/branch.c:219 #, 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:243 +#: builtin/branch.c:235 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "fjärrspårande grenen \"%s\" hittades inte." -#: builtin/branch.c:244 +#: builtin/branch.c:236 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:259 +#: builtin/branch.c:251 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\"" -#: builtin/branch.c:260 +#: builtin/branch.c:252 #, c-format msgid "Error deleting branch '%s'" msgstr "Fel vid borttagning av grenen \"%s\"" -#: builtin/branch.c:267 +#: builtin/branch.c:259 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" -#: builtin/branch.c:268 +#: builtin/branch.c:260 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:369 -#, c-format -msgid "branch '%s' does not point at a commit" -msgstr "grenen \"%s\" pekar inte på en incheckning" - -#: builtin/branch.c:452 +#: builtin/branch.c:303 #, c-format msgid "[%s: gone]" msgstr "[%s: försvunnen]" -#: builtin/branch.c:457 +#: builtin/branch.c:308 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:462 +#: builtin/branch.c:313 #, c-format msgid "[%s: behind %d]" msgstr "[%s: bakom %d] " -#: builtin/branch.c:464 +#: builtin/branch.c:315 #, c-format msgid "[behind %d]" msgstr "[bakom %d] " -#: builtin/branch.c:468 +#: builtin/branch.c:319 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: före %d] " -#: builtin/branch.c:470 +#: builtin/branch.c:321 #, c-format msgid "[ahead %d]" msgstr "[före %d] " -#: builtin/branch.c:473 +#: builtin/branch.c:324 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: före %d, bakom %d] " -#: builtin/branch.c:476 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d, behind %d]" msgstr "[före %d, bakom %d] " -#: builtin/branch.c:489 +#: builtin/branch.c:340 msgid " **** invalid ref ****" msgstr " **** ogiltig ref ****" -#: builtin/branch.c:580 +#: builtin/branch.c:366 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: builtin/branch.c:583 +#: builtin/branch.c:369 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" -#: builtin/branch.c:589 +#: builtin/branch.c:375 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frånkopplat vid %s)" -#: builtin/branch.c:592 +#: builtin/branch.c:378 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frånkopplat från %s)" -#: builtin/branch.c:596 +#: builtin/branch.c:382 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:643 -#, c-format -msgid "object '%s' does not point to a commit" -msgstr "objektet \"%s\" pekar på en incheckning" - -#: builtin/branch.c:691 -msgid "some refs could not be read" -msgstr "vissa referenser kunde inte läsas" - -#: builtin/branch.c:704 +#: builtin/branch.c:524 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:714 +#: builtin/branch.c:534 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:729 +#: builtin/branch.c:549 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:733 +#: builtin/branch.c:553 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:737 +#: builtin/branch.c:557 #, 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:744 +#: builtin/branch.c:564 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:759 -#, c-format -msgid "malformed object name %s" -msgstr "felformat objektnamn %s" - -#: builtin/branch.c:781 +#: builtin/branch.c:587 #, c-format msgid "could not write branch description template: %s" msgstr "kunde inte skriva grenbeskrivningsmall: %s" -#: builtin/branch.c:811 +#: builtin/branch.c:616 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:813 +#: builtin/branch.c:618 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:814 +#: builtin/branch.c:619 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:815 +#: builtin/branch.c:620 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:817 +#: builtin/branch.c:622 msgid "change upstream info" msgstr "ändra uppströmsinformation" -#: builtin/branch.c:821 +#: builtin/branch.c:626 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:822 +#: builtin/branch.c:627 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852 -#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581 -#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618 -#: builtin/tag.c:624 -msgid "commit" -msgstr "incheckning" - -#: builtin/branch.c:826 builtin/branch.c:832 +#: builtin/branch.c:629 builtin/branch.c:630 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:838 +#: builtin/branch.c:633 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:839 +#: builtin/branch.c:634 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:841 +#: builtin/branch.c:636 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:842 +#: builtin/branch.c:637 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:843 +#: builtin/branch.c:638 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:844 +#: builtin/branch.c:639 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:845 +#: builtin/branch.c:640 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:846 +#: builtin/branch.c:641 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:848 +#: builtin/branch.c:643 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:849 +#: builtin/branch.c:644 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:852 -msgid "print only not merged branches" -msgstr "visa endast ej sammanslagna grenar" - -#: builtin/branch.c:858 -msgid "print only merged branches" +#: builtin/branch.c:645 +msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:862 +#: builtin/branch.c:646 +msgid "print only branches that are not merged" +msgstr "visa endast ej sammanslagna grenar" + +#: builtin/branch.c:647 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:875 +#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366 +msgid "key" +msgstr "nyckel" + +#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367 +msgid "field name to sort on" +msgstr "fältnamn att sortera på" + +#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398 +#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564 +#: builtin/tag.c:369 +msgid "object" +msgstr "objekt" + +#: builtin/branch.c:652 +msgid "print only branches of the object" +msgstr "visa endast grenar för objektet" + +#: builtin/branch.c:670 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:879 builtin/clone.c:690 +#: builtin/branch.c:674 builtin/clone.c:697 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:901 +#: builtin/branch.c:694 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:912 builtin/branch.c:951 +#: builtin/branch.c:705 builtin/branch.c:747 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:927 +#: builtin/branch.c:723 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:932 +#: builtin/branch.c:728 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:939 +#: builtin/branch.c:735 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu" -#: builtin/branch.c:942 +#: builtin/branch.c:738 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:957 +#: builtin/branch.c:753 msgid "too many branches for a rename operation" msgstr "för många grenar för namnbyte" -#: builtin/branch.c:962 +#: builtin/branch.c:758 msgid "too many branches to set new upstream" msgstr "för många grenar för att byta uppström" -#: builtin/branch.c:966 +#: builtin/branch.c:762 #, 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:969 builtin/branch.c:991 builtin/branch.c:1012 +#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:973 +#: builtin/branch.c:769 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:985 +#: builtin/branch.c:781 msgid "too many branches to unset upstream" msgstr "för många grenar för att ta bort uppström" -#: builtin/branch.c:989 +#: builtin/branch.c:785 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:995 +#: builtin/branch.c:791 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:1009 +#: builtin/branch.c:805 msgid "it does not make sense to create 'HEAD' manually" msgstr "kan inte skapa \"HEAD\" manuellt" -#: builtin/branch.c:1015 +#: builtin/branch.c:811 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:1018 +#: builtin/branch.c:814 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3706,7 +3759,7 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to\n" -#: builtin/branch.c:1035 +#: builtin/branch.c:831 #, c-format msgid "" "\n" @@ -3717,12 +3770,12 @@ msgstr "" "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" "\n" -#: builtin/branch.c:1036 +#: builtin/branch.c:832 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1037 +#: builtin/branch.c:833 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3749,11 +3802,8 @@ msgstr "" "<typ>|--textconv) <objekt>" #: builtin/cat-file.c:429 -msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-" -"objects>" -msgstr "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] < <objektlista>" +msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" +msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]" #: builtin/cat-file.c:466 msgid "<type> can be one of: blob, tree, commit, tag" @@ -3809,8 +3859,8 @@ msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..." #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" -msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...] < <sökvägslista>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" +msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -3828,7 +3878,7 @@ msgstr "läs filnamn från standard in" msgid "terminate input and output records by a NUL character" msgstr "avsluta in- och utdataposter med NUL-tecken" -#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267 +#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -3914,6 +3964,8 @@ msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" #: builtin/checkout-index.c:204 builtin/column.c:30 +#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181 msgid "string" msgstr "sträng" @@ -3933,105 +3985,105 @@ msgstr "git checkout [<flaggor>] <gren>" msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..." -#: builtin/checkout.c:133 builtin/checkout.c:166 +#: builtin/checkout.c:134 builtin/checkout.c:167 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:135 builtin/checkout.c:168 +#: builtin/checkout.c:136 builtin/checkout.c:169 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:151 +#: builtin/checkout.c:152 #, 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:195 +#: builtin/checkout.c:196 #, 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:212 +#: builtin/checkout.c:213 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:229 +#: builtin/checkout.c:230 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 -#: builtin/checkout.c:259 +#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 +#: builtin/checkout.c:260 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar" -#: builtin/checkout.c:262 builtin/checkout.c:265 +#: builtin/checkout.c:263 builtin/checkout.c:266 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:268 +#: builtin/checkout.c:269 #, 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:279 builtin/checkout.c:473 +#: builtin/checkout.c:280 builtin/checkout.c:474 msgid "corrupt index file" msgstr "indexfilen är trasig" -#: builtin/checkout.c:339 builtin/checkout.c:346 +#: builtin/checkout.c:340 builtin/checkout.c:347 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:495 +#: builtin/checkout.c:496 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:622 +#: builtin/checkout.c:623 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:660 +#: builtin/checkout.c:661 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:667 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:670 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:674 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:676 builtin/checkout.c:1065 +#: builtin/checkout.c:677 builtin/checkout.c:1066 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:678 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:730 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:736 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4054,7 +4106,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:755 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4081,145 +4133,151 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:791 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:795 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:822 builtin/checkout.c:1060 +#: builtin/checkout.c:823 builtin/checkout.c:1061 msgid "You are on a branch yet to be born" msgstr "Du är på en gren som ännu inte är född" -#: builtin/checkout.c:967 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1006 builtin/worktree.c:210 +#: builtin/checkout.c:1007 builtin/worktree.c:213 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1035 +#: builtin/checkout.c:1036 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1074 +#: builtin/checkout.c:1075 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1077 builtin/checkout.c:1081 +#: builtin/checkout.c:1078 builtin/checkout.c:1082 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093 -#: builtin/checkout.c:1096 +#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094 +#: builtin/checkout.c:1097 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1102 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83 -#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317 -#: builtin/worktree.c:319 +#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320 +#: builtin/worktree.c:322 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1135 +#: builtin/checkout.c:1136 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1137 +#: builtin/checkout.c:1138 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1139 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1140 msgid "detach the HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1141 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1143 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1143 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1144 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1146 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1148 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1149 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:1149 builtin/merge.c:227 +#: builtin/checkout.c:1150 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249 +#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250 msgid "style" msgstr "stil" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1152 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1155 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1156 +#: builtin/checkout.c:1157 msgid "second guess 'git checkout <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1159 msgid "do not check if another worktree is holding the given ref" msgstr "" "kontrollera inte om en annan arbetskatalog håller den angivna referensen" -#: builtin/checkout.c:1181 +#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112 +#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560 +#: builtin/send-pack.c:168 +msgid "force progress reporting" +msgstr "tvinga förloppsrapportering" + +#: builtin/checkout.c:1191 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1198 +#: builtin/checkout.c:1208 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1203 +#: builtin/checkout.c:1213 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1239 +#: builtin/checkout.c:1249 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1256 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4228,12 +4286,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:1251 +#: builtin/checkout.c:1261 #, 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:1255 +#: builtin/checkout.c:1265 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4273,7 +4331,7 @@ msgstr "Skulle hoppa över arkivet %s\n" msgid "failed to remove %s" msgstr "misslyckades ta bort %s" -#: builtin/clean.c:317 +#: builtin/clean.c:315 msgid "" "Prompt help:\n" "1 - select a numbered item\n" @@ -4285,7 +4343,7 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" " - (tomt) markera ingenting" -#: builtin/clean.c:321 +#: builtin/clean.c:319 msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -4305,36 +4363,36 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering" -#: builtin/clean.c:537 +#: builtin/clean.c:535 #, c-format msgid "Huh (%s)?" msgstr "Vadå (%s)?" -#: builtin/clean.c:679 +#: builtin/clean.c:677 #, c-format msgid "Input ignore patterns>> " msgstr "Ange ignoreringsmönster>>" -#: builtin/clean.c:716 +#: builtin/clean.c:714 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "VARNING: Hittar inte poster som motsvarar: %s" -#: builtin/clean.c:737 +#: builtin/clean.c:735 msgid "Select items to delete" msgstr "Välj poster att ta bort" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:778 +#: builtin/clean.c:776 #, c-format msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]?" -#: builtin/clean.c:803 +#: builtin/clean.c:801 msgid "Bye." msgstr "Hej då." -#: builtin/clean.c:811 +#: builtin/clean.c:809 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -4352,62 +4410,62 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:838 +#: builtin/clean.c:836 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: builtin/clean.c:839 +#: builtin/clean.c:837 msgid "What now" msgstr "Vad nu" -#: builtin/clean.c:847 +#: builtin/clean.c:845 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Skulle ta bort följande post:" msgstr[1] "Skulle ta bort följande poster:" -#: builtin/clean.c:864 +#: builtin/clean.c:862 msgid "No more files to clean, exiting." msgstr "Inga fler filer att städa, avslutar." -#: builtin/clean.c:895 +#: builtin/clean.c:893 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:897 +#: builtin/clean.c:895 msgid "force" msgstr "tvinga" -#: builtin/clean.c:898 +#: builtin/clean.c:896 msgid "interactive cleaning" msgstr "städa interaktivt" -#: builtin/clean.c:900 +#: builtin/clean.c:898 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187 +#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709 +#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:902 +#: builtin/clean.c:900 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:903 +#: builtin/clean.c:901 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:905 +#: builtin/clean.c:903 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:923 +#: builtin/clean.c:921 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:927 +#: builtin/clean.c:925 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -4415,7 +4473,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:930 +#: builtin/clean.c:928 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -4427,16 +4485,11 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168 -msgid "force progress reporting" -msgstr "tvinga förloppsrapportering" - #: builtin/clone.c:59 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" @@ -4460,15 +4513,15 @@ msgstr "skapa som ett delat arkiv" msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:75 builtin/init-db.c:501 +#: builtin/clone.c:75 builtin/init-db.c:466 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:76 builtin/init-db.c:502 +#: builtin/clone.c:76 builtin/init-db.c:467 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:78 +#: builtin/clone.c:78 builtin/submodule--helper.c:179 msgid "reference repository" msgstr "referensarkiv" @@ -4492,7 +4545,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD" msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 #: builtin/pull.c:186 msgid "depth" msgstr "djup" @@ -4505,11 +4558,11 @@ msgstr "skapa en grund klon på detta djup" msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:91 builtin/init-db.c:510 +#: builtin/clone.c:91 builtin/init-db.c:475 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:92 builtin/init-db.c:511 +#: builtin/clone.c:92 builtin/init-db.c:476 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" @@ -4521,52 +4574,57 @@ msgstr "nyckel=värde" msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:298 +#: builtin/clone.c:300 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu." + +#: builtin/clone.c:302 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: builtin/clone.c:302 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: builtin/clone.c:305 +#: builtin/clone.c:310 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: builtin/clone.c:370 builtin/diff.c:84 +#: builtin/clone.c:375 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: builtin/clone.c:372 +#: builtin/clone.c:377 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:386 +#: builtin/clone.c:391 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:408 +#: builtin/clone.c:413 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:412 +#: builtin/clone.c:417 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:435 builtin/clone.c:619 +#: builtin/clone.c:442 builtin/clone.c:626 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:447 +#: builtin/clone.c:454 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4576,124 +4634,120 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och försöka checka ut igen med \"git checkout -f HEAD\"\n" -#: builtin/clone.c:524 +#: builtin/clone.c:531 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." # Vague original, not networking-related, but rather related to the actual # objects downloaded. -#: builtin/clone.c:614 +#: builtin/clone.c:621 #, c-format msgid "Checking connectivity... " msgstr "Kontrollerar om vi fick alla objekt..." -#: builtin/clone.c:617 +#: builtin/clone.c:624 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: builtin/clone.c:681 +#: builtin/clone.c:688 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:712 +#: builtin/clone.c:719 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:799 +#: builtin/clone.c:808 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:801 +#: builtin/clone.c:810 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:831 +#: builtin/clone.c:842 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:835 +#: builtin/clone.c:846 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:846 +#: builtin/clone.c:857 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:849 +#: builtin/clone.c:860 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:862 +#: builtin/clone.c:873 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:868 builtin/fetch.c:1168 +#: builtin/clone.c:879 builtin/fetch.c:1166 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:878 +#: builtin/clone.c:889 #, 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:888 +#: builtin/clone.c:899 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218 -#: builtin/worktree.c:245 +#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224 +#: builtin/worktree.c:221 builtin/worktree.c:248 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:906 +#: builtin/clone.c:917 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:924 +#: builtin/clone.c:935 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:926 +#: builtin/clone.c:937 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:951 -msgid "--dissociate given, but there is no --reference" -msgstr "--dissociate angavs, men --reference har inte angivits" - -#: builtin/clone.c:968 +#: builtin/clone.c:975 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:971 +#: builtin/clone.c:978 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:976 +#: builtin/clone.c:983 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:980 +#: builtin/clone.c:987 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:1029 builtin/clone.c:1037 +#: builtin/clone.c:1036 builtin/clone.c:1044 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1040 +#: builtin/clone.c:1047 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -4729,15 +4783,15 @@ msgstr "Spaltfyllnad mellan spalter" msgid "--command must be the first argument" msgstr "--command måste vara första argument" -#: builtin/commit.c:37 +#: builtin/commit.c:38 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<flaggor>] [--] <sökväg>..." -#: builtin/commit.c:42 +#: builtin/commit.c:43 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<flaggor>] [--] <sökväg>..." -#: builtin/commit.c:47 +#: builtin/commit.c:48 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4764,7 +4818,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:60 +#: builtin/commit.c:61 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4789,7 +4843,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:72 +#: builtin/commit.c:73 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -4799,7 +4853,7 @@ msgstr "" "blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n" "så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n" -#: builtin/commit.c:77 +#: builtin/commit.c:78 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -4813,11 +4867,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:84 +#: builtin/commit.c:85 msgid "Otherwise, please use 'git reset'\n" msgstr "Använd annars \"git reset\"\n" -#: builtin/commit.c:87 +#: builtin/commit.c:88 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -4833,66 +4887,66 @@ msgstr "" "\"git cherry-pick --continue\" kommer därefter att återuppta\n" "cherry-pick för återstående incheckningar.\n" -#: builtin/commit.c:304 +#: builtin/commit.c:305 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:345 +#: builtin/commit.c:346 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:351 +#: builtin/commit.c:352 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:364 +#: builtin/commit.c:365 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:366 +#: builtin/commit.c:367 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462 +#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:444 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:446 +#: builtin/commit.c:447 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:455 +#: builtin/commit.c:456 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:474 +#: builtin/commit.c:475 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:579 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:581 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:600 +#: builtin/commit.c:601 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:608 +#: builtin/commit.c:609 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: builtin/commit.c:652 +#: builtin/commit.c:653 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4900,38 +4954,38 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:701 builtin/shortlog.c:273 +#: builtin/commit.c:702 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:703 +#: builtin/commit.c:704 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:707 +#: builtin/commit.c:708 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:729 +#: builtin/commit.c:730 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:733 +#: builtin/commit.c:734 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:784 +#: builtin/commit.c:785 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:802 +#: builtin/commit.c:803 #, c-format msgid "" "\n" @@ -4946,7 +5000,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:807 +#: builtin/commit.c:808 #, c-format msgid "" "\n" @@ -4961,7 +5015,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:820 +#: builtin/commit.c:821 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4971,7 +5025,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:827 +#: builtin/commit.c:828 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4982,145 +5036,146 @@ msgstr "" "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:847 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:855 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:862 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:880 +#: builtin/commit.c:881 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:937 +#: builtin/commit.c:938 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:952 builtin/tag.c:495 +#: builtin/commit.c:953 builtin/tag.c:266 #, 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:1054 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare" -#: builtin/commit.c:1069 builtin/commit.c:1309 +#: builtin/commit.c:1070 builtin/commit.c:1310 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1106 +#: builtin/commit.c:1107 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1136 +#: builtin/commit.c:1137 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:1145 +#: builtin/commit.c:1146 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1148 +#: builtin/commit.c:1149 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:1150 +#: builtin/commit.c:1151 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:1153 +#: builtin/commit.c:1154 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1163 +#: builtin/commit.c:1164 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:1165 +#: builtin/commit.c:1166 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:1173 +#: builtin/commit.c:1174 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:1190 +#: builtin/commit.c:1191 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:1192 +#: builtin/commit.c:1193 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:1194 +#: builtin/commit.c:1195 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:1196 +#: builtin/commit.c:1197 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..." -#: builtin/commit.c:1208 builtin/tag.c:730 +#: builtin/commit.c:1209 builtin/tag.c:475 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1213 +#: builtin/commit.c:1214 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1323 builtin/commit.c:1602 +#: builtin/commit.c:1324 builtin/commit.c:1605 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1325 builtin/commit.c:1604 +#: builtin/commit.c:1326 builtin/commit.c:1607 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546 +#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546 +#: builtin/worktree.c:423 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1330 builtin/commit.c:1608 +#: builtin/commit.c:1331 builtin/commit.c:1611 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1333 builtin/commit.c:1611 +#: builtin/commit.c:1334 builtin/commit.c:1614 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:604 +#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "läge" -#: builtin/commit.c:1336 builtin/commit.c:1614 +#: builtin/commit.c:1337 builtin/commit.c:1617 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:1339 +#: builtin/commit.c:1340 msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1340 parse-options.h:155 +#: builtin/commit.c:1341 parse-options.h:155 msgid "when" msgstr "när" -#: builtin/commit.c:1341 +#: builtin/commit.c:1342 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -5128,196 +5183,201 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1343 +#: builtin/commit.c:1344 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1429 +#: builtin/commit.c:1430 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1431 +#: builtin/commit.c:1432 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1476 +#: builtin/commit.c:1477 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1479 +#: builtin/commit.c:1480 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1572 +#: builtin/commit.c:1575 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1573 +#: builtin/commit.c:1576 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1575 +#: builtin/commit.c:1578 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1576 builtin/tag.c:602 +#: builtin/commit.c:1579 builtin/tag.c:351 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1577 +#: builtin/commit.c:1580 msgid "author" msgstr "författare" -#: builtin/commit.c:1577 +#: builtin/commit.c:1580 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1578 builtin/gc.c:268 +#: builtin/commit.c:1581 builtin/gc.c:326 msgid "date" msgstr "datum" -#: builtin/commit.c:1578 +#: builtin/commit.c:1581 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392 -#: builtin/notes.c:555 builtin/tag.c:600 +#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392 +#: builtin/notes.c:555 builtin/tag.c:349 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1579 +#: builtin/commit.c:1582 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1580 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 +#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +msgid "commit" +msgstr "incheckning" + +#: builtin/commit.c:1583 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1581 +#: builtin/commit.c:1584 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1582 +#: builtin/commit.c:1585 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1583 +#: builtin/commit.c:1586 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:1584 +#: builtin/commit.c:1587 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:1585 builtin/log.c:1216 builtin/revert.c:86 +#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1586 +#: builtin/commit.c:1589 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1587 +#: builtin/commit.c:1590 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1588 +#: builtin/commit.c:1591 msgid "default" msgstr "standard" -#: builtin/commit.c:1588 builtin/tag.c:605 +#: builtin/commit.c:1591 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" -#: builtin/commit.c:1589 +#: builtin/commit.c:1592 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156 +#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1594 +#: builtin/commit.c:1597 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1595 +#: builtin/commit.c:1598 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1596 +#: builtin/commit.c:1599 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1597 +#: builtin/commit.c:1600 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1598 +#: builtin/commit.c:1601 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1599 +#: builtin/commit.c:1602 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1600 +#: builtin/commit.c:1603 msgid "bypass pre-commit hook" msgstr "förbigå pre-commit-krok" -#: builtin/commit.c:1601 +#: builtin/commit.c:1604 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1612 +#: builtin/commit.c:1615 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1613 +#: builtin/commit.c:1616 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1618 +#: builtin/commit.c:1621 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1620 +#: builtin/commit.c:1623 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1649 +#: builtin/commit.c:1652 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1695 +#: builtin/commit.c:1698 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1702 +#: builtin/commit.c:1705 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1721 +#: builtin/commit.c:1724 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1732 +#: builtin/commit.c:1735 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1737 +#: builtin/commit.c:1740 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1785 +#: builtin/commit.c:1788 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5456,11 +5516,11 @@ msgstr "visa endast variabelnamn" msgid "respect include directives on lookup" msgstr "respektera inkluderingsdirektiv vid uppslag" -#: builtin/config.c:311 +#: builtin/config.c:303 msgid "unable to parse default color value" msgstr "kan inte tolka standardfärgvärde" -#: builtin/config.c:449 +#: builtin/config.c:441 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5475,16 +5535,16 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:583 +#: builtin/config.c:575 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" -#: builtin/count-objects.c:55 +#: builtin/count-objects.c:77 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:65 +#: builtin/count-objects.c:87 msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" @@ -5604,7 +5664,7 @@ msgstr "överväg de <n> nyaste taggarna (standard: 10)" msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: builtin/describe.c:410 builtin/name-rev.c:318 +#: builtin/describe.c:410 builtin/name-rev.c:314 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" @@ -5781,7 +5841,7 @@ msgstr "fördjupa historik för grund klon" msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:118 builtin/log.c:1233 +#: builtin/fetch.c:118 builtin/log.c:1232 msgid "dir" msgstr "kat" @@ -5823,7 +5883,7 @@ msgstr "[àjour]" msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)" -#: builtin/fetch.c:478 builtin/fetch.c:564 +#: builtin/fetch.c:478 builtin/fetch.c:566 msgid "[rejected]" msgstr "[refuserad]" @@ -5847,39 +5907,39 @@ msgstr "[ny gren]" msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:560 +#: builtin/fetch.c:561 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:560 +#: builtin/fetch.c:561 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:566 +#: builtin/fetch.c:568 msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:600 builtin/fetch.c:842 +#: builtin/fetch.c:602 builtin/fetch.c:843 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: builtin/fetch.c:609 +#: builtin/fetch.c:611 #, 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:627 +#: builtin/fetch.c:629 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "avvisa %s då grunda rötter inte kan uppdateras" -#: builtin/fetch.c:715 builtin/fetch.c:807 +#: builtin/fetch.c:716 builtin/fetch.c:808 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:726 +#: builtin/fetch.c:727 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5888,55 +5948,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:778 +#: builtin/fetch.c:779 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:779 +#: builtin/fetch.c:780 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:811 +#: builtin/fetch.c:812 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:812 builtin/remote.c:1034 +#: builtin/fetch.c:813 builtin/remote.c:1040 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:832 +#: builtin/fetch.c:833 #, 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:851 +#: builtin/fetch.c:852 #, 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:854 +#: builtin/fetch.c:855 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:910 +#: builtin/fetch.c:911 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:1071 +#: builtin/fetch.c:1072 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1073 builtin/remote.c:90 +#: builtin/fetch.c:1074 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1091 +#: builtin/fetch.c:1092 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5944,32 +6004,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:1114 +#: builtin/fetch.c:1115 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1156 +#: builtin/fetch.c:1157 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1159 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1179 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1183 +#: builtin/fetch.c:1181 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1194 +#: builtin/fetch.c:1192 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1202 +#: builtin/fetch.c:1200 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -5979,23 +6039,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:667 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:673 +#: builtin/fmt-merge-msg.c:670 msgid "alias for --log (deprecated)" msgstr "alias för --log (avråds)" -#: builtin/fmt-merge-msg.c:676 +#: builtin/fmt-merge-msg.c:673 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:674 msgid "use <text> as start of message" msgstr "inled meddelande med <text>" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:675 msgid "file to read from" msgstr "fil att läsa från" @@ -6003,99 +6063,119 @@ msgstr "fil att läsa från" msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<flaggor>] [<mönster>]" -#: builtin/for-each-ref.c:24 +#: builtin/for-each-ref.c:10 +msgid "git for-each-ref [--points-at <object>]" +msgstr "git for-each-ref [--points-at <objekt>]" + +#: builtin/for-each-ref.c:11 +msgid "git for-each-ref [(--merged | --no-merged) [<object>]]" +msgstr "git for-each-ref [(--merged | --no-merged) [<objekt>]]" + +#: builtin/for-each-ref.c:12 +msgid "git for-each-ref [--contains [<object>]]" +msgstr "git for-each-ref [--contains [<objekt>]]" + +#: builtin/for-each-ref.c:27 msgid "quote placeholders suitably for shells" msgstr "citera platshållare passande för skal" -#: builtin/for-each-ref.c:26 +#: builtin/for-each-ref.c:29 msgid "quote placeholders suitably for perl" msgstr "citera platshållare passande för perl" -#: builtin/for-each-ref.c:28 +#: builtin/for-each-ref.c:31 msgid "quote placeholders suitably for python" msgstr "citera platshållare passande för python" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:33 msgid "quote placeholders suitably for Tcl" msgstr "citera platshållare passande för Tcl" -#: builtin/for-each-ref.c:33 +#: builtin/for-each-ref.c:36 msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:37 builtin/tag.c:372 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/for-each-ref.c:35 -msgid "key" -msgstr "nyckel" +#: builtin/for-each-ref.c:41 +msgid "print only refs which points at the given object" +msgstr "visa endast referenser som pekar på objektet" -#: builtin/for-each-ref.c:36 -msgid "field name to sort on" -msgstr "fältnamn att sortera på" +#: builtin/for-each-ref.c:43 +msgid "print only refs that are merged" +msgstr "visa endast referenser som slagits samman" + +#: builtin/for-each-ref.c:44 +msgid "print only refs that are not merged" +msgstr "visa endast referenser som ej slagits samman" + +#: builtin/for-each-ref.c:45 +msgid "print only refs which contain the commit" +msgstr "visa endast referenser som innehåller incheckningen" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:163 builtin/prune.c:137 +#: builtin/fsck.c:156 builtin/prune.c:140 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: builtin/fsck.c:568 +#: builtin/fsck.c:486 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:631 +#: builtin/fsck.c:553 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:637 +#: builtin/fsck.c:559 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:638 +#: builtin/fsck.c:560 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:639 +#: builtin/fsck.c:561 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:640 +#: builtin/fsck.c:562 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:641 +#: builtin/fsck.c:563 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:642 +#: builtin/fsck.c:564 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:643 +#: builtin/fsck.c:565 msgid "also consider packs and alternate objects" msgstr "ta även hänsyn till paket och alternativa objekt" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:644 +#: builtin/fsck.c:566 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:645 +#: builtin/fsck.c:567 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:647 +#: builtin/fsck.c:569 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:648 builtin/prune.c:107 +#: builtin/fsck.c:570 builtin/prune.c:107 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:707 +#: builtin/fsck.c:631 msgid "Checking objects" msgstr "Kontrollerar objekt" @@ -6103,48 +6183,63 @@ msgstr "Kontrollerar objekt" msgid "git gc [<options>]" msgstr "git gc [<flaggor>]" -#: builtin/gc.c:55 +#: builtin/gc.c:72 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: builtin/gc.c:100 +#: builtin/gc.c:139 #, c-format msgid "insanely long object directory %.*s" msgstr "tokigt lång objektkatalog %.*s" -#: builtin/gc.c:269 +#: builtin/gc.c:290 +#, c-format +msgid "" +"The last gc run reported the following. Please correct the root cause\n" +"and remove %s.\n" +"Automatic cleanup will not be performed until the file is removed.\n" +"\n" +"%s" +msgstr "" +"Senaste körningen av git gc rapporterade följande. Fixa grundproblemet\n" +"och ta bort %s.\n" +"Automatisk städning kommer inte utföras förrän filen tas bort.\n" +"\n" +"%s" + +#: builtin/gc.c:327 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:271 +#: builtin/gc.c:329 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:272 +#: builtin/gc.c:330 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:273 +#: builtin/gc.c:331 msgid "force running gc even if there may be another gc running" msgstr "tvinga gc-körning även om en annan gc kanske körs" -#: builtin/gc.c:315 +#: builtin/gc.c:373 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n" -#: builtin/gc.c:317 +#: builtin/gc.c:375 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:318 +#: builtin/gc.c:376 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Se \"git help gc\" för manuell hushållning.\n" -#: builtin/gc.c:336 +#: builtin/gc.c:397 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -6152,7 +6247,7 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:364 +#: builtin/gc.c:441 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -6188,199 +6283,195 @@ msgstr "flaggan \"%c\" antar ett numeriskt värde" msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: builtin/grep.c:638 +#: builtin/grep.c:633 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:640 +#: builtin/grep.c:635 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:642 +#: builtin/grep.c:637 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:644 +#: builtin/grep.c:639 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:647 +#: builtin/grep.c:642 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:649 +#: builtin/grep.c:644 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:651 +#: builtin/grep.c:646 msgid "match patterns only at word boundaries" msgstr "matcha endast mönster vid ordgränser" -#: builtin/grep.c:653 +#: builtin/grep.c:648 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:655 +#: builtin/grep.c:650 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:658 +#: builtin/grep.c:653 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:660 +#: builtin/grep.c:655 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:664 +#: builtin/grep.c:659 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:667 +#: builtin/grep.c:662 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:670 +#: builtin/grep.c:665 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:673 +#: builtin/grep.c:668 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:676 +#: builtin/grep.c:671 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:677 +#: builtin/grep.c:672 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:678 +#: builtin/grep.c:673 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:680 +#: builtin/grep.c:675 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:682 +#: builtin/grep.c:677 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:684 +#: builtin/grep.c:679 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:687 +#: builtin/grep.c:682 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:689 +#: builtin/grep.c:684 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:691 +#: builtin/grep.c:686 msgid "show the number of matches instead of matching lines" msgstr "visa antal träffar istället för träffade rader" -#: builtin/grep.c:692 +#: builtin/grep.c:687 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:694 +#: builtin/grep.c:689 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:696 +#: builtin/grep.c:691 msgid "show filename only once above matches from same file" msgstr "visa filnamn endast en gång ovanför träffar från samma fil" -#: builtin/grep.c:699 +#: builtin/grep.c:694 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:702 +#: builtin/grep.c:697 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:704 +#: builtin/grep.c:699 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:705 +#: builtin/grep.c:700 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:708 +#: builtin/grep.c:703 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:710 +#: builtin/grep.c:705 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:713 +#: builtin/grep.c:708 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:715 +#: builtin/grep.c:710 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:717 +#: builtin/grep.c:712 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:729 +#: builtin/grep.c:724 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:731 +#: builtin/grep.c:726 msgid "show only matches from files that match all patterns" msgstr "visa endast träffar från filer som träffar alla mönster" -#: builtin/grep.c:733 +#: builtin/grep.c:728 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:737 +#: builtin/grep.c:732 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:737 +#: builtin/grep.c:732 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:740 +#: builtin/grep.c:735 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:741 builtin/show-ref.c:189 -msgid "show usage" -msgstr "visa användning" - -#: builtin/grep.c:808 +#: builtin/grep.c:793 msgid "no pattern given." msgstr "inget mönster angavs." -#: builtin/grep.c:866 +#: builtin/grep.c:851 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:892 +#: builtin/grep.c:877 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached och --untracked kan inte användas med --no-index." -#: builtin/grep.c:897 +#: builtin/grep.c:882 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index och --untracked kan inte användas med revisioner." -#: builtin/grep.c:900 +#: builtin/grep.c:885 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll." -#: builtin/grep.c:908 +#: builtin/grep.c:893 msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." @@ -6393,10 +6484,10 @@ msgstr "" "<fil>..." #: builtin/hash-object.c:81 -msgid "git hash-object --stdin-paths < <list-of-paths>" -msgstr "git hash-object --stdin-paths < <sökvägslista>" +msgid "git hash-object --stdin-paths" +msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:92 builtin/tag.c:614 +#: builtin/hash-object.c:92 msgid "type" msgstr "typ" @@ -6468,12 +6559,12 @@ msgstr "Kunde inte tolka emacsclient-version." msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient version \"%d\" för gammal (< 22)." -#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 +#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format msgid "failed to exec '%s': %s" msgstr "exec misslyckades för \"%s\": %s" -#: builtin/help.c:215 +#: builtin/help.c:208 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -6482,7 +6573,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:227 +#: builtin/help.c:220 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -6491,61 +6582,61 @@ msgstr "" "\"%s\": kommando för man-visare som stöds.\n" "Använd \"man.<verktyg>.path\" istället." -#: builtin/help.c:354 +#: builtin/help.c:337 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:371 +#: builtin/help.c:354 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:379 +#: builtin/help.c:362 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:428 +#: builtin/help.c:411 msgid "Defining attributes per path" msgstr "Definierar attribut per sökväg" -#: builtin/help.c:429 +#: builtin/help.c:412 msgid "Everyday Git With 20 Commands Or So" msgstr "Git för dagligt bruk i ungefär 20 kommandon" -#: builtin/help.c:430 +#: builtin/help.c:413 msgid "A Git glossary" msgstr "En Git-ordlista" -#: builtin/help.c:431 +#: builtin/help.c:414 msgid "Specifies intentionally untracked files to ignore" msgstr "Ange avsiktligen ospårade filer att ignorera" -#: builtin/help.c:432 +#: builtin/help.c:415 msgid "Defining submodule properties" msgstr "Ange egenskaper för undermoduler" -#: builtin/help.c:433 +#: builtin/help.c:416 msgid "Specifying revisions and ranges for Git" msgstr "Ange versioner och intervall i Git" -#: builtin/help.c:434 +#: builtin/help.c:417 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:435 +#: builtin/help.c:418 msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" -#: builtin/help.c:447 +#: builtin/help.c:430 msgid "The common Git guides are:\n" msgstr "De vanliga Git-vägledningarna är:\n" -#: builtin/help.c:468 builtin/help.c:485 +#: builtin/help.c:451 builtin/help.c:468 #, c-format msgid "usage: %s%s" msgstr "användning: %s%s" -#: builtin/help.c:501 +#: builtin/help.c:484 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "\"git %s\" är ett alias för \"%s\"" @@ -6838,87 +6929,62 @@ msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/init-db.c:36 -#, c-format -msgid "Could not make %s writable by group" -msgstr "Kunde inte göra %s skrivbar för gruppen" - -#: builtin/init-db.c:63 -#, c-format -msgid "insanely long template name %s" -msgstr "tokigt långt namn på mallen %s" - -#: builtin/init-db.c:68 +#: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: builtin/init-db.c:74 +#: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" msgstr "kan inte ta status på mallen \"%s\"" -#: builtin/init-db.c:81 +#: builtin/init-db.c:66 #, c-format msgid "cannot opendir '%s'" msgstr "kan inte öppna katalogen (opendir) \"%s\"" -#: builtin/init-db.c:98 +#: builtin/init-db.c:77 #, c-format msgid "cannot readlink '%s'" msgstr "kan inte läsa länk (readlink) \"%s\"" -#: builtin/init-db.c:100 -#, c-format -msgid "insanely long symlink %s" -msgstr "tokigt lång symbolisk länk %s" - -#: builtin/init-db.c:103 +#: builtin/init-db.c:79 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\"" -#: builtin/init-db.c:107 +#: builtin/init-db.c:85 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "kan inte kopiera \"%s\" till \"%s\"" -#: builtin/init-db.c:111 +#: builtin/init-db.c:89 #, c-format msgid "ignoring template %s" msgstr "ignorerar mallen %s" -#: builtin/init-db.c:137 -#, c-format -msgid "insanely long template path %s" -msgstr "tokigt lång mallsökväg %s" - -#: builtin/init-db.c:145 +#: builtin/init-db.c:118 #, c-format msgid "templates not found %s" msgstr "mallarna hittades inte %s" -#: builtin/init-db.c:158 +#: builtin/init-db.c:131 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\"" -#: builtin/init-db.c:212 -#, c-format -msgid "insane git directory %s" -msgstr "tokig git-katalog %s" - -#: builtin/init-db.c:344 builtin/init-db.c:347 +#: builtin/init-db.c:309 builtin/init-db.c:312 #, c-format msgid "%s already exists" msgstr "%s finns redan" -#: builtin/init-db.c:375 +#: builtin/init-db.c:340 #, c-format msgid "unable to handle file type %d" msgstr "kan inte hantera filtyp %d" -#: builtin/init-db.c:378 +#: builtin/init-db.c:343 #, c-format msgid "unable to move %s to %s" msgstr "kan inte flytta %s till %s" @@ -6926,24 +6992,24 @@ msgstr "kan inte flytta %s till %s" #. TRANSLATORS: The first '%s' is either "Reinitialized #. existing" or "Initialized empty", the second " shared" or #. "", and the last '%s%s' is the verbatim directory name. -#: builtin/init-db.c:434 +#: builtin/init-db.c:399 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git-arkiv i %s%s\n" -#: builtin/init-db.c:435 +#: builtin/init-db.c:400 msgid "Reinitialized existing" msgstr "Ominitierade befintligt" -#: builtin/init-db.c:435 +#: builtin/init-db.c:400 msgid "Initialized empty" msgstr "Initierade tomt" -#: builtin/init-db.c:436 +#: builtin/init-db.c:401 msgid " shared" msgstr " delat" -#: builtin/init-db.c:483 +#: builtin/init-db.c:448 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -6951,25 +7017,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" "shared[=<behörigheter>]] [<katalog>]" -#: builtin/init-db.c:506 +#: builtin/init-db.c:471 msgid "permissions" msgstr "behörigheter" -#: builtin/init-db.c:507 +#: builtin/init-db.c:472 msgid "specify that the git repository is to be shared amongst several users" msgstr "ange att git-arkivet skall delas bland flera användare" -#: builtin/init-db.c:541 builtin/init-db.c:546 +#: builtin/init-db.c:506 builtin/init-db.c:511 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:550 +#: builtin/init-db.c:515 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:571 +#: builtin/init-db.c:536 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6978,7 +7044,7 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:599 +#: builtin/init-db.c:564 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" @@ -7064,217 +7130,217 @@ msgstr "format.headers utan värde" msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:814 +#: builtin/log.c:813 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:828 +#: builtin/log.c:827 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:838 +#: builtin/log.c:837 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:944 +#: builtin/log.c:943 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:1023 +#: builtin/log.c:1022 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1051 +#: builtin/log.c:1050 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1096 +#: builtin/log.c:1095 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1211 +#: builtin/log.c:1210 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:1214 +#: builtin/log.c:1213 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1218 +#: builtin/log.c:1217 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1220 +#: builtin/log.c:1219 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1222 +#: builtin/log.c:1221 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1223 +#: builtin/log.c:1222 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1224 +#: builtin/log.c:1223 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1226 +#: builtin/log.c:1225 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1228 +#: builtin/log.c:1227 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1230 +#: builtin/log.c:1229 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1233 +#: builtin/log.c:1232 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1236 +#: builtin/log.c:1235 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1239 +#: builtin/log.c:1238 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1241 +#: builtin/log.c:1240 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1243 +#: builtin/log.c:1242 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1245 +#: builtin/log.c:1244 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1246 +#: builtin/log.c:1245 msgid "header" msgstr "huvud" -#: builtin/log.c:1247 +#: builtin/log.c:1246 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1248 builtin/log.c:1250 +#: builtin/log.c:1247 builtin/log.c:1249 msgid "email" msgstr "epost" -#: builtin/log.c:1248 +#: builtin/log.c:1247 msgid "add To: header" msgstr "Lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1250 +#: builtin/log.c:1249 msgid "add Cc: header" msgstr "Lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1252 +#: builtin/log.c:1251 msgid "ident" msgstr "ident" -#: builtin/log.c:1253 +#: builtin/log.c:1252 msgid "set From address to <ident> (or committer ident if absent)" msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)" -#: builtin/log.c:1255 +#: builtin/log.c:1254 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1256 +#: builtin/log.c:1255 msgid "make first mail a reply to <message-id>" msgstr "Gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1257 builtin/log.c:1260 +#: builtin/log.c:1256 builtin/log.c:1259 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1258 +#: builtin/log.c:1257 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1261 +#: builtin/log.c:1260 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1265 +#: builtin/log.c:1264 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1267 +#: builtin/log.c:1266 msgid "signature" msgstr "signatur" -#: builtin/log.c:1268 +#: builtin/log.c:1267 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1270 +#: builtin/log.c:1269 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1271 +#: builtin/log.c:1270 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1360 +#: builtin/log.c:1359 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1362 +#: builtin/log.c:1361 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix och -k kan inte användas samtidigt." -#: builtin/log.c:1370 +#: builtin/log.c:1369 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1372 +#: builtin/log.c:1371 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1374 +#: builtin/log.c:1373 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1397 +#: builtin/log.c:1396 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1399 +#: builtin/log.c:1398 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1496 +#: builtin/log.c:1495 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1559 +#: builtin/log.c:1558 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1607 +#: builtin/log.c:1606 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1661 +#: builtin/log.c:1660 #, 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:1672 builtin/log.c:1674 builtin/log.c:1686 +#: builtin/log.c:1671 builtin/log.c:1673 builtin/log.c:1685 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" @@ -7375,35 +7441,35 @@ msgstr "visa felsökningsutdata" msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]" -#: builtin/ls-tree.c:127 +#: builtin/ls-tree.c:128 msgid "only show trees" msgstr "visa endast träd" -#: builtin/ls-tree.c:129 +#: builtin/ls-tree.c:130 msgid "recurse into subtrees" msgstr "rekursera ner i underträd" -#: builtin/ls-tree.c:131 +#: builtin/ls-tree.c:132 msgid "show trees when recursing" msgstr "visa träd medan rekursering" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "terminate entries with NUL byte" msgstr "terminera poster med NUL-byte" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:136 msgid "include object size" msgstr "inkludera objektstorlek" -#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 +#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 msgid "list only filenames" msgstr "visa endast filnamn" -#: builtin/ls-tree.c:142 +#: builtin/ls-tree.c:143 msgid "use full path names" msgstr "använd fullständiga sökvägsnamn" -#: builtin/ls-tree.c:144 +#: builtin/ls-tree.c:145 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" @@ -7638,16 +7704,16 @@ msgstr "Ingen standarduppström angiven för aktuell gren." msgid "No remote-tracking branch for %s from %s" msgstr "Ingen fjärrspårande gren för %s från %s" -#: builtin/merge.c:1081 +#: builtin/merge.c:1079 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: builtin/merge.c:1208 +#: builtin/merge.c:1206 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1224 +#: builtin/merge.c:1222 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7655,7 +7721,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1231 +#: builtin/merge.c:1229 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7663,53 +7729,53 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1234 +#: builtin/merge.c:1232 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:1243 +#: builtin/merge.c:1241 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1251 +#: builtin/merge.c:1249 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1268 +#: builtin/merge.c:1266 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1270 +#: builtin/merge.c:1268 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:1276 +#: builtin/merge.c:1274 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1278 +#: builtin/merge.c:1276 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:1333 +#: builtin/merge.c:1331 #, 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:1336 +#: builtin/merge.c:1334 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s." -#: builtin/merge.c:1339 +#: builtin/merge.c:1337 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: builtin/merge.c:1342 +#: builtin/merge.c:1340 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" @@ -7719,46 +7785,46 @@ msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1462 +#: builtin/merge.c:1460 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1469 +#: builtin/merge.c:1467 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1501 +#: builtin/merge.c:1499 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1524 builtin/merge.c:1603 +#: builtin/merge.c:1522 builtin/merge.c:1601 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1528 +#: builtin/merge.c:1526 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1594 +#: builtin/merge.c:1592 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1596 +#: builtin/merge.c:1594 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1605 +#: builtin/merge.c:1603 #, 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:1617 +#: builtin/merge.c:1615 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7948,48 +8014,48 @@ msgstr "%s, källa=%s, mål=%s" msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:256 builtin/remote.c:722 builtin/repack.c:362 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/name-rev.c:255 +#: builtin/name-rev.c:251 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<flaggor>] <incheckning>..." -#: builtin/name-rev.c:256 +#: builtin/name-rev.c:252 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<flaggor>] --all" -#: builtin/name-rev.c:257 +#: builtin/name-rev.c:253 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<flaggor>] --stdin" -#: builtin/name-rev.c:309 +#: builtin/name-rev.c:305 msgid "print only names (no SHA-1)" msgstr "skriv endast namn (ingen SHA-1)" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:306 msgid "only use tags to name the commits" msgstr "använd endast taggar för att namnge incheckningar" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:308 msgid "only use refs matching <pattern>" msgstr "använd endast referenser som motsvarar <mönster>" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:310 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:311 msgid "read from stdin" msgstr "läs från standard in" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:312 msgid "allow to print `undefined` names (default)" msgstr "tillåt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:322 +#: builtin/name-rev.c:318 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" @@ -8119,7 +8185,7 @@ msgstr "kunde inte läsa utdata från \"show\"" msgid "failed to finish 'show' for object '%s'" msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" -#: builtin/notes.c:174 builtin/tag.c:477 +#: builtin/notes.c:174 builtin/tag.c:248 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" @@ -8137,12 +8203,12 @@ msgstr "kunde inte skriva anteckningsobjekt" msgid "The note contents have been left in %s" msgstr "Anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:232 builtin/tag.c:695 +#: builtin/notes.c:232 builtin/tag.c:440 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:234 builtin/tag.c:698 +#: builtin/notes.c:234 builtin/tag.c:443 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" @@ -8150,7 +8216,7 @@ msgstr "kunde inte öppna eller läsa \"%s\"" #: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 #: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507 #: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653 -#: builtin/notes.c:877 builtin/tag.c:711 +#: builtin/notes.c:877 builtin/tag.c:456 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." @@ -8184,11 +8250,6 @@ msgstr "anteckningsinnehåll som sträng" msgid "note contents in a file" msgstr "anteckningsinnehåll i en fil" -#: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561 -#: builtin/notes.c:564 builtin/tag.c:630 -msgid "object" -msgstr "objekt" - #: builtin/notes.c:399 builtin/notes.c:562 msgid "reuse and edit specified note object" msgstr "återanvänd och redigera angivet anteckningsobjekt" @@ -8319,7 +8380,7 @@ msgstr "anteckningar-ref" msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1012 builtin/remote.c:1588 +#: builtin/notes.c:1012 builtin/remote.c:1647 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" @@ -8527,30 +8588,30 @@ msgstr "Tar bort duplicerade objekt" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]" -#: builtin/prune.c:105 builtin/worktree.c:121 +#: builtin/prune.c:105 builtin/worktree.c:124 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" -#: builtin/prune.c:106 builtin/worktree.c:122 +#: builtin/prune.c:106 builtin/worktree.c:125 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:109 builtin/worktree.c:124 +#: builtin/prune.c:109 builtin/worktree.c:127 msgid "expire objects older than <time>" msgstr "låt tid gå ut för objekt äldre än <tid>" +#: builtin/prune.c:123 +msgid "cannot prune in a precious-objects repo" +msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv" + #: builtin/pull.c:69 -msgid "git pull [options] [<repository> [<refspec>...]]" -msgstr "git pull [flaggor] [<arkiv> [<refspec>...]]" +msgid "git pull [<options>] [<repository> [<refspec>...]]" +msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]" #: builtin/pull.c:113 msgid "Options related to merging" msgstr "Alternativ gällande sammanslagning" -#: builtin/pull.c:115 -msgid "false|true|preserve" -msgstr "false|true|preserve" - #: builtin/pull.c:116 msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" @@ -9104,12 +9165,12 @@ msgstr "hoppa över att applicera filter för gles utcheckning" msgid "debug unpack-trees" msgstr "felsök unpack-trees" -#: builtin/reflog.c:432 +#: builtin/reflog.c:428 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" -#: builtin/reflog.c:549 builtin/reflog.c:554 +#: builtin/reflog.c:545 builtin/reflog.c:550 #, c-format msgid "'%s' is not a valid timestamp" msgstr "\"%s\" är inte en giltig tidsstämpel" @@ -9126,15 +9187,15 @@ msgstr "" "git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <namn> <url>" -#: builtin/remote.c:14 builtin/remote.c:33 +#: builtin/remote.c:14 builtin/remote.c:34 msgid "git remote rename <old> <new>" msgstr "git remote rename <gammal> <ny>" -#: builtin/remote.c:15 builtin/remote.c:38 +#: builtin/remote.c:15 builtin/remote.c:39 msgid "git remote remove <name>" msgstr "git remote remove <namn>" -#: builtin/remote.c:16 builtin/remote.c:43 +#: builtin/remote.c:16 builtin/remote.c:44 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)" @@ -9156,48 +9217,52 @@ msgstr "" msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <namn> <gren>..." -#: builtin/remote.c:21 builtin/remote.c:69 +#: builtin/remote.c:21 builtin/remote.c:70 +msgid "git remote get-url [--push] [--all] <name>" +msgstr "git remote get-url [--push] [--all] <namn>" + +#: builtin/remote.c:22 builtin/remote.c:75 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]" -#: builtin/remote.c:22 builtin/remote.c:70 +#: builtin/remote.c:23 builtin/remote.c:76 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <namn> <nyurl>" -#: builtin/remote.c:23 builtin/remote.c:71 +#: builtin/remote.c:24 builtin/remote.c:77 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <namn> <url>" -#: builtin/remote.c:28 +#: builtin/remote.c:29 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<flaggor>] <namn> <url>" -#: builtin/remote.c:48 +#: builtin/remote.c:49 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <namn> <gren>..." -#: builtin/remote.c:49 +#: builtin/remote.c:50 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <namn> <gren>..." -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote show [<options>] <name>" msgstr "git remote show [<flaggor>] <namn>" -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<flaggor>] <namn>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..." -#: builtin/remote.c:88 +#: builtin/remote.c:94 #, c-format msgid "Updating %s" msgstr "Uppdaterar %s" -#: builtin/remote.c:120 +#: builtin/remote.c:126 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -9205,96 +9270,96 @@ msgstr "" "--mirror är farlig och föråldrad; använd\n" "\t --mirror=fetch eller --mirror=push istället" -#: builtin/remote.c:137 +#: builtin/remote.c:143 #, c-format msgid "unknown mirror argument: %s" msgstr "okänt argument till mirror: %s" -#: builtin/remote.c:153 +#: builtin/remote.c:159 msgid "fetch the remote branches" msgstr "hämta fjärrgrenarna" -#: builtin/remote.c:155 +#: builtin/remote.c:161 msgid "import all tags and associated objects when fetching" msgstr "importera alla taggar och associerade objekt vid hämtning" -#: builtin/remote.c:158 +#: builtin/remote.c:164 msgid "or do not fetch any tag at all (--no-tags)" msgstr "eller hämta inte några taggar alls (--no-tags)" -#: builtin/remote.c:160 +#: builtin/remote.c:166 msgid "branch(es) to track" msgstr "gren(ar) att spåra" -#: builtin/remote.c:161 +#: builtin/remote.c:167 msgid "master branch" msgstr "huvudgren" -#: builtin/remote.c:162 +#: builtin/remote.c:168 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:163 +#: builtin/remote.c:169 msgid "set up remote as a mirror to push to or fetch from" msgstr "ställ in arkiv som spegel att sända eller ta emot från" -#: builtin/remote.c:175 +#: builtin/remote.c:181 msgid "specifying a master branch makes no sense with --mirror" msgstr "att ange en master-gren ger ingen mening med --mirror" -#: builtin/remote.c:177 +#: builtin/remote.c:183 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar" -#: builtin/remote.c:187 builtin/remote.c:637 +#: builtin/remote.c:193 builtin/remote.c:643 #, c-format msgid "remote %s already exists." msgstr "fjärrarkivet %s finns redan." -#: builtin/remote.c:191 builtin/remote.c:641 +#: builtin/remote.c:197 builtin/remote.c:647 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" -#: builtin/remote.c:235 +#: builtin/remote.c:241 #, c-format msgid "Could not setup master '%s'" msgstr "Kunde inte skapa master \"%s\"" -#: builtin/remote.c:335 +#: builtin/remote.c:341 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Kunde inte hämta mappning för referensspecifikation %s" -#: builtin/remote.c:436 builtin/remote.c:444 +#: builtin/remote.c:442 builtin/remote.c:450 msgid "(matching)" msgstr "(matchande)" -#: builtin/remote.c:448 +#: builtin/remote.c:454 msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:588 builtin/remote.c:594 builtin/remote.c:600 +#: builtin/remote.c:594 builtin/remote.c:600 builtin/remote.c:606 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Kunde inte tillämpa \"%s\" på \"%s\"" -#: builtin/remote.c:630 builtin/remote.c:769 builtin/remote.c:869 +#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875 #, c-format msgid "No such remote: %s" msgstr "Inget sådant fjärrarkiv: %s" -#: builtin/remote.c:647 +#: builtin/remote.c:653 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:653 builtin/remote.c:821 +#: builtin/remote.c:659 builtin/remote.c:827 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:668 +#: builtin/remote.c:674 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -9305,27 +9370,27 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:674 +#: builtin/remote.c:680 #, c-format msgid "Could not append '%s'" msgstr "Kunde inte lägga till på \"%s\"" -#: builtin/remote.c:685 +#: builtin/remote.c:691 #, c-format msgid "Could not set '%s'" msgstr "Kunde inte sätta \"%s\"" -#: builtin/remote.c:707 +#: builtin/remote.c:713 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:741 +#: builtin/remote.c:747 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:807 +#: builtin/remote.c:813 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -9339,262 +9404,275 @@ msgstr[1] "" "Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n" "för att ta bort dem, använd:" -#: builtin/remote.c:922 +#: builtin/remote.c:928 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:925 +#: builtin/remote.c:931 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:927 +#: builtin/remote.c:933 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:929 +#: builtin/remote.c:935 msgid " ???" msgstr " ???" -#: builtin/remote.c:970 +#: builtin/remote.c:976 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren" -#: builtin/remote.c:977 +#: builtin/remote.c:983 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:980 +#: builtin/remote.c:986 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:981 +#: builtin/remote.c:987 msgid " and with remote" msgstr " och med fjärren" -#: builtin/remote.c:983 +#: builtin/remote.c:989 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:984 +#: builtin/remote.c:990 msgid " and with remote" msgstr " och med fjärren" -#: builtin/remote.c:1030 +#: builtin/remote.c:1036 msgid "create" msgstr "skapa" -#: builtin/remote.c:1033 +#: builtin/remote.c:1039 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1037 +#: builtin/remote.c:1043 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1040 +#: builtin/remote.c:1046 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1043 +#: builtin/remote.c:1049 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1050 +#: builtin/remote.c:1056 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1053 +#: builtin/remote.c:1059 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1057 +#: builtin/remote.c:1063 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1060 +#: builtin/remote.c:1066 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1128 +#: builtin/remote.c:1134 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1155 +#: builtin/remote.c:1161 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1156 +#: builtin/remote.c:1162 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1157 builtin/remote.c:1308 +#: builtin/remote.c:1163 builtin/remote.c:1314 msgid "(no URL)" msgstr "(ingen URL)" -#: builtin/remote.c:1166 builtin/remote.c:1168 +#: builtin/remote.c:1172 builtin/remote.c:1174 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1170 builtin/remote.c:1172 builtin/remote.c:1174 +#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1176 +#: builtin/remote.c:1182 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n" -#: builtin/remote.c:1188 +#: builtin/remote.c:1194 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1191 builtin/remote.c:1218 +#: builtin/remote.c:1197 builtin/remote.c:1224 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1200 +#: builtin/remote.c:1206 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokal gren konfigurerad för \"git pull\":" msgstr[1] " Lokala grenar konfigurerade för \"git pull\":" -#: builtin/remote.c:1208 +#: builtin/remote.c:1214 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1215 +#: builtin/remote.c:1221 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:" msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:" -#: builtin/remote.c:1236 +#: builtin/remote.c:1242 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1238 +#: builtin/remote.c:1244 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1253 +#: builtin/remote.c:1259 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1255 +#: builtin/remote.c:1261 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:" -#: builtin/remote.c:1265 +#: builtin/remote.c:1271 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1273 +#: builtin/remote.c:1279 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1275 +#: builtin/remote.c:1281 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1293 +#: builtin/remote.c:1299 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1294 +#: builtin/remote.c:1300 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1304 +#: builtin/remote.c:1310 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1305 +#: builtin/remote.c:1311 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1321 +#: builtin/remote.c:1327 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1324 +#: builtin/remote.c:1330 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1369 +#: builtin/remote.c:1375 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1435 builtin/remote.c:1509 +#: builtin/remote.c:1441 builtin/remote.c:1498 builtin/remote.c:1566 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1455 +#: builtin/remote.c:1461 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1462 +#: builtin/remote.c:1468 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1484 +#: builtin/remote.c:1485 +msgid "query push URLs rather than fetch URLs" +msgstr "fråga sänd-URL:er istället för hämta-URL:er" + +#: builtin/remote.c:1487 +msgid "return all URLs" +msgstr "returnera alla URL:er" + +#: builtin/remote.c:1515 +#, c-format +msgid "no URLs configured for remote '%s'" +msgstr "ingen URL:er angivna för fjärren \"%s\"" + +#: builtin/remote.c:1541 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1486 +#: builtin/remote.c:1543 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1488 +#: builtin/remote.c:1545 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1495 +#: builtin/remote.c:1552 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1535 +#: builtin/remote.c:1592 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1543 +#: builtin/remote.c:1600 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1545 +#: builtin/remote.c:1602 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/remote.c:1559 +#: builtin/remote.c:1616 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" @@ -9666,7 +9744,11 @@ msgstr "maximal storlek på varje paketfil" msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:378 +#: builtin/repack.c:197 +msgid "cannot delete packs in a precious-objects repo" +msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" + +#: builtin/repack.c:381 #, c-format msgid "removing '%s' failed" msgstr "misslyckades ta bort \"%s\"" @@ -9761,7 +9843,7 @@ msgstr "använd detta format" msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -#: builtin/rerere.c:57 +#: builtin/rerere.c:58 msgid "register clean resolutions in index" msgstr "registrera rena lösningar i indexet" @@ -9896,23 +9978,23 @@ msgstr "Kunde inte skriva ny indexfil." msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-parse.c:361 +#: builtin/rev-parse.c:358 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]" -#: builtin/rev-parse.c:366 +#: builtin/rev-parse.c:363 msgid "keep the `--` passed as an arg" msgstr "behåll \"--\" sänt som argument" -#: builtin/rev-parse.c:368 +#: builtin/rev-parse.c:365 msgid "stop parsing after the first non-option argument" msgstr "sluta tolka efter första argument som inte är flagga" -#: builtin/rev-parse.c:371 +#: builtin/rev-parse.c:368 msgid "output in stuck long form" msgstr "utdata fast i lång form" -#: builtin/rev-parse.c:502 +#: builtin/rev-parse.c:499 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -10170,7 +10252,7 @@ msgstr "w[,i1[,i2]]" msgid "Linewrap output" msgstr "Radbryt utdata" -#: builtin/show-branch.c:9 +#: builtin/show-branch.c:10 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -10182,71 +10264,71 @@ msgstr "" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]" -#: builtin/show-branch.c:13 +#: builtin/show-branch.c:14 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:640 msgid "show remote-tracking and local branches" msgstr "visa fjärrspårande och lokala grenar" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:642 msgid "show remote-tracking branches" msgstr "visa fjärrspårande grenar" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:644 msgid "color '*!+-' corresponding to the branch" msgstr "färga \"*!+-\" enligt grenen" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:646 msgid "show <n> more commits after the common ancestor" msgstr "visa <n> ytterligare incheckningar efter gemensam anfader" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:648 msgid "synonym to more=-1" msgstr "synonym till more=-1" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:649 msgid "suppress naming strings" msgstr "undertyck namnsträngar" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:651 msgid "include the current branch" msgstr "inkludera aktuell gren" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:653 msgid "name commits with their object names" msgstr "namnge incheckningar med deras objektnamn" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:655 msgid "show possible merge bases" msgstr "visa möjliga sammanslagningsbaser" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:657 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:678 +#: builtin/show-branch.c:659 msgid "show commits in topological order" msgstr "visa incheckningar i topologisk ordning" -#: builtin/show-branch.c:681 +#: builtin/show-branch.c:662 msgid "show only commits not on the first branch" msgstr "visa endast incheckningar inte på den första grenen" -#: builtin/show-branch.c:683 +#: builtin/show-branch.c:664 msgid "show merges reachable from only one tip" msgstr "visa sammanslagningar som endast kan nås från en spets" -#: builtin/show-branch.c:685 +#: builtin/show-branch.c:666 msgid "topologically sort, maintaining date order where possible" msgstr "sortera topologiskt, behåll datumordning när möjligt" -#: builtin/show-branch.c:688 +#: builtin/show-branch.c:669 msgid "<n>[,<base>]" msgstr "<n>[,<bas>]" -#: builtin/show-branch.c:689 +#: builtin/show-branch.c:670 msgid "show <n> most recent ref-log entries starting at base" msgstr "visa <n> nyaste refloggposter med början på bas" @@ -10259,41 +10341,136 @@ msgstr "" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mönster>...]" #: builtin/show-ref.c:11 -msgid "git show-ref --exclude-existing[=pattern] < ref-list" -msgstr "git show-ref --exclude-existing[=mönster] < reflista" +msgid "git show-ref --exclude-existing[=<pattern>]" +msgstr "git show-ref --exclude-existing[=<mönster>]" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:165 msgid "only show tags (can be combined with heads)" msgstr "visa endast taggar (kan kombineras med huvuden)" -#: builtin/show-ref.c:171 +#: builtin/show-ref.c:166 msgid "only show heads (can be combined with tags)" msgstr "visa endast huvuden (kan kombineras med taggar)" -#: builtin/show-ref.c:172 +#: builtin/show-ref.c:167 msgid "stricter reference checking, requires exact ref path" msgstr "striktare referenskontroll, kräver exakt referenssökväg" -#: builtin/show-ref.c:175 builtin/show-ref.c:177 +#: builtin/show-ref.c:170 builtin/show-ref.c:172 msgid "show the HEAD reference, even if it would be filtered out" msgstr "visa HEAD-refrens, även när den skulle filtreras ut" -#: builtin/show-ref.c:179 +#: builtin/show-ref.c:174 msgid "dereference tags into object IDs" msgstr "avreferera taggar till objekt-id" -#: builtin/show-ref.c:181 +#: builtin/show-ref.c:176 msgid "only show SHA1 hash using <n> digits" msgstr "visa SHA1-hash endast med <n> siffror" -#: builtin/show-ref.c:185 +#: builtin/show-ref.c:180 msgid "do not print results to stdout (useful with --verify)" msgstr "visa inte resultat på standard ut (användbart med --verify)" -#: builtin/show-ref.c:187 +#: builtin/show-ref.c:182 msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser från standard in som inte finns i lokalt arkiv" +#: builtin/stripspace.c:17 +msgid "git stripspace [-s | --strip-comments]" +msgstr "git stripspace [-s | --strip-comments]" + +#: builtin/stripspace.c:18 +msgid "git stripspace [-c | --comment-lines]" +msgstr "git stripspace [-c | --comment-lines]" + +#: builtin/stripspace.c:35 +msgid "skip and remove all lines starting with comment character" +msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" + +#: builtin/stripspace.c:38 +msgid "prepend comment character and blank to each line" +msgstr "lägg in kommentarstecken och blanksteg först på varje rad" + +#: builtin/submodule--helper.c:79 builtin/submodule--helper.c:167 +msgid "alternative anchor for relative paths" +msgstr "alternativa ankare för relativa sökvägar" + +#: builtin/submodule--helper.c:84 +msgid "git submodule--helper list [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" + +#: builtin/submodule--helper.c:114 +msgid "git submodule--helper name <path>" +msgstr "git submodule--helper name <sökväg>" + +#: builtin/submodule--helper.c:120 +#, c-format +msgid "no submodule mapping found in .gitmodules for path '%s'" +msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\"" + +#: builtin/submodule--helper.c:170 +msgid "where the new submodule will be cloned to" +msgstr "var den nya undermodulen skall klonas till" + +#: builtin/submodule--helper.c:173 +msgid "name of the new submodule" +msgstr "namn på den nya undermodulen" + +#: builtin/submodule--helper.c:176 +msgid "url where to clone the submodule from" +msgstr "URL att klona undermodulen från" + +#: builtin/submodule--helper.c:182 +msgid "depth for shallow clones" +msgstr "djup för grunda kloner" + +#: builtin/submodule--helper.c:188 +msgid "" +"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " +"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" +msgstr "" +"git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference " +"<arkvi>] [--name <namn>] [--url <url>][--depth <djup>] [--] [<sökväg>...]" + +#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208 +#: builtin/submodule--helper.c:216 +#, c-format +msgid "could not create directory '%s'" +msgstr "kunde inte skapa katalogen \"%s\"" + +#: builtin/submodule--helper.c:204 +#, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" + +#: builtin/submodule--helper.c:227 +#, c-format +msgid "cannot open file '%s'" +msgstr "kan inte öppna filen \"%s\"" + +#: builtin/submodule--helper.c:232 +#, c-format +msgid "could not close file %s" +msgstr "kunde inte stänga filen %s" + +#: builtin/submodule--helper.c:247 +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" + +#: builtin/submodule--helper.c:273 +msgid "fatal: submodule--helper subcommand must be called with a subcommand" +msgstr "" +"ödesdigert: underkommandot submodule--helper måste anropas med ett " +"underkommando" + +#: builtin/submodule--helper.c:280 +#, c-format +msgid "fatal: '%s' is not a valid submodule--helper subcommand" +msgstr "" +"ödesdigert: \"%s\" är inte ett giltigt underkommando till submodule--helper" + #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]" @@ -10323,7 +10500,7 @@ msgstr "skäl" msgid "reason of the update" msgstr "skäl till uppdateringen" -#: builtin/tag.c:22 +#: builtin/tag.c:23 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" @@ -10331,48 +10508,43 @@ msgstr "" "git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>] <taggnamn> " "[<huvud>]" -#: builtin/tag.c:23 +#: builtin/tag.c:24 msgid "git tag -d <tagname>..." msgstr "git tag -d <taggnamn>..." -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" -"\t\t[<pattern>...]" +"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" msgstr "" "git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>]\n" -"\t\t[<mönster>...]" +"\t\t[--format=<format>] [--[no-]merged [<incheckning>]] [<mönster>...]" -#: builtin/tag.c:26 +#: builtin/tag.c:27 msgid "git tag -v <tagname>..." msgstr "git tag -v <taggnamn>..." -#: builtin/tag.c:69 -#, c-format -msgid "malformed object at '%s'" -msgstr "felformat objekt vid \"%s\"" - -#: builtin/tag.c:301 +#: builtin/tag.c:80 #, c-format msgid "tag name too long: %.*s..." msgstr "taggnamnet för långt: %.*s..." -#: builtin/tag.c:306 +#: builtin/tag.c:85 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:321 +#: builtin/tag.c:100 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:333 +#: builtin/tag.c:112 #, c-format msgid "could not verify the tag '%s'" msgstr "kunde inte bekräfta taggen \"%s\"" -#: builtin/tag.c:343 +#: builtin/tag.c:122 #, c-format msgid "" "\n" @@ -10385,7 +10557,7 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:347 +#: builtin/tag.c:126 #, c-format msgid "" "\n" @@ -10400,153 +10572,138 @@ msgstr "" "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" "du vill.\n" -#: builtin/tag.c:371 -#, c-format -msgid "unsupported sort specification '%s'" -msgstr "sorteringsangivelsen \"%s\" stöds ej" - -#: builtin/tag.c:373 -#, c-format -msgid "unsupported sort specification '%s' in variable '%s'" -msgstr "sorteringsangivelsen \"%s\" i variabeln \"%s\" stöds ej" - -#: builtin/tag.c:428 +#: builtin/tag.c:199 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:430 +#: builtin/tag.c:201 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" -#: builtin/tag.c:455 +#: builtin/tag.c:226 msgid "bad object type." msgstr "felaktig objekttyp" -#: builtin/tag.c:468 +#: builtin/tag.c:239 msgid "tag header too big." msgstr "tagghuvud för stort." -#: builtin/tag.c:504 +#: builtin/tag.c:275 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:510 +#: builtin/tag.c:281 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:559 -msgid "switch 'points-at' requires an object" -msgstr "flaggan \"points-at\" behöver ett objekt" - -#: builtin/tag.c:561 -#, c-format -msgid "malformed object name '%s'" -msgstr "felformat objektnamn \"%s\"" - -#: builtin/tag.c:590 +#: builtin/tag.c:339 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:592 +#: builtin/tag.c:341 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:594 +#: builtin/tag.c:343 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:595 +#: builtin/tag.c:344 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:597 +#: builtin/tag.c:346 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:599 +#: builtin/tag.c:348 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:601 +#: builtin/tag.c:350 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:603 +#: builtin/tag.c:352 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:607 +#: builtin/tag.c:356 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:608 +#: builtin/tag.c:357 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:609 builtin/update-ref.c:368 -msgid "create_reflog" -msgstr "create_reflog" +#: builtin/tag.c:358 builtin/update-ref.c:368 +msgid "create a reflog" +msgstr "skapa en reflog" -#: builtin/tag.c:611 +#: builtin/tag.c:360 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:612 +#: builtin/tag.c:361 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:614 -msgid "sort tags" -msgstr "sortera taggar" - -#: builtin/tag.c:619 builtin/tag.c:625 +#: builtin/tag.c:362 builtin/tag.c:363 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:631 +#: builtin/tag.c:364 +msgid "print only tags that are merged" +msgstr "visa endast taggar som slagits samman" + +#: builtin/tag.c:365 +msgid "print only tags that are not merged" +msgstr "visa endast taggar som ej slagits samman" + +#: builtin/tag.c:370 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:657 +#: builtin/tag.c:399 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:669 -msgid "--sort and -n are incompatible" -msgstr "--sort och -n är inkompatibla" - -#: builtin/tag.c:676 +#: builtin/tag.c:419 msgid "-n option is only allowed with -l." msgstr "Flaggan -n är endast tillåten tillsammans med -l." -#: builtin/tag.c:678 +#: builtin/tag.c:421 msgid "--contains option is only allowed with -l." msgstr "Flaggan --contains är endast tillåten tillsammans med -l" -#: builtin/tag.c:680 +#: builtin/tag.c:423 msgid "--points-at option is only allowed with -l." msgstr "Flaggan --points-at är endast tillåten tillsammans med -l." -#: builtin/tag.c:688 +#: builtin/tag.c:425 +msgid "--merged and --no-merged option are only allowed with -l" +msgstr "flaggorna --merged och --no-merged tillåts endast tillsammans med -l" + +#: builtin/tag.c:433 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:708 +#: builtin/tag.c:453 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:714 +#: builtin/tag.c:459 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:719 +#: builtin/tag.c:464 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:744 +#: builtin/tag.c:489 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" @@ -10808,77 +10965,81 @@ msgstr "git verify-tag [-v | --verbose] <tagg>..." msgid "print tag contents" msgstr "visa innehåll för tag" -#: builtin/worktree.c:13 -msgid "git worktree add [<options>] <path> <branch>" -msgstr "git worktree add [<flaggor>] <sökväg> <gren>" +#: builtin/worktree.c:15 +msgid "git worktree add [<options>] <path> [<branch>]" +msgstr "git worktree add [<flaggor>] <sökväg> [<gren>]" -#: builtin/worktree.c:14 +#: builtin/worktree.c:16 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<flaggor>]" -#: builtin/worktree.c:36 +#: builtin/worktree.c:17 +msgid "git worktree list [<options>]" +msgstr "git worktree list [<flaggor>]" + +#: builtin/worktree.c:39 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Tar bort worktrees/%s: inte en giltig katalog" -#: builtin/worktree.c:42 +#: builtin/worktree.c:45 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" -#: builtin/worktree.c:47 +#: builtin/worktree.c:50 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)" -#: builtin/worktree.c:58 +#: builtin/worktree.c:61 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" -#: builtin/worktree.c:74 +#: builtin/worktree.c:77 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats" -#: builtin/worktree.c:109 +#: builtin/worktree.c:112 #, c-format msgid "failed to remove: %s" msgstr "misslyckades ta bort: %s" -#: builtin/worktree.c:198 +#: builtin/worktree.c:201 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:232 +#: builtin/worktree.c:235 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:268 +#: builtin/worktree.c:271 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Förbereder %s (identifieraren %s)" -#: builtin/worktree.c:316 +#: builtin/worktree.c:319 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog" -#: builtin/worktree.c:318 +#: builtin/worktree.c:321 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:320 +#: builtin/worktree.c:323 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:321 +#: builtin/worktree.c:324 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/worktree.c:328 +#: builtin/worktree.c:331 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" @@ -11024,48 +11185,48 @@ msgstr "giltig-till" msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:236 +#: parse-options.h:237 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:238 +#: parse-options.h:239 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:244 +#: parse-options.h:245 msgid "use <n> digits to display SHA-1s" msgstr "använd <n> siffror för att visa SHA-1:or" -#: rerere.h:28 +#: rerere.h:38 msgid "update the index with reused conflict resolution if possible" msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt" -#: git-bisect.sh:50 +#: git-bisect.sh:55 msgid "You need to start by \"git bisect start\"" msgstr "Du måste starta med \"git bisect start\"" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:56 +#: git-bisect.sh:61 msgid "Do you want me to do it for you [Y/n]? " msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]?" -#: git-bisect.sh:99 +#: git-bisect.sh:122 #, sh-format msgid "unrecognised option: '$arg'" msgstr "flaggan känns inte igen: \"$arg\"" -#: git-bisect.sh:103 +#: git-bisect.sh:126 #, sh-format msgid "'$arg' does not appear to be a valid revision" msgstr "\"$arg\" verkar inte vara en giltig revision" -#: git-bisect.sh:132 +#: git-bisect.sh:155 msgid "Bad HEAD - I need a HEAD" msgstr "Felaktigt HEAD - Jag behöver ett HEAD" -#: git-bisect.sh:145 +#: git-bisect.sh:168 #, sh-format msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." @@ -11074,39 +11235,39 @@ msgstr "" "<giltig_gren>\"" # cogito-relaterat -#: git-bisect.sh:155 +#: git-bisect.sh:178 msgid "won't bisect on cg-seek'ed tree" msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts" -#: git-bisect.sh:159 +#: git-bisect.sh:182 msgid "Bad HEAD - strange symbolic ref" msgstr "Felaktigt HEAD - konstig symbolisk referens" -#: git-bisect.sh:211 +#: git-bisect.sh:234 #, sh-format msgid "Bad bisect_write argument: $state" msgstr "Felaktigt argument till bisect_write: $state" -#: git-bisect.sh:240 +#: git-bisect.sh:263 #, sh-format msgid "Bad rev input: $arg" msgstr "Felaktig rev-indata: $arg" -#: git-bisect.sh:255 +#: git-bisect.sh:278 msgid "Please call 'bisect_state' with at least one argument." msgstr "Anropa \"bisect_state\" med minst ett argument." -#: git-bisect.sh:267 +#: git-bisect.sh:290 #, sh-format msgid "Bad rev input: $rev" msgstr "Felaktig rev-indata: $rev" -#: git-bisect.sh:276 +#: git-bisect.sh:299 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "\"git bisect $TERM_BAD\" kan bara ta ett argument." -#: git-bisect.sh:299 +#: git-bisect.sh:322 #, sh-format msgid "Warning: bisecting only with a $TERM_BAD commit." msgstr "" @@ -11115,11 +11276,11 @@ msgstr "" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:305 +#: git-bisect.sh:328 msgid "Are you sure [Y/n]? " msgstr "Är du säker [Y=ja/N=nej]? " -#: git-bisect.sh:317 +#: git-bisect.sh:340 #, sh-format msgid "" "You need to give me at least one $bad_syn and one $good_syn revision.\n" @@ -11130,7 +11291,7 @@ msgstr "" "(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för " "detta.)" -#: git-bisect.sh:320 +#: git-bisect.sh:343 #, sh-format msgid "" "You need to start by \"git bisect start\".\n" @@ -11143,16 +11304,16 @@ msgstr "" "(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för " "detta.)" -#: git-bisect.sh:391 git-bisect.sh:521 +#: git-bisect.sh:414 git-bisect.sh:546 msgid "We are not bisecting." msgstr "Vi utför ingen bisect för tillfället." -#: git-bisect.sh:398 +#: git-bisect.sh:421 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "\"$invalid\" är inte en giltig incheckning" -#: git-bisect.sh:407 +#: git-bisect.sh:430 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" @@ -11161,25 +11322,25 @@ msgstr "" "Kunde inte checka ut original-HEAD \"$branch\".\n" "Försök \"git bisect reset <incheckning>\"." -#: git-bisect.sh:435 +#: git-bisect.sh:458 msgid "No logfile given" msgstr "Ingen loggfil angiven" -#: git-bisect.sh:436 +#: git-bisect.sh:459 #, sh-format msgid "cannot read $file for replaying" msgstr "kan inte läsa $file för uppspelning" -#: git-bisect.sh:455 +#: git-bisect.sh:480 msgid "?? what are you talking about?" msgstr "?? vad menar du?" -#: git-bisect.sh:467 +#: git-bisect.sh:492 #, sh-format msgid "running $command" msgstr "kör $command" -#: git-bisect.sh:474 +#: git-bisect.sh:499 #, sh-format msgid "" "bisect run failed:\n" @@ -11188,11 +11349,11 @@ msgstr "" "\"bisect\"-körningen misslyckades:\n" "felkod $res från \"$command\" är < 0 eller >= 128" -#: git-bisect.sh:500 +#: git-bisect.sh:525 msgid "bisect run cannot continue any more" msgstr "\"bisect\"-körningen kan inte fortsätta längre" -#: git-bisect.sh:506 +#: git-bisect.sh:531 #, sh-format msgid "" "bisect run failed:\n" @@ -11201,16 +11362,48 @@ msgstr "" "\"bisect\"-körningen misslyckades:\n" "\"bisect_state $state\" avslutades med felkoden $res" -#: git-bisect.sh:513 +#: git-bisect.sh:538 msgid "bisect run success" msgstr "\"bisect\"-körningen lyckades" -#: git-bisect.sh:548 +#: git-bisect.sh:565 +msgid "please use two different terms" +msgstr "termerna måste vara olika" + +#: git-bisect.sh:575 +#, sh-format +msgid "'$term' is not a valid term" +msgstr "\"$term\" är inte en giltig term" + +#: git-bisect.sh:578 +#, sh-format +msgid "can't use the builtin command '$term' as a term" +msgstr "kan inte använda det inbyggda kommandot \"$term\" som term" + +#: git-bisect.sh:587 git-bisect.sh:593 +#, sh-format +msgid "can't change the meaning of term '$term'" +msgstr "kan inte ändra betydelsen av termen \"$term\"" + +#: git-bisect.sh:606 #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "" "Ogiltigt kommando: du utför just nu en \"bisect\" med $TERM_BAD/$TERM_GOOD." +#: git-bisect.sh:636 +msgid "no terms defined" +msgstr "inga termer angivna" + +#: git-bisect.sh:653 +#, sh-format +msgid "" +"invalid argument $arg for 'git bisect terms'.\n" +"Supported options are: --term-good|--term-old and --term-bad|--term-new." +msgstr "" +"ogiltigt argument $arg för \"git bisect terms\".\n" +"Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new." + #: git-rebase.sh:57 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" @@ -11249,23 +11442,23 @@ msgstr "Kroken pre-rebase vägrade ombaseringen." msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Det verkar som en git-am körs. Kan inte ombasera." -#: git-rebase.sh:351 +#: git-rebase.sh:354 msgid "The --exec option must be used with the --interactive option" msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive" -#: git-rebase.sh:356 +#: git-rebase.sh:359 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: git-rebase.sh:367 +#: git-rebase.sh:370 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." -#: git-rebase.sh:374 +#: git-rebase.sh:377 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: git-rebase.sh:377 +#: git-rebase.sh:380 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -11273,12 +11466,12 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: git-rebase.sh:395 +#: git-rebase.sh:398 #, sh-format msgid "Could not move back to $head_name" msgstr "Kunde inte flytta tillbaka till $head_name" -#: git-rebase.sh:414 +#: git-rebase.sh:417 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11299,65 +11492,65 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där." -#: git-rebase.sh:465 +#: git-rebase.sh:468 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ogiltig uppström $upstream_name" -#: git-rebase.sh:489 +#: git-rebase.sh:492 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: mer än en sammanslagningsbas finns" -#: git-rebase.sh:492 git-rebase.sh:496 +#: git-rebase.sh:495 git-rebase.sh:499 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ingen sammanslagningsbas finns" -#: git-rebase.sh:501 +#: git-rebase.sh:504 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Peka på en giltig incheckning: $onto_name" -#: git-rebase.sh:524 +#: git-rebase.sh:527 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ödesdigert: ingen sådan gren: $branch_name" -#: git-rebase.sh:557 +#: git-rebase.sh:560 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: git-rebase.sh:562 +#: git-rebase.sh:565 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Skapade autostash: $stash_abbrev" -#: git-rebase.sh:566 +#: git-rebase.sh:569 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: git-rebase.sh:586 +#: git-rebase.sh:589 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name är à jour." -#: git-rebase.sh:590 +#: git-rebase.sh:593 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad." -#: git-rebase.sh:601 +#: git-rebase.sh:604 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Ändringar från $mb till $onto:" -#: git-rebase.sh:610 +#: git-rebase.sh:613 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..." -#: git-rebase.sh:620 +#: git-rebase.sh:623 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." @@ -11430,113 +11623,97 @@ msgstr "Kan inte spara aktuell status" msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: git-stash.sh:387 +#: git-stash.sh:405 #, sh-format msgid "unknown option: $opt" msgstr "okänd flagga: $opt" -#: git-stash.sh:397 +#: git-stash.sh:415 msgid "No stash found." msgstr "Ingen \"stash\" hittades." -#: git-stash.sh:404 +#: git-stash.sh:422 #, sh-format msgid "Too many revisions specified: $REV" msgstr "För många revisioner angivna: $REV" -#: git-stash.sh:410 +#: git-stash.sh:428 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference är inte en giltig referens" -#: git-stash.sh:438 +#: git-stash.sh:456 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" -#: git-stash.sh:449 +#: git-stash.sh:467 #, sh-format msgid "'$args' is not a stash reference" msgstr "\"$args\" är inte en \"stash\"-referens" -#: git-stash.sh:457 +#: git-stash.sh:475 msgid "unable to refresh index" msgstr "kan inte uppdatera indexet" -#: git-stash.sh:461 +#: git-stash.sh:479 msgid "Cannot apply a stash in the middle of a merge" msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning" -#: git-stash.sh:469 +#: git-stash.sh:487 msgid "Conflicts in index. Try without --index." msgstr "Konflikter i indexet. Testa utan --index." -#: git-stash.sh:471 +#: git-stash.sh:489 msgid "Could not save index tree" msgstr "Kunde inte spara indexträd" -#: git-stash.sh:505 +#: git-stash.sh:523 msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-stash.sh:520 +#: git-stash.sh:538 msgid "Index was not unstashed." msgstr "Indexet har inte tagits ur kön." -#: git-stash.sh:543 +#: git-stash.sh:561 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-stash.sh:544 +#: git-stash.sh:562 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:552 +#: git-stash.sh:570 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: git-stash.sh:624 +#: git-stash.sh:642 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" -#: git-submodule.sh:95 +#: git-submodule.sh:104 #, 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:237 -#, 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:287 -#, 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:296 -#, sh-format -msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" -msgstr "Gitkatalog \"$a\" ingår i undermodulsökvägen \"$b\" eller omvänt" - -#: git-submodule.sh:406 +#: git-submodule.sh:281 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå" -#: git-submodule.sh:416 +#: git-submodule.sh:291 #, 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:433 +#: git-submodule.sh:308 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:437 +#: git-submodule.sh:312 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -11547,22 +11724,22 @@ msgstr "" "$sm_path\n" "Använd -f om du verkligen vill lägga till den" -#: git-submodule.sh:455 +#: git-submodule.sh:330 #, 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:457 +#: git-submodule.sh:332 #, 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:465 +#: git-submodule.sh:340 #, 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:467 +#: git-submodule.sh:342 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" @@ -11570,14 +11747,14 @@ msgstr "" "För att återanvända den lokala git-katalogen istället för att på nytt klona " "från" -#: git-submodule.sh:469 +#: git-submodule.sh:344 #, 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:470 +#: git-submodule.sh:345 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " @@ -11586,81 +11763,81 @@ msgstr "" "eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--name" "\"." -#: git-submodule.sh:472 +#: git-submodule.sh:347 #, 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:484 +#: git-submodule.sh:359 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:489 +#: git-submodule.sh:364 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:498 +#: git-submodule.sh:373 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:542 +#: git-submodule.sh:417 #, sh-format msgid "Entering '$prefix$displaypath'" msgstr "Går in i \"$prefix$displaypath\"" -#: git-submodule.sh:562 +#: git-submodule.sh:437 #, sh-format msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." msgstr "" "Stoppar på \"$prefix$displaypath\"; skriptet returnerade en status skild " "från noll." -#: git-submodule.sh:608 +#: git-submodule.sh:483 #, sh-format msgid "No url found for submodule path '$displaypath' in .gitmodules" msgstr "" "Hittade ingen url för undermodulsökvägen \"$displaypath\" i .gitmodules" -#: git-submodule.sh:617 +#: git-submodule.sh:492 #, sh-format msgid "Failed to register url for submodule path '$displaypath'" msgstr "Misslyckades registrera url för undermodulsökväg \"$displaypath\"" -#: git-submodule.sh:619 +#: git-submodule.sh:494 #, sh-format msgid "Submodule '$name' ($url) registered for path '$displaypath'" msgstr "" "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$displaypath\"" -#: git-submodule.sh:636 +#: git-submodule.sh:511 #, sh-format msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "" "Misslyckades registrera uppdateringsläge för undermodulsökväg \"$displaypath" "\"" -#: git-submodule.sh:674 +#: git-submodule.sh:549 #, 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:691 +#: git-submodule.sh:566 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" "Undermodulens arbetskatalog \"$displaypath\" innehåller katalogen \".git\"" -#: git-submodule.sh:692 +#: git-submodule.sh:567 #, 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:698 +#: git-submodule.sh:573 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -11669,28 +11846,28 @@ msgstr "" "Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" " "kastar bort dem" -#: git-submodule.sh:701 +#: git-submodule.sh:576 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Rensade katalogen \"$displaypath\"" -#: git-submodule.sh:702 +#: git-submodule.sh:577 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\"" -#: git-submodule.sh:705 +#: git-submodule.sh:580 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\"" -#: git-submodule.sh:714 +#: git-submodule.sh:589 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\"" -#: git-submodule.sh:830 +#: git-submodule.sh:705 #, sh-format msgid "" "Submodule path '$displaypath' not initialized\n" @@ -11699,108 +11876,159 @@ msgstr "" "Undermodulen \"$displaypath\" har inte initierats\n" "Kanske du vill köra \"update --init\"?" -#: git-submodule.sh:843 +#: git-submodule.sh:718 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:852 +#: git-submodule.sh:727 #, 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:876 +#: git-submodule.sh:751 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\"" -#: git-submodule.sh:890 +#: git-submodule.sh:765 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:891 +#: git-submodule.sh:766 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:895 +#: git-submodule.sh:770 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:896 +#: git-submodule.sh:771 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:901 +#: git-submodule.sh:776 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:902 +#: git-submodule.sh:777 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:907 +#: git-submodule.sh:782 #, sh-format msgid "" "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" msgstr "" "Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$prefix$sm_path\"" -#: git-submodule.sh:908 +#: git-submodule.sh:783 #, sh-format msgid "Submodule path '$prefix$sm_path': '$command $sha1'" msgstr "Undermodulsökvägen \"$prefix$sm_path\": \"$command $sha1\"" -#: git-submodule.sh:938 +#: git-submodule.sh:813 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:1046 +#: git-submodule.sh:921 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" -#: git-submodule.sh:1098 +#: git-submodule.sh:973 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:1118 +#: git-submodule.sh:993 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src" -#: git-submodule.sh:1121 +#: git-submodule.sh:996 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst" -#: git-submodule.sh:1124 +#: git-submodule.sh:999 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Varning: $display_name innehåller inte incheckningarna $sha1_src och " "$sha1_dst" -#: git-submodule.sh:1149 +#: git-submodule.sh:1024 msgid "blob" msgstr "blob" -#: git-submodule.sh:1267 +#: git-submodule.sh:1142 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:1331 +#: git-submodule.sh:1206 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" +#~ msgid "branch '%s' does not point at a commit" +#~ msgstr "grenen \"%s\" pekar inte på en incheckning" + +#~ msgid "object '%s' does not point to a commit" +#~ msgstr "objektet \"%s\" pekar på en incheckning" + +#~ msgid "some refs could not be read" +#~ msgstr "vissa referenser kunde inte läsas" + +#~ msgid "print only merged branches" +#~ msgstr "visa endast sammanslagna grenar" + +#~ msgid "--dissociate given, but there is no --reference" +#~ msgstr "--dissociate angavs, men --reference har inte angivits" + +#~ msgid "show usage" +#~ msgstr "visa användning" + +#~ msgid "insanely long template name %s" +#~ msgstr "tokigt långt namn på mallen %s" + +#~ msgid "insanely long symlink %s" +#~ msgstr "tokigt lång symbolisk länk %s" + +#~ msgid "insanely long template path %s" +#~ msgstr "tokigt lång mallsökväg %s" + +#~ msgid "insane git directory %s" +#~ msgstr "tokig git-katalog %s" + +#~ msgid "false|true|preserve" +#~ msgstr "false|true|preserve" + +#~ msgid "unsupported sort specification '%s'" +#~ msgstr "sorteringsangivelsen \"%s\" stöds ej" + +#~ msgid "unsupported sort specification '%s' in variable '%s'" +#~ msgstr "sorteringsangivelsen \"%s\" i variabeln \"%s\" stöds ej" + +#~ msgid "switch 'points-at' requires an object" +#~ msgstr "flaggan \"points-at\" behöver ett objekt" + +#~ msgid "sort tags" +#~ msgstr "sortera taggar" + +#~ msgid "--sort and -n are incompatible" +#~ msgstr "--sort och -n är inkompatibla" + +#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +#~ msgstr "Gitkatalog \"$a\" ingår i undermodulsökvägen \"$b\" eller omvänt" + #~ msgid "BUG: reopen a lockfile that is still open" #~ msgstr "FEL: återöppna en låsfil som fortfarande är öppen" |