diff options
| author |  Peter Krefting <peter@softwolves.pp.se> | 2016-08-26 14:27:24 +0100 |
|---|---|---|
| committer | Peter Krefting <peter@softwolves.pp.se> | 2016-08-27 20:42:50 +0100 |
| commit | 8ed2d3fb15d3f3d94f2fd51daed478040245c4f8 (patch) | |
| tree | 39031398d3305f158e4bef6a96ee4556a4f6d384 | |
| parent | Merge branch 'master' of https://github.com/vnwildman/git (diff) | |
| download | tgif-8ed2d3fb15d3f3d94f2fd51daed478040245c4f8.tar.xz | |
l10n: sv.po: Update Swedish translation (2757t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
| -rw-r--r-- | po/sv.po | 4834 |
1 files changed, 3043 insertions, 1791 deletions
@@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.8.0\n" +"Project-Id-Version: git 2.10.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-05-24 23:42+0800\n" -"PO-Revision-Date: 2016-05-27 14:04+0100\n" +"POT-Creation-Date: 2016-08-27 23:21+0800\n" +"PO-Revision-Date: 2016-08-27 20:41+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" @@ -23,7 +23,42 @@ msgstr "" msgid "hint: %.*s\n" msgstr "tips: %.*s\n" -#: advice.c:88 +#: advice.c:83 +msgid "Cherry-picking is not possible because you have unmerged files." +msgstr "" +"Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits " +"samman." + +#: advice.c:85 +msgid "Committing is not possible because you have unmerged files." +msgstr "" +"Du kan inte utföra en incheckning eftersom du har filer som inte slagits " +"samman." + +#: advice.c:87 +msgid "Merging is not possible because you have unmerged files." +msgstr "" +"Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits " +"samman." + +#: advice.c:89 +msgid "Pulling is not possible because you have unmerged files." +msgstr "" +"Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman." + +#: advice.c:91 +msgid "Reverting is not possible because you have unmerged files." +msgstr "" +"Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits " +"samman." + +#: advice.c:93 +#, c-format +msgid "It is not possible to %s because you have unmerged files." +msgstr "" +"Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman." + +#: advice.c:101 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -31,18 +66,51 @@ 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:1238 +#: advice.c:109 +msgid "Exiting because of an unresolved conflict." +msgstr "Avslutar på grund av olöst konflikgt." + +#: advice.c:114 builtin/merge.c:1181 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: advice.c:103 +#: advice.c:116 msgid "Please, commit your changes before merging." msgstr "Checka in dina ändringar innan du utför sammanslagningen." -#: advice.c:104 +#: advice.c:117 msgid "Exiting because of unfinished merge." msgstr "Avslutar på grund av ofullbordad sammanslagning." +#: advice.c:123 +#, c-format +msgid "" +"Note: checking out '%s'.\n" +"\n" +"You are in 'detached HEAD' state. You can look around, make experimental\n" +"changes and commit them, and you can discard any commits you make in this\n" +"state without impacting any branches by performing another checkout.\n" +"\n" +"If you want to create a new branch to retain commits you create, you may\n" +"do so (now or later) by using -b with the checkout command again. Example:\n" +"\n" +" git checkout -b <new-branch-name>\n" +"\n" +msgstr "" +"Observera: checkar ut \"%s\".\n" +"\n" +"Du har nu ett \"frånkopplat HEAD\". Du kan se dig omkring, experimentera\n" +"med ändringar och checka in dem, och du kan kasta incheckningar du gör\n" +"i det här läget utan att det påverkar grenar genom att checka ut på\n" +"nytt.\n" +"\n" +"Om du vill skapa en ny gren för att behålla ändringarna du skapar, kan\n" +"du göra det (nu eller senare) genom att använda checkout-kommandot igen\n" +"med -b. Till exempel:\n" +"\n" +" git checkout -b <namn-på-ny-gren>\n" +"\n" + #: archive.c:12 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]" @@ -62,7 +130,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -75,7 +143,7 @@ msgstr "fmt" msgid "archive format" msgstr "arkivformat" -#: archive.c:430 builtin/log.c:1395 +#: archive.c:430 builtin/log.c:1422 msgid "prefix" msgstr "prefix" @@ -83,11 +151,11 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 -#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 +#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987 #: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100 -#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153 +#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399 +#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153 msgid "file" msgstr "fil" @@ -120,7 +188,7 @@ msgid "list supported archive formats" msgstr "visa understödda arkivformat" #: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 -#: builtin/submodule--helper.c:776 +#: builtin/submodule--helper.c:832 msgid "repo" msgstr "arkiv" @@ -128,7 +196,7 @@ msgstr "arkiv" msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483 msgid "command" msgstr "kommando" @@ -136,6 +204,28 @@ msgstr "kommando" msgid "path to the remote git-upload-archive command" msgstr "sökväg till kommandot git-upload-archive på fjärren" +#: archive.c:461 +msgid "Unexpected option --remote" +msgstr "Oväntad flagga --remote" + +#: archive.c:463 +msgid "Option --exec can only be used together with --remote" +msgstr "Flaggan --exec kan endast användas tillsammans med --remote" + +#: archive.c:465 +msgid "Unexpected option --output" +msgstr "Oväntad flagga --output" + +#: archive.c:487 +#, c-format +msgid "Unknown archive format '%s'" +msgstr "Okänt arkivformat \"%s\"" + +#: archive.c:494 +#, c-format +msgid "Argument not supported for format '%s': -%d" +msgstr "Argumentet stöd inte för formatet \"%s\": -%d" + #: attr.c:263 msgid "" "Negative patterns are ignored in git attributes\n" @@ -144,6 +234,130 @@ msgstr "" "Negativa mönster ignoreras i git-attribut\n" "Använd '\\!' för att inleda med ett utropstecken." +#: bisect.c:441 +#, c-format +msgid "Could not open file '%s'" +msgstr "Kunde inte öppna filen \"%s\"" + +#: bisect.c:446 +#, c-format +msgid "Badly quoted content in file '%s': %s" +msgstr "Felaktigt citerat innehåll i filen \"%s\": %s" + +#: bisect.c:655 +#, c-format +msgid "We cannot bisect more!\n" +msgstr "Det finns inte mer att göra \"bisect\" på!\n" + +#: bisect.c:708 +#, c-format +msgid "Not a valid commit name %s" +msgstr "Namnet på incheckningen är inte giltigt: %s" + +#: bisect.c:732 +#, c-format +msgid "" +"The merge base %s is bad.\n" +"This means the bug has been fixed between %s and [%s].\n" +msgstr "" +"Sammanslagningsbasen %s är trasig.\n" +"Det betyder att felet har rättats mellan %s och [%s].\n" + +#: bisect.c:737 +#, c-format +msgid "" +"The merge base %s is new.\n" +"The property has changed between %s and [%s].\n" +msgstr "" +"Sammanslagningsbasen %s är ny.\n" +"Egenskapen har ändrats mellan %s och [%s].\n" + +#: bisect.c:742 +#, c-format +msgid "" +"The merge base %s is %s.\n" +"This means the first '%s' commit is between %s and [%s].\n" +msgstr "" +"Sammanslagningsbasen %s är %s.\n" +"Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n" + +#: bisect.c:750 +#, c-format +msgid "" +"Some %s revs are not ancestor of the %s rev.\n" +"git bisect cannot work properly in this case.\n" +"Maybe you mistook %s and %s revs?\n" +msgstr "" +"Några %s-revisioner är inte föräldrar till %s-revisionen.\n" +"git bisect kan inte arbeta korrekt i detta fall.\n" +"Kanske du skrev fel %s- och %s-revisioner?\n" + +#: bisect.c:763 +#, c-format +msgid "" +"the merge base between %s and [%s] must be skipped.\n" +"So we cannot be sure the first %s commit is between %s and %s.\n" +"We continue anyway." +msgstr "" +"sammanslagningsbasen mellan %s och [%s] måste hoppas över.\n" +"Vi kan inte vara säkra på att den första %s incheckningen är mellan %s och " +"%s.\n" +"Vi fortsätter ändå." + +#: bisect.c:798 +#, c-format +msgid "Bisecting: a merge base must be tested\n" +msgstr "Bisect: en sammanslagningsbas måste testas\n" + +#: bisect.c:849 +#, c-format +msgid "a %s revision is needed" +msgstr "en %s-revision behövs" + +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 +#, c-format +msgid "could not create file '%s'" +msgstr "kunde inte skapa filen \"%s\"" + +#: bisect.c:917 +#, c-format +msgid "could not read file '%s'" +msgstr "kunde inte läsa filen \"%s\"" + +#: bisect.c:947 +msgid "reading bisect refs failed" +msgstr "misslyckades läsa bisect-referenser" + +#: bisect.c:967 +#, c-format +msgid "%s was both %s and %s\n" +msgstr "%s var både %s och %s\n" + +#: bisect.c:975 +#, c-format +msgid "" +"No testable commit found.\n" +"Maybe you started with bad path parameters?\n" +msgstr "" +"Ingen testbar incheckning hittades.\n" +"Kanske du startade med felaktiga sökvägsparametrar?\n" + +#: bisect.c:994 +#, c-format +msgid "(roughly %d step)" +msgid_plural "(roughly %d steps)" +msgstr[0] "(ungefär %d steg)" +msgstr[1] "(ungefär %d steg)" + +#. TRANSLATORS: the last %s will be replaced with +#. "(roughly %d steps)" translation +#: bisect.c:998 +#, c-format +msgid "Bisecting: %d revision left to test after this %s\n" +msgid_plural "Bisecting: %d revisions left to test after this %s\n" +msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n" +msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n" + #: branch.c:53 #, c-format msgid "" @@ -292,7 +506,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:777 +#: bundle.c:87 builtin/commit.c:778 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -301,10 +515,10 @@ msgstr "kunde inte öppna \"%s\"" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 -#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 -#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 -#: builtin/merge.c:361 builtin/shortlog.c:170 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085 +#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348 +#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901 +#: builtin/merge.c:356 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -343,7 +557,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:163 builtin/log.c:1538 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -361,13 +575,13 @@ msgstr "kan inte skapa \"%s\"" msgid "index-pack died" msgstr "index-pack dog" -#: color.c:275 +#: color.c:290 #, c-format msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 -#: builtin/am.c:2134 +#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505 +#: builtin/am.c:2119 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -381,128 +595,199 @@ msgstr "%s %s är inte en incheckning!" msgid "memory exhausted" msgstr "minnet slut" -#: config.c:475 config.c:477 +#: config.c:516 +#, c-format +msgid "bad config line %d in blob %s" +msgstr "felaktig konfigurationsfil rad %d i blob:en %s" + +#: config.c:520 #, c-format -msgid "bad config line %d in %s %s" -msgstr "felaktig konfigurationsfil rad %d i %s %s" +msgid "bad config line %d in file %s" +msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:593 +#: config.c:524 #, c-format -msgid "bad numeric config value '%s' for '%s' in %s %s: %s" -msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s %s: %s" +msgid "bad config line %d in standard input" +msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:595 +#: config.c:528 +#, c-format +msgid "bad config line %d in submodule-blob %s" +msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" + +#: config.c:532 +#, c-format +msgid "bad config line %d in command line %s" +msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" + +#: config.c:536 +#, c-format +msgid "bad config line %d in %s" +msgstr "felaktig konfigurationsfil rad %d i %s" + +#: config.c:655 +msgid "out of range" +msgstr "utanför intervallet" + +#: config.c:655 +msgid "invalid unit" +msgstr "ogiltig enhet" + +#: config.c:661 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:680 +#: config.c:666 +#, c-format +msgid "bad numeric config value '%s' for '%s' in blob %s: %s" +msgstr "" +"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s" + +#: config.c:669 +#, c-format +msgid "bad numeric config value '%s' for '%s' in file %s: %s" +msgstr "" +"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s" + +#: config.c:672 +#, c-format +msgid "bad numeric config value '%s' for '%s' in standard input: %s" +msgstr "" +"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s" + +#: config.c:675 +#, c-format +msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" +msgstr "" +"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:" +"en %s: %s" + +#: config.c:678 +#, c-format +msgid "bad numeric config value '%s' for '%s' in command line %s: %s" +msgstr "" +"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden " +"%s: %s" + +#: config.c:681 +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s" + +#: config.c:768 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:761 config.c:772 +#: config.c:849 config.c:860 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:890 +#: config.c:978 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1228 +#: config.c:1312 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:1284 -msgid "unknown error occured while reading the configuration files" +#: config.c:1362 +msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:1629 +#: config.c:1716 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:1631 +#: config.c:1718 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d" -#: config.c:1690 +#: config.c:1777 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2224 +#: config.c:2311 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2226 +#: config.c:2313 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: connected.c:69 +# Vague original, not networking-related, but rather related to the actual +# objects in the database. +#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 +msgid "Checking connectivity" +msgstr "Kontrollerar konnektivitet" + +#: connected.c:74 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:89 +#: connected.c:94 msgid "failed write to rev-list" msgstr "kunde inte skriva till rev-list" -#: connected.c:96 +#: connected.c:101 msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" -#: date.c:95 +#: date.c:97 msgid "in the future" msgstr "i framtiden" -#: date.c:101 +#: date.c:103 #, c-format msgid "%lu second ago" msgid_plural "%lu seconds ago" msgstr[0] "%lu sekund sedan" msgstr[1] "%lu sekunder sedan" -#: date.c:108 +#: date.c:110 #, c-format msgid "%lu minute ago" msgid_plural "%lu minutes ago" msgstr[0] "%lu minut sedan" msgstr[1] "%lu minuter sedan" -#: date.c:115 +#: date.c:117 #, c-format msgid "%lu hour ago" msgid_plural "%lu hours ago" msgstr[0] "%lu timme sedan" msgstr[1] "%lu timmar sedan" -#: date.c:122 +#: date.c:124 #, c-format msgid "%lu day ago" msgid_plural "%lu days ago" msgstr[0] "%lu dag sedan" msgstr[1] "%lu dagar sedan" -#: date.c:128 +#: date.c:130 #, c-format msgid "%lu week ago" msgid_plural "%lu weeks ago" msgstr[0] "%lu vecka sedan" msgstr[1] "%lu veckor sedan" -#: date.c:135 +#: date.c:137 #, c-format msgid "%lu month ago" msgid_plural "%lu months ago" msgstr[0] "%lu månad sedan" msgstr[1] "%lu månader sedan" -#: date.c:146 +#: date.c:148 #, c-format msgid "%lu year" msgid_plural "%lu years" @@ -510,14 +795,14 @@ msgstr[0] "%lu år" msgstr[1] "%lu år" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:149 +#: date.c:151 #, c-format msgid "%s, %lu month ago" msgid_plural "%s, %lu months ago" msgstr[0] "%s, %lu månad sedan" msgstr[1] "%s, %lu månader sedan" -#: date.c:154 date.c:159 +#: date.c:156 date.c:161 #, c-format msgid "%lu year ago" msgid_plural "%lu years ago" @@ -529,7 +814,7 @@ msgstr[1] "%lu år sedan" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:538 +#: diffcore-rename.c:540 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" @@ -557,16 +842,16 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:3007 +#: diff.c:3017 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:3405 +#: diff.c:3415 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:3568 +#: diff.c:3578 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -575,7 +860,7 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3582 +#: diff.c:3592 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" @@ -588,39 +873,30 @@ msgstr "misslyckades hämta kärnans namn och information" msgid "Untracked cache is disabled on this system or location." msgstr "Ospårad cache är inaktiverad på systemet eller platsen." -#: gpg-interface.c:166 gpg-interface.c:235 -msgid "could not run gpg." -msgstr "kunde inte köra gpg." - #: gpg-interface.c:178 -msgid "gpg did not accept the data" -msgstr "gpg godtog inte data" - -#: gpg-interface.c:189 msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" -#: gpg-interface.c:222 -#, c-format -msgid "could not create temporary file '%s'" -msgstr "kunde inte skapa temporära filen \"%s\"" +#: gpg-interface.c:208 +msgid "could not create temporary file" +msgstr "kunde inte skapa temporära fil" -#: gpg-interface.c:224 +#: gpg-interface.c:210 #, c-format msgid "failed writing detached signature to '%s'" msgstr "misslyckades skriva fristående signatur till \"%s\"" -#: grep.c:1718 +#: grep.c:1792 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:1746 +#: grep.c:1820 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" @@ -670,7 +946,7 @@ msgstr "automatiskt om %0.1f sekunder..." msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"." -#: help.c:404 help.c:464 +#: help.c:404 help.c:470 msgid "" "\n" "Did you mean this?" @@ -684,7 +960,7 @@ msgstr[1] "" "\n" "Menade du ett av dessa?" -#: help.c:460 +#: help.c:466 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" @@ -718,83 +994,78 @@ msgstr "kunde inte skapa \"%s.lock\": %s" msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 -#: builtin/checkout.c:586 builtin/clone.c:732 +#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375 +#: builtin/checkout.c:589 builtin/clone.c:732 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: merge-recursive.c:189 -#, c-format +#: merge-recursive.c:209 msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" -#: merge-recursive.c:209 +#: merge-recursive.c:231 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "addinfo_cache misslyckades för sökvägen \"%s\"" -#: merge-recursive.c:270 +#: merge-recursive.c:301 msgid "error building trees" msgstr "fel vid byggande av träd" -#: merge-recursive.c:689 +#: merge-recursive.c:720 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:700 +#: merge-recursive.c:731 #, 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:714 merge-recursive.c:735 +#: merge-recursive.c:745 merge-recursive.c:764 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:725 +#: merge-recursive.c:754 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:765 +#: merge-recursive.c:796 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:767 +#: merge-recursive.c:798 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:790 builtin/clone.c:376 +#: merge-recursive.c:822 #, c-format -msgid "failed to open '%s'" -msgstr "misslyckades öppna \"%s\"" +msgid "failed to open '%s': %s" +msgstr "misslyckades öppna \"%s\": %s" -#: merge-recursive.c:798 +#: merge-recursive.c:833 #, c-format -msgid "failed to symlink '%s'" -msgstr "misslyckades skapa symboliska länken \"%s\"" +msgid "failed to symlink '%s': %s" +msgstr "misslyckades skapa symboliska länken \"%s\": %s" -#: merge-recursive.c:801 +#: merge-recursive.c:838 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" skall hanteras" -#: merge-recursive.c:939 +#: merge-recursive.c:978 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:943 +#: merge-recursive.c:982 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:959 -msgid "unsupported object type in the tree" -msgstr "objekttyp som ej stöds upptäcktes i trädet" - -#: merge-recursive.c:1034 merge-recursive.c:1048 +#: merge-recursive.c:1081 merge-recursive.c:1095 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -803,7 +1074,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:1040 merge-recursive.c:1053 +#: merge-recursive.c:1087 merge-recursive.c:1100 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -812,20 +1083,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:1094 +#: merge-recursive.c:1143 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1094 +#: merge-recursive.c:1143 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1150 +#: merge-recursive.c:1200 #, 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:1172 +#: merge-recursive.c:1225 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -834,144 +1105,135 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1177 +#: merge-recursive.c:1230 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1231 +#: merge-recursive.c:1292 #, 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:1261 +#: merge-recursive.c:1325 #, 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:1460 +#: merge-recursive.c:1531 #, 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:1470 +#: merge-recursive.c:1546 #, c-format msgid "Adding merged %s" msgstr "Lägger till sammanslagen %s" -#: merge-recursive.c:1475 merge-recursive.c:1677 +#: merge-recursive.c:1553 merge-recursive.c:1766 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:1526 +#: merge-recursive.c:1610 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:1529 +#: merge-recursive.c:1613 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:1581 +#: merge-recursive.c:1666 msgid "modify" msgstr "ändra" -#: merge-recursive.c:1581 +#: merge-recursive.c:1666 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:1591 +#: merge-recursive.c:1676 msgid "content" msgstr "innehåll" -#: merge-recursive.c:1598 +#: merge-recursive.c:1683 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:1632 +#: merge-recursive.c:1718 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:1646 +#: merge-recursive.c:1732 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1650 git-submodule.sh:941 +#: merge-recursive.c:1736 git-submodule.sh:919 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:1651 +#: merge-recursive.c:1737 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:1737 +#: merge-recursive.c:1831 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:1762 +#: merge-recursive.c:1857 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:1768 +#: merge-recursive.c:1863 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:1773 +#: merge-recursive.c:1868 #, 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:1781 +#: merge-recursive.c:1877 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1798 -msgid "Fatal merge failure, shouldn't happen." -msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa." - -#: merge-recursive.c:1817 +#: merge-recursive.c:1914 msgid "Already up-to-date!" msgstr "Redan à jour!" -#: merge-recursive.c:1826 +#: merge-recursive.c:1923 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:1856 -#, c-format -msgid "Unprocessed path??? %s" -msgstr "Obehandlad sökväg??? %s" - -#: merge-recursive.c:1904 +#: merge-recursive.c:2006 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:1917 +#: merge-recursive.c:2019 #, 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:1954 +#: merge-recursive.c:2058 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2011 +#: merge-recursive.c:2121 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 +#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -1031,7 +1293,7 @@ msgstr "-TAL" msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: path.c:796 +#: path.c:798 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" @@ -1101,7 +1363,7 @@ msgstr "" "Ingenting att exkludera från med :(exkludera)-mönster.\n" "Glömde du kanske att antingen lägga till \":/\" eller \".\"?" -#: pretty.c:971 +#: pretty.c:973 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" @@ -1127,23 +1389,22 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 -#: builtin/merge.c:995 +#: refs.c:551 builtin/merge.c:840 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: refs/files-backend.c:2243 +#: refs/files-backend.c:2534 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:2246 +#: refs/files-backend.c:2537 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" -#: refs/files-backend.c:2255 +#: refs/files-backend.c:2546 #, c-format msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" @@ -1301,74 +1562,74 @@ msgstr "%s spårar både %s och %s" msgid "Internal error" msgstr "Internt fel" -#: remote.c:1678 remote.c:1721 +#: remote.c:1677 remote.c:1720 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1687 +#: remote.c:1686 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1690 +#: remote.c:1689 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1696 +#: remote.c:1695 #, 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:1711 +#: remote.c:1710 #, 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:1726 +#: remote.c:1725 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjärr för \"push\"" -#: remote.c:1737 +#: remote.c:1736 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" -#: remote.c:1750 +#: remote.c:1749 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1772 +#: remote.c:1771 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:2074 +#: remote.c:2073 #, 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:2078 +#: remote.c:2077 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:2081 +#: remote.c:2080 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:2085 +#: remote.c:2084 #, 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:2091 +#: remote.c:2090 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:2094 +#: remote.c:2093 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1378,11 +1639,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2102 +#: remote.c:2101 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:2105 +#: remote.c:2104 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1397,20 +1658,20 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2115 +#: remote.c:2114 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:2142 +#: revision.c:2132 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2145 +#: revision.c:2135 #, 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:2339 +#: revision.c:2329 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" @@ -1423,15 +1684,15 @@ msgstr "misslyckades öppna /dev/null" msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) misslyckades" -#: send-pack.c:295 +#: send-pack.c:298 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:404 +#: send-pack.c:411 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" -#: send-pack.c:406 +#: send-pack.c:413 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -1439,10 +1700,14 @@ msgstr "" "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --" "signed" -#: send-pack.c:418 +#: send-pack.c:425 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stöder inte push med --atomic" +#: send-pack.c:430 +msgid "the receiving end does not support push options" +msgstr "mottagarsidan stöder inte push-flaggor" + #: sequencer.c:174 msgid "" "after resolving the conflicts, mark the corrected paths\n" @@ -1461,15 +1726,15 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:190 sequencer.c:833 sequencer.c:912 +#: sequencer.c:190 sequencer.c:841 sequencer.c:924 #, c-format msgid "Could not write to %s" msgstr "Kunde inte skriva till %s" -#: sequencer.c:193 +#: sequencer.c:193 sequencer.c:843 sequencer.c:928 #, c-format -msgid "Error wrapping up %s" -msgstr "Fel vid ombrytning av %s" +msgid "Error wrapping up %s." +msgstr "Fel vid ombrytning av %s." #: sequencer.c:208 msgid "Your local changes would be overwritten by cherry-pick." @@ -1483,202 +1748,242 @@ msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"." msgid "Commit your changes or stash them to proceed." msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta." +#: sequencer.c:228 +#, c-format +msgid "%s: fast-forward" +msgstr "%s: snabbspola" + #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:300 +#: sequencer.c:303 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:318 +#: sequencer.c:321 msgid "Could not resolve HEAD commit\n" msgstr "Kunde inte bestämma HEAD:s incheckning\n" -#: sequencer.c:338 +#: sequencer.c:341 msgid "Unable to update cache tree\n" msgstr "Kan inte uppdatera cacheträd\n" -#: sequencer.c:390 +#: sequencer.c:393 #, c-format msgid "Could not parse commit %s\n" msgstr "Kunde inte tolka incheckningen %s\n" -#: sequencer.c:395 +#: sequencer.c:398 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:460 +#: sequencer.c:463 msgid "Your index file is unmerged." msgstr "Din indexfil har inte slagits ihop." -#: sequencer.c:479 +#: sequencer.c:482 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte." -#: sequencer.c:487 +#: sequencer.c:490 #, c-format msgid "Commit %s does not have parent %d" msgstr "Incheckning %s har inte förälder %d" -#: sequencer.c:491 +#: sequencer.c:494 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:504 +#: sequencer.c:507 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:508 +#: sequencer.c:511 #, c-format msgid "Cannot get commit message for %s" msgstr "Kan inte hämta incheckningsmeddelande för %s" -#: sequencer.c:594 +#: sequencer.c:597 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:595 +#: sequencer.c:598 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:630 +#: sequencer.c:633 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:638 +#: sequencer.c:641 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:642 +#: sequencer.c:645 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:702 -#, c-format -msgid "Cannot %s during a %s" -msgstr "kan inte %s under en %s" +#: sequencer.c:705 +msgid "Cannot revert during another revert." +msgstr "Kan inte utföra \"revert\" under en annan \"revert\"." + +#: sequencer.c:706 +msgid "Cannot revert during a cherry-pick." +msgstr "Kan inte utföra \"revert\" under en \"cherry-pick\"." + +#: sequencer.c:709 +msgid "Cannot cherry-pick during a revert." +msgstr "Kan inte utföra \"cherry-pick\" under en \"revert\"." + +#: sequencer.c:710 +msgid "Cannot cherry-pick during another cherry-pick." +msgstr "Kan inte utföra \"cherry-pick\" under en annan \"cherry-pick\"." -#: sequencer.c:724 +#: sequencer.c:732 #, c-format msgid "Could not parse line %d." msgstr "Kan inte tolka rad %d." -#: sequencer.c:729 +#: sequencer.c:737 msgid "No commits parsed." msgstr "Inga incheckningar lästes." -#: sequencer.c:741 +#: sequencer.c:749 #, c-format msgid "Could not open %s" msgstr "Kunde inte öppna %s" -#: sequencer.c:745 +#: sequencer.c:753 #, c-format msgid "Could not read %s." msgstr "kunde inte läsa %s." -#: sequencer.c:752 +#: sequencer.c:760 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Oanvändbart manus: %s" -#: sequencer.c:782 +#: sequencer.c:790 #, c-format msgid "Invalid key: %s" msgstr "Felaktig nyckel: %s" -#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52 +#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52 #, c-format msgid "Invalid value for %s: %s" msgstr "Felaktigt värde för %s: %s" -#: sequencer.c:795 +#: sequencer.c:803 #, c-format msgid "Malformed options sheet: %s" msgstr "Trasigt manus: %s" -#: sequencer.c:814 +#: sequencer.c:822 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:815 +#: sequencer.c:823 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:819 +#: sequencer.c:827 #, c-format msgid "Could not create sequencer directory %s" msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:835 sequencer.c:916 -#, c-format -msgid "Error wrapping up %s." -msgstr "Fel vid ombrytning av %s." - -#: sequencer.c:854 sequencer.c:986 +#: sequencer.c:862 sequencer.c:998 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:856 +#: sequencer.c:864 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:858 +#: sequencer.c:866 sequencer.c:900 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:878 builtin/fetch.c:610 builtin/fetch.c:851 +#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: sequencer.c:880 +#: sequencer.c:888 #, c-format msgid "cannot read %s: %s" msgstr "kan inte läsa %s: %s" -#: sequencer.c:881 +#: sequencer.c:889 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:887 +#: sequencer.c:895 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig" -#: sequencer.c:909 +#: sequencer.c:921 #, c-format msgid "Could not format %s." msgstr "Kunde inte formatera %s." -#: sequencer.c:1054 +#: sequencer.c:1066 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:1057 +#: sequencer.c:1069 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:1091 +#: sequencer.c:1102 msgid "Can't revert as initial commit" msgstr "Kan inte ångra som första incheckning" -#: sequencer.c:1092 -msgid "Can't cherry-pick into empty head" -msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" +#: setup.c:160 +#, c-format +msgid "" +"%s: no such path in the working tree.\n" +"Use 'git <command> -- <path>...' to specify paths that do not exist locally." +msgstr "" +"%s: sökvägen finns inte i arbetskatalogen.\n" +"Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns " +"lokalt." + +#: setup.c:173 +#, c-format +msgid "" +"ambiguous argument '%s': unknown revision or path not in the working tree.\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git <command> [<revision>...] -- [<file>...]'" +msgstr "" +"tvetydigt argument \"%s\": okänd revision eller sökväg inte i " +"arbetskatalogen.\n" +"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" +"\"git <kommando> [<revision>...] -- [<fil>...]\"" + +#: setup.c:223 +#, c-format +msgid "" +"ambiguous argument '%s': both revision and filename\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git <command> [<revision>...] -- [<file>...]'" +msgstr "" +"tvetydigt argument \"%s\": både revision och filnamn\n" +"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" +"\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:248 +#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" @@ -1692,16 +1997,53 @@ msgstr "Förväntade git-arkivversion <= %d, hittade %d" msgid "unknown repository extensions found:" msgstr "okända arkivutökningar hittades:" -#: sha1_file.c:1080 +#: setup.c:762 +#, c-format +msgid "Not a git repository (or any of the parent directories): %s" +msgstr "Inte ett git-arkiv (eller någon av föräldrakatalogerna): %s" + +#: setup.c:764 setup.c:915 builtin/index-pack.c:1641 +msgid "Cannot come back to cwd" +msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" + +#: setup.c:845 +msgid "Unable to read current working directory" +msgstr "Kan inte läsa aktuell arbetskatalog" + +#: setup.c:920 +#, c-format +msgid "" +"Not a git repository (or any parent up to mount point %s)\n" +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." +msgstr "" +"Inte ett git-arkiv (eller någon av föräldrakatalogerna upp till " +"monteringspunkten %s)\n" +"Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." + +#: setup.c:927 +#, c-format +msgid "Cannot change to '%s/..'" +msgstr "kan inte byta till \"%s/..\"" + +#: setup.c:989 +#, c-format +msgid "" +"Problem with core.sharedRepository filemode value (0%.3o).\n" +"The owner of files must always have read and write permissions." +msgstr "" +"Problem med filläges-värdet i core.sharedRepository (0%.3o).\n" +"Ägaren av filerna måste alltid ha läs- och skrivbehörighet." + +#: sha1_file.c:1046 msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: sha1_file.c:2458 +#: sha1_file.c:2434 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset före slutet av packindex för %s (trasigt index?)" -#: sha1_file.c:2462 +#: sha1_file.c:2438 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" @@ -1757,7 +2099,7 @@ msgstr "misslyckades köa uppdaterad .gitmodules" msgid "negative values not allowed for submodule.fetchJobs" msgstr "negativa värden är inte tillåtna för submodule.fetchJobs" -#: submodule-config.c:355 +#: submodule-config.c:358 #, c-format msgid "invalid value for %s" msgstr "ogiltigt värde för %s" @@ -1816,6 +2158,56 @@ msgstr "kunde inte öppna temporär file" msgid "could not rename temporary file to %s" msgstr "kunde inte byta nman på temporära file till %s" +#: transport.c:62 +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n" + +#: transport.c:151 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "transport: ogiltig flagga för depth: %s" + +#: transport.c:771 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" +"Följande undermodulsökvägar innehåller ändringar som\n" +"inte kan hittas av fjärrarna:\n" + +#: transport.c:775 +#, c-format +msgid "" +"\n" +"Please try\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"or cd to the path and use\n" +"\n" +"\tgit push\n" +"\n" +"to push them to a remote.\n" +"\n" +msgstr "" +"\n" +"Testa\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"eller cd till sökvägen och använd\n" +"\n" +"\tgit push\n" +"\n" +"för att sända dem till fjärren.\n" +"\n" + +#: transport.c:783 +msgid "Aborting." +msgstr "Avbryter." + #: transport-helper.c:1041 #, c-format msgid "Could not read ref %s" @@ -1825,7 +2217,7 @@ msgstr "Kunde inte läsa referensen %s" #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" -"%%sPlease commit your changes or stash them before you can switch branches." +"%%sPlease commit your changes or stash them before you switch branches." msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." @@ -1843,7 +2235,7 @@ msgstr "" #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" -"%%sPlease commit your changes or stash them before you can merge." +"%%sPlease commit your changes or stash them before you merge." msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av " "sammanslagning:\n" @@ -1863,11 +2255,10 @@ msgstr "" #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" -"%%sPlease commit your changes or stash them before you can %s." +"%%sPlease commit your changes or stash them before you %s." msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" -"%%sChecka in dina ändringar eller använd \"stash\" innan du kan utföra \"%s" -"\"." +"%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"." #: unpack-trees.c:76 #, c-format @@ -1892,7 +2283,7 @@ msgstr "" #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" -"%%sPlease move or remove them before you can switch branches." +"%%sPlease move or remove them before you switch branches." msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." @@ -1910,11 +2301,11 @@ msgstr "" #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" -"%%sPlease move or remove them before you can merge." +"%%sPlease move or remove them before you merge." msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av " "sammanslagningen:\n" -"%%sFlytta eller ta bort dem innan du byter gren." +"%%sFlytta eller ta bort dem innan du slår samman." #: unpack-trees.c:92 #, c-format @@ -1930,10 +2321,10 @@ msgstr "" #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" -"%%sPlease move or remove them before you can %s." +"%%sPlease move or remove them before you %s." msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" -"%%sFlytta eller ta bort dem innan du kan utföra \"%s\"." +"%%sFlytta eller ta bort dem innan du \"%s\"." #: unpack-trees.c:97 #, c-format @@ -1949,7 +2340,7 @@ msgstr "" msgid "" "The following untracked working tree files would be overwritten by " "checkout:\n" -"%%sPlease move or remove them before you can switch branches." +"%%sPlease move or remove them before you switch branches." msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av " "utcheckningen:\n" @@ -1970,7 +2361,7 @@ msgstr "" #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" -"%%sPlease move or remove them before you can merge." +"%%sPlease move or remove them before you merge." msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av " "sammanslagningen:\n" @@ -1990,10 +2381,10 @@ msgstr "" #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" -"%%sPlease move or remove them before you can %s." +"%%sPlease move or remove them before you %s." msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" -"%%sFlytta eller ta bort dem innan du kan \"%s\"." +"%%sFlytta eller ta bort dem innan du \"%s\"." #: unpack-trees.c:114 #, c-format @@ -2078,43 +2469,43 @@ msgstr "felaktigt portnummer" msgid "invalid '..' path segment" msgstr "felaktigt \"..\"-sökvägssegment" -#: wrapper.c:222 wrapper.c:381 +#: worktree.c:282 +#, c-format +msgid "failed to read '%s'" +msgstr "misslyckades läsa \"%s\"" + +#: wrapper.c:222 wrapper.c:392 #, c-format msgid "could not open '%s' for reading and writing" msgstr "kunde inte öppna \"%s\" för läsning och skrivning" -#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 +#: wrapper.c:224 wrapper.c:394 builtin/am.c:778 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 -#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771 +#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029 #: builtin/pull.c:407 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: wrapper.c:594 wrapper.c:615 +#: wrapper.c:605 wrapper.c:626 #, c-format msgid "unable to access '%s'" msgstr "kan inte komma åt \"%s\"" -#: wrapper.c:623 +#: wrapper.c:634 msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" -#: wrapper.c:650 -#, c-format -msgid "could not open %s for writing" -msgstr "kunde inte öppna %s för skrivning" - -#: wrapper.c:661 builtin/am.c:410 +#: wrapper.c:658 #, c-format msgid "could not write to %s" msgstr "kunde inte skriva till %s" -#: wrapper.c:667 +#: wrapper.c:660 #, c-format msgid "could not close %s" msgstr "kunde inte stänga %s" @@ -2144,11 +2535,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning) msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:198 wt-status.c:881 +#: wt-status.c:198 wt-status.c:882 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:216 wt-status.c:890 +#: wt-status.c:216 wt-status.c:891 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" @@ -2208,11 +2599,6 @@ msgstr "tillagt av bägge:" msgid "both modified:" msgstr "ändrat av bägge:" -#: wt-status.c:266 -#, c-format -msgid "bug: unhandled unmerged status %x" -msgstr "programfel: ej hanterad \"unmerged\"-status %x" - #: wt-status.c:274 msgid "new file:" msgstr "ny fil:" @@ -2257,20 +2643,15 @@ msgstr "ändrat innehåll, " msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:391 -#, c-format -msgid "bug: unhandled diff status %c" -msgstr "programfel: diff-status %c ej hanterad" - -#: wt-status.c:755 +#: wt-status.c:756 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:757 +#: wt-status.c:758 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:838 +#: wt-status.c:839 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -2278,99 +2659,103 @@ msgstr "" "Rör inte raden ovan.\n" "Allt nedan kommer tas bort." -#: wt-status.c:949 +#: wt-status.c:950 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:952 +#: wt-status.c:953 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:956 +#: wt-status.c:955 +msgid " (use \"git merge --abort\" to abort the merge)" +msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" + +#: wt-status.c:960 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." -#: wt-status.c:959 +#: wt-status.c:963 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:969 +#: wt-status.c:973 msgid "You are in the middle of an am session." msgstr "Du är i mitten av en körning av \"git am\"." -#: wt-status.c:972 +#: wt-status.c:976 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:976 +#: wt-status.c:980 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:978 +#: wt-status.c:982 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:980 +#: wt-status.c:984 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" -#: wt-status.c:1105 +#: wt-status.c:1109 msgid "No commands done." msgstr "Inga kommandon utförda." -#: wt-status.c:1108 +#: wt-status.c:1112 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Sista kommandot utfört (%d kommando utfört):" msgstr[1] "Sista kommandot utfört (%d kommandon utfört):" -#: wt-status.c:1119 +#: wt-status.c:1123 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1124 +#: wt-status.c:1128 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: wt-status.c:1127 +#: wt-status.c:1131 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Nästa kommando att utföra (%d kommando återstår):" msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):" -#: wt-status.c:1135 +#: wt-status.c:1139 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)" -#: wt-status.c:1148 +#: wt-status.c:1152 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." -#: wt-status.c:1153 +#: wt-status.c:1157 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1167 +#: wt-status.c:1171 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1169 +#: wt-status.c:1173 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1171 +#: wt-status.c:1175 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:1177 +#: wt-status.c:1181 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1181 +#: wt-status.c:1185 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -2378,122 +2763,122 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1186 +#: wt-status.c:1190 msgid "You are currently splitting a commit during a rebase." msgstr "Du håller på att dela upp en incheckning i en ombasering." -#: wt-status.c:1189 +#: wt-status.c:1193 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:1193 +#: wt-status.c:1197 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1198 +#: wt-status.c:1202 msgid "You are currently editing a commit during a rebase." msgstr "Du håller på att redigera en incheckning under en ombasering." -#: wt-status.c:1201 +#: wt-status.c:1205 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: wt-status.c:1203 +#: wt-status.c:1207 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:1213 +#: wt-status.c:1217 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s." -#: wt-status.c:1218 +#: wt-status.c:1222 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1221 +#: wt-status.c:1225 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1223 +#: wt-status.c:1227 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-" "operationen)" -#: wt-status.c:1232 +#: wt-status.c:1236 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1237 +#: wt-status.c:1241 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1240 +#: wt-status.c:1244 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1242 +#: wt-status.c:1246 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1253 +#: wt-status.c:1257 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"." -#: wt-status.c:1257 +#: wt-status.c:1261 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1260 +#: wt-status.c:1264 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:1460 +#: wt-status.c:1464 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1466 +#: wt-status.c:1470 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå" -#: wt-status.c:1468 +#: wt-status.c:1472 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå" -#: wt-status.c:1473 +#: wt-status.c:1477 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1475 +#: wt-status.c:1479 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1478 +#: wt-status.c:1482 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1496 +#: wt-status.c:1500 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1510 +#: wt-status.c:1514 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1512 +#: wt-status.c:1516 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1516 +#: wt-status.c:1520 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2505,32 +2890,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1522 +#: wt-status.c:1526 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1524 +#: wt-status.c:1528 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1530 +#: wt-status.c:1534 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1535 +#: wt-status.c:1539 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1538 +#: wt-status.c:1542 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1541 +#: wt-status.c:1545 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2539,48 +2924,48 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1544 +#: wt-status.c:1548 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "inget köat för incheckning, men ospårade filer finns\n" -#: wt-status.c:1547 +#: wt-status.c:1551 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" -#: wt-status.c:1550 wt-status.c:1555 +#: wt-status.c:1554 wt-status.c:1559 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1553 +#: wt-status.c:1557 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" -#: wt-status.c:1557 +#: wt-status.c:1561 #, c-format -msgid "nothing to commit, working directory clean\n" +msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1664 +#: wt-status.c:1668 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1668 +#: wt-status.c:1672 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1697 +#: wt-status.c:1701 msgid "gone" msgstr "försvunnen" -#: wt-status.c:1699 wt-status.c:1707 +#: wt-status.c:1703 wt-status.c:1711 msgid "behind " msgstr "efter " -#: wt-status.c:1702 wt-status.c:1705 +#: wt-status.c:1706 wt-status.c:1709 msgid "ahead " msgstr "före " @@ -2598,254 +2983,268 @@ 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:280 +#: builtin/add.c:71 builtin/commit.c:281 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:80 +#: builtin/add.c:81 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:134 +#: builtin/add.c:136 msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:194 builtin/rev-parse.c:811 +#: builtin/add.c:196 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:205 +#: builtin/add.c:207 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning" -#: builtin/add.c:209 +#: builtin/add.c:211 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:212 +#: builtin/add.c:214 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:215 +#: builtin/add.c:217 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:217 +#: builtin/add.c:219 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:222 +#: builtin/add.c:224 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:232 +#: builtin/add.c:234 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:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 -#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521 +#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 -#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 -#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19 +#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593 +#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114 msgid "be verbose" msgstr "var pratsam" -#: builtin/add.c:252 +#: builtin/add.c:256 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 +#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:254 +#: builtin/add.c:258 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:255 +#: builtin/add.c:259 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:256 +#: builtin/add.c:260 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:257 +#: builtin/add.c:261 msgid "record only the fact that the path will be added later" msgstr "registrera endast att sökvägen kommer läggas till senare" -#: builtin/add.c:258 +#: builtin/add.c:262 msgid "add changes from all tracked and untracked files" msgstr "lägg till ändringar från alla spårade och ospårade filer" -#: builtin/add.c:261 +#: builtin/add.c:265 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)" -#: builtin/add.c:263 +#: builtin/add.c:267 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:264 +#: builtin/add.c:268 msgid "just skip files which cannot be added because of errors" msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" -#: builtin/add.c:265 +#: builtin/add.c:269 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:287 +#: builtin/add.c:270 builtin/update-index.c:958 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/add.c:270 builtin/update-index.c:959 +msgid "override the executable bit of the listed files" +msgstr "överstyr exekveringsbiten för angivna filer" + +#: builtin/add.c:292 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Använd -f om du verkligen vill lägga till dem.\n" -#: builtin/add.c:294 +#: builtin/add.c:300 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:330 +#: builtin/add.c:336 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:337 +#: builtin/add.c:343 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:352 #, c-format +msgid "--chmod param '%s' must be either -x or +x" +msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x" + +#: builtin/add.c:367 +#, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:353 +#: builtin/add.c:368 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279 +#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340 +#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 #: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 +#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 +#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/am.c:430 +#: builtin/am.c:426 msgid "could not parse author script" msgstr "kunde inte tolka författarskript" -#: builtin/am.c:507 +#: builtin/am.c:503 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:548 builtin/notes.c:300 +#: builtin/am.c:544 builtin/notes.c:301 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:585 builtin/notes.c:315 +#: builtin/am.c:581 builtin/notes.c:316 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:611 +#: builtin/am.c:607 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:788 +#: builtin/am.c:787 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:853 +#: builtin/am.c:852 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:900 +#: builtin/am.c:899 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:903 builtin/am.c:911 +#: builtin/am.c:902 builtin/am.c:910 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:908 +#: builtin/am.c:907 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:995 +#: builtin/am.c:996 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:1000 builtin/clone.c:380 +#: builtin/am.c:1001 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:1004 +#: builtin/am.c:1005 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1136 builtin/commit.c:365 +#: builtin/am.c:1137 builtin/commit.c:366 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1187 +#: builtin/am.c:1188 #, 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:1188 +#: builtin/am.c:1189 #, 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:1189 +#: builtin/am.c:1190 #, 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:1327 +#: builtin/am.c:1328 msgid "Patch is empty. Was it split wrong?" msgstr "Patchen är tom. Delades den upp felaktigt?" -#: builtin/am.c:1401 builtin/log.c:1516 +#: builtin/am.c:1402 builtin/log.c:1543 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/am.c:1428 +#: builtin/am.c:1429 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: builtin/am.c:1630 +#: builtin/am.c:1602 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:1632 +#: builtin/am.c:1604 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1651 +#: builtin/am.c:1623 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2853,39 +3252,39 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1657 +#: builtin/am.c:1629 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1672 +#: builtin/am.c:1654 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1696 builtin/merge.c:636 +#: builtin/am.c:1679 builtin/merge.c:628 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/am.c:1703 +#: builtin/am.c:1686 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 -#: builtin/merge.c:866 +#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798 +#: builtin/merge.c:823 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/am.c:1748 builtin/am.c:1752 +#: builtin/am.c:1731 builtin/am.c:1735 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1768 +#: builtin/am.c:1751 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:1773 +#: builtin/am.c:1756 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -2893,35 +3292,35 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1783 +#: builtin/am.c:1766 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:1833 +#: builtin/am.c:1816 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1868 builtin/am.c:1940 +#: builtin/am.c:1853 builtin/am.c:1925 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1884 +#: builtin/am.c:1869 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1892 +#: builtin/am.c:1877 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1898 +#: builtin/am.c:1883 #, 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:1943 +#: builtin/am.c:1928 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2931,7 +3330,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:1950 +#: builtin/am.c:1935 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -2939,17 +3338,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:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 +#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 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:2110 +#: builtin/am.c:2095 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2144 +#: builtin/am.c:2129 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2957,154 +3356,154 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2205 +#: builtin/am.c:2192 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2238 +#: builtin/am.c:2225 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox>|<Maildir>)...]" -#: builtin/am.c:2239 +#: builtin/am.c:2226 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2245 +#: builtin/am.c:2232 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2247 +#: builtin/am.c:2234 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2249 +#: builtin/am.c:2236 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 -#: builtin/repack.c:171 +#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57 +#: builtin/repack.c:172 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2252 +#: builtin/am.c:2239 msgid "add a Signed-off-by line to the commit message" msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2255 +#: builtin/am.c:2242 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2257 +#: builtin/am.c:2244 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2259 +#: builtin/am.c:2246 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2261 +#: builtin/am.c:2248 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2263 +#: builtin/am.c:2250 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:2266 +#: builtin/am.c:2253 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:2269 +#: builtin/am.c:2256 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2270 builtin/apply.c:4546 +#: builtin/am.c:2257 builtin/apply.c:4837 msgid "action" msgstr "åtgärd" -#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 -#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 -#: builtin/am.c:2298 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279 +#: builtin/am.c:2285 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2279 builtin/apply.c:4570 +#: builtin/am.c:2266 builtin/apply.c:4861 msgid "root" msgstr "rot" -#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 -#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 +#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799 +#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96 #: builtin/pull.c:179 builtin/submodule--helper.c:277 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 -#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 -#: builtin/submodule--helper.c:770 +#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482 +#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823 +#: builtin/submodule--helper.c:826 msgid "path" msgstr "sökväg" -#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 -#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182 +#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 +#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185 #: 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:2291 builtin/apply.c:4514 +#: builtin/am.c:2278 builtin/apply.c:4805 msgid "num" msgstr "antal" -#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "format" -#: builtin/am.c:2295 +#: builtin/am.c:2282 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2301 +#: builtin/am.c:2288 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2303 +#: builtin/am.c:2290 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2306 +#: builtin/am.c:2293 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2309 +#: builtin/am.c:2296 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2312 +#: builtin/am.c:2299 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2316 +#: builtin/am.c:2303 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2318 +#: builtin/am.c:2305 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229 #: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2321 +#: builtin/am.c:2308 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2324 +#: builtin/am.c:2311 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2339 +#: builtin/am.c:2326 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." @@ -3112,16 +3511,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:2346 +#: builtin/am.c:2333 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2361 +#: builtin/am.c:2348 #, 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:2385 +#: builtin/am.c:2372 #, c-format msgid "" "Stray %s directory found.\n" @@ -3130,70 +3529,70 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2391 +#: builtin/am.c:2378 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." -#: builtin/apply.c:59 +#: builtin/apply.c:122 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<flaggor>] [<patch>...]" -#: builtin/apply.c:111 +#: builtin/apply.c:153 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "okänt alternativ för whitespace: \"%s\"" -#: builtin/apply.c:126 +#: builtin/apply.c:169 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: builtin/apply.c:818 +#: builtin/apply.c:854 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: builtin/apply.c:827 +#: builtin/apply.c:863 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: builtin/apply.c:908 +#: builtin/apply.c:947 #, 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:937 +#: builtin/apply.c:984 #, 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:942 +#: builtin/apply.c:989 #, 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:943 +#: builtin/apply.c:990 #, 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:949 +#: builtin/apply.c:995 #, 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:1406 +#: builtin/apply.c:1489 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: builtin/apply.c:1463 +#: builtin/apply.c:1550 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: builtin/apply.c:1480 +#: builtin/apply.c:1567 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -3209,77 +3608,77 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: builtin/apply.c:1646 +#: builtin/apply.c:1743 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: builtin/apply.c:1648 +#: builtin/apply.c:1745 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: builtin/apply.c:1674 +#: builtin/apply.c:1774 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: builtin/apply.c:1710 +#: builtin/apply.c:1810 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: builtin/apply.c:1712 +#: builtin/apply.c:1812 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: builtin/apply.c:1715 +#: builtin/apply.c:1815 #, 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:1861 +#: builtin/apply.c:1962 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: builtin/apply.c:1895 +#: builtin/apply.c:1999 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: builtin/apply.c:2048 +#: builtin/apply.c:2154 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: builtin/apply.c:2138 +#: builtin/apply.c:2244 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/apply.c:2142 +#: builtin/apply.c:2248 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: builtin/apply.c:2775 +#: builtin/apply.c:2901 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: builtin/apply.c:2894 +#: builtin/apply.c:3020 #, 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:2906 +#: builtin/apply.c:3032 #, 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:2912 +#: builtin/apply.c:3038 #, c-format msgid "" "while searching for:\n" @@ -3288,335 +3687,330 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: builtin/apply.c:2932 +#: builtin/apply.c:3060 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: builtin/apply.c:3033 +#: builtin/apply.c:3163 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: builtin/apply.c:3039 +#: builtin/apply.c:3169 #, 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:3060 +#: builtin/apply.c:3190 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: builtin/apply.c:3184 +#: builtin/apply.c:3314 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 -#, c-format -msgid "read of %s failed" -msgstr "misslyckades läsa %s" - -#: builtin/apply.c:3237 +#: builtin/apply.c:3370 #, 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:3265 builtin/apply.c:3487 +#: builtin/apply.c:3399 builtin/apply.c:3630 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: builtin/apply.c:3346 builtin/apply.c:3501 +#: builtin/apply.c:3482 builtin/apply.c:3644 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 +#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3355 builtin/apply.c:3509 +#: builtin/apply.c:3491 builtin/apply.c:3652 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: builtin/apply.c:3457 +#: builtin/apply.c:3597 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: builtin/apply.c:3526 +#: builtin/apply.c:3669 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: builtin/apply.c:3528 +#: builtin/apply.c:3671 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: builtin/apply.c:3687 builtin/apply.c:3689 +#: builtin/apply.c:3822 builtin/apply.c:3824 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg: %s" -#: builtin/apply.c:3744 +#: builtin/apply.c:3879 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: builtin/apply.c:3747 +#: builtin/apply.c:3882 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: builtin/apply.c:3767 +#: builtin/apply.c:3902 #, 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:3772 +#: builtin/apply.c:3907 #, 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:3792 +#: builtin/apply.c:3927 #, 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:3796 +#: builtin/apply.c:3931 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: builtin/apply.c:3810 +#: builtin/apply.c:3945 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:4038 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:4046 +#: builtin/apply.c:4182 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: builtin/apply.c:4075 +#: builtin/apply.c:4215 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: builtin/apply.c:4079 +#: builtin/apply.c:4219 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: builtin/apply.c:4084 +#: builtin/apply.c:4224 #, 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:4087 builtin/apply.c:4195 +#: builtin/apply.c:4227 builtin/apply.c:4340 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: builtin/apply.c:4120 +#: builtin/apply.c:4260 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: builtin/apply.c:4169 +#: builtin/apply.c:4313 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: builtin/apply.c:4256 +#: builtin/apply.c:4403 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: builtin/apply.c:4264 +#: builtin/apply.c:4411 msgid "internal error" msgstr "internt fel" -#: builtin/apply.c:4267 +#: builtin/apply.c:4414 #, 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:4277 +#: builtin/apply.c:4424 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: builtin/apply.c:4285 +#: builtin/apply.c:4432 #, c-format msgid "cannot open %s: %s" msgstr "kan inte öppna %s: %s" -#: builtin/apply.c:4298 +#: builtin/apply.c:4445 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: builtin/apply.c:4301 +#: builtin/apply.c:4448 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: builtin/apply.c:4387 +#: builtin/apply.c:4537 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: builtin/apply.c:4395 +#: builtin/apply.c:4545 msgid "unrecognized input" msgstr "indata känns inte igen" -#: builtin/apply.c:4406 +#: builtin/apply.c:4556 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: builtin/apply.c:4509 +#: builtin/apply.c:4701 +msgid "--3way outside a repository" +msgstr "--3way utanför arkiv" + +#: builtin/apply.c:4709 +msgid "--index outside a repository" +msgstr "--index utanför arkiv" + +#: builtin/apply.c:4712 +msgid "--cached outside a repository" +msgstr "--cached utanför arkiv" + +#: builtin/apply.c:4745 +#, c-format +msgid "can't open patch '%s'" +msgstr "kan inte öppna patchen \"%s\"" + +#: builtin/apply.c:4760 +#, 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:4766 builtin/apply.c:4776 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d rad lägger till fel i blanksteg." +msgstr[1] "%d rader lägger till fel i blanksteg." + +#: builtin/apply.c:4800 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: builtin/apply.c:4512 +#: builtin/apply.c:4803 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: builtin/apply.c:4515 +#: builtin/apply.c:4806 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:4518 +#: builtin/apply.c:4809 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: builtin/apply.c:4520 +#: builtin/apply.c:4811 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:4524 +#: builtin/apply.c:4815 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: builtin/apply.c:4526 +#: builtin/apply.c:4817 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:4528 +#: builtin/apply.c:4819 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:4530 +#: builtin/apply.c:4821 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:4532 +#: builtin/apply.c:4823 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: builtin/apply.c:4534 +#: builtin/apply.c:4825 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: builtin/apply.c:4536 +#: builtin/apply.c:4827 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: builtin/apply.c:4538 +#: builtin/apply.c:4829 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:4540 +#: builtin/apply.c:4831 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: builtin/apply.c:4545 +#: builtin/apply.c:4836 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: builtin/apply.c:4547 +#: builtin/apply.c:4838 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: builtin/apply.c:4550 builtin/apply.c:4553 +#: builtin/apply.c:4841 builtin/apply.c:4844 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: builtin/apply.c:4556 +#: builtin/apply.c:4847 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: builtin/apply.c:4558 +#: builtin/apply.c:4849 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: builtin/apply.c:4560 +#: builtin/apply.c:4851 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: builtin/apply.c:4562 +#: builtin/apply.c:4853 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: builtin/apply.c:4565 +#: builtin/apply.c:4856 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: builtin/apply.c:4568 +#: builtin/apply.c:4859 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: builtin/apply.c:4571 +#: builtin/apply.c:4862 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: builtin/apply.c:4593 -msgid "--3way outside a repository" -msgstr "--3way utanför arkiv" - -#: builtin/apply.c:4601 -msgid "--index outside a repository" -msgstr "--index utanför arkiv" - -#: builtin/apply.c:4604 -msgid "--cached outside a repository" -msgstr "--cached utanför arkiv" - -#: builtin/apply.c:4623 -#, c-format -msgid "can't open patch '%s'" -msgstr "kan inte öppna patchen \"%s\"" - -#: builtin/apply.c:4637 -#, 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:4643 builtin/apply.c:4653 -#, c-format -msgid "%d line adds whitespace errors." -msgid_plural "%d lines add whitespace errors." -msgstr[0] "%d rad lägger till fel i blanksteg." -msgstr[1] "%d rader lägger till fel i blanksteg." - #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" @@ -3672,103 +4066,103 @@ 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:1782 +#: builtin/blame.c:1781 msgid "Blaming lines" msgstr "Klandra rader" -#: builtin/blame.c:2531 +#: builtin/blame.c:2536 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:2532 +#: builtin/blame.c:2537 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:2533 +#: builtin/blame.c:2538 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:2534 +#: builtin/blame.c:2539 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:2535 +#: builtin/blame.c:2540 msgid "Force progress reporting" msgstr "Tvinga förloppsrapportering" -#: builtin/blame.c:2536 +#: builtin/blame.c:2541 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:2537 +#: builtin/blame.c:2542 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2543 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:2539 +#: builtin/blame.c:2544 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:2540 +#: builtin/blame.c:2545 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:2541 +#: builtin/blame.c:2546 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:2542 +#: builtin/blame.c:2547 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2548 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2549 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:2545 +#: builtin/blame.c:2550 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:2546 +#: builtin/blame.c:2551 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:2547 +#: builtin/blame.c:2552 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:2548 +#: builtin/blame.c:2553 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:2549 +#: builtin/blame.c:2554 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:2550 builtin/blame.c:2551 +#: builtin/blame.c:2555 builtin/blame.c:2556 msgid "score" msgstr "poäng" -#: builtin/blame.c:2550 +#: builtin/blame.c:2555 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:2551 +#: builtin/blame.c:2556 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:2552 +#: builtin/blame.c:2557 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2552 +#: builtin/blame.c:2557 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" @@ -3778,7 +4172,7 @@ msgstr "Behandla endast radintervallet n,m, med början på 1" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2641 +#: builtin/blame.c:2649 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" @@ -3881,119 +4275,126 @@ msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:309 +#: builtin/branch.c:312 #, c-format msgid "[%s: gone]" msgstr "[%s: försvunnen]" -#: builtin/branch.c:314 +#: builtin/branch.c:317 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:319 +#: builtin/branch.c:322 #, c-format msgid "[%s: behind %d]" msgstr "[%s: bakom %d] " -#: builtin/branch.c:321 +#: builtin/branch.c:324 #, c-format msgid "[behind %d]" msgstr "[bakom %d] " -#: builtin/branch.c:325 +#: builtin/branch.c:328 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: före %d] " -#: builtin/branch.c:327 +#: builtin/branch.c:330 #, c-format msgid "[ahead %d]" msgstr "[före %d] " -#: builtin/branch.c:330 +#: builtin/branch.c:333 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: före %d, bakom %d] " -#: builtin/branch.c:333 +#: builtin/branch.c:336 #, c-format msgid "[ahead %d, behind %d]" msgstr "[före %d, bakom %d] " -#: builtin/branch.c:346 +#: builtin/branch.c:349 msgid " **** invalid ref ****" msgstr " **** ogiltig ref ****" -#: builtin/branch.c:372 +#: builtin/branch.c:375 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: builtin/branch.c:375 +#: builtin/branch.c:378 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" #. TRANSLATORS: make sure this matches #. "HEAD detached at " in wt-status.c -#: builtin/branch.c:381 +#: builtin/branch.c:384 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frånkopplat vid %s)" #. TRANSLATORS: make sure this matches #. "HEAD detached from " in wt-status.c -#: builtin/branch.c:386 +#: builtin/branch.c:389 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frånkopplat från %s)" -#: builtin/branch.c:390 +#: builtin/branch.c:393 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:541 +#: builtin/branch.c:544 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Grenen %s ombaseras på %s" -#: builtin/branch.c:545 +#: builtin/branch.c:548 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:560 +#: builtin/branch.c:563 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:570 +#: builtin/branch.c:573 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:587 +#: builtin/branch.c:590 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:591 +#: builtin/branch.c:594 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:594 +#: builtin/branch.c:597 #, 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:601 +#: builtin/branch.c:604 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:623 -msgid "could not write branch description template" -msgstr "kunde inte skriva grenbeskrivningsmall" +#: builtin/branch.c:620 +#, c-format +msgid "" +"Please edit the description for the branch\n" +" %s\n" +"Lines starting with '%c' will be stripped.\n" +msgstr "" +"Redigera beskrivningen för grenen\n" +" %s\n" +"Rader som inleds med \"%c\" ignoreras.\n" #: builtin/branch.c:651 msgid "Generic options" @@ -4095,8 +4496,8 @@ msgstr "nyckel" msgid "field name to sort on" msgstr "fältnamn att sortera på" -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 -#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402 +#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568 #: builtin/tag.c:369 msgid "object" msgstr "objekt" @@ -4221,7 +4622,7 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/cat-file.c:428 +#: builtin/cat-file.c:443 msgid "" "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" "<type>|--textconv) <object>" @@ -4229,56 +4630,56 @@ msgstr "" "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" "<typ>|--textconv) <objekt>" -#: builtin/cat-file.c:429 +#: builtin/cat-file.c:444 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]" -#: builtin/cat-file.c:466 +#: builtin/cat-file.c:481 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:467 +#: builtin/cat-file.c:482 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:468 +#: builtin/cat-file.c:483 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:470 +#: builtin/cat-file.c:485 msgid "exit with zero when there's no error" msgstr "avsluta med noll när det inte uppstått något fel" -#: builtin/cat-file.c:471 +#: builtin/cat-file.c:486 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:473 +#: builtin/cat-file.c:488 msgid "for blob objects, run textconv on object's content" msgstr "för blob-objekt, kör textconv på objektets innehåll" -#: builtin/cat-file.c:475 +#: builtin/cat-file.c:490 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt" -#: builtin/cat-file.c:476 +#: builtin/cat-file.c:491 msgid "buffer --batch output" msgstr "buffra utdata från --batch" -#: builtin/cat-file.c:478 +#: builtin/cat-file.c:493 msgid "show info and content of objects fed from the standard input" msgstr "visa information och innehåll för objekt som listas på standard in" -#: builtin/cat-file.c:481 +#: builtin/cat-file.c:496 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" -#: builtin/cat-file.c:484 +#: builtin/cat-file.c:499 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "följ symboliska länkar i trädet (använd med --batch eller --batch-check)" -#: builtin/cat-file.c:486 +#: builtin/cat-file.c:501 msgid "show all objects with --batch or --batch-check" msgstr "visa alla objekt med --batch eller --batch-check" @@ -4306,7 +4707,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:1135 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -4396,9 +4797,9 @@ msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 -#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 -#: builtin/submodule--helper.c:774 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491 +#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497 +#: builtin/submodule--helper.c:830 builtin/worktree.c:469 msgid "string" msgstr "sträng" @@ -4464,10 +4865,6 @@ msgstr "\"%s\" kan inte användas med %s" 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 -msgid "corrupt index file" -msgstr "indexfilen är trasig" - #: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" @@ -4477,50 +4874,50 @@ msgstr "sökvägen \"%s\" har inte slagits ihop" msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:622 +#: builtin/checkout.c:625 #, 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:664 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:664 builtin/clone.c:661 +#: builtin/checkout.c:668 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:668 +#: builtin/checkout.c:672 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:671 +#: builtin/checkout.c:675 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:675 +#: builtin/checkout.c:679 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:677 builtin/checkout.c:1067 +#: builtin/checkout.c:681 builtin/checkout.c:1070 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:679 +#: builtin/checkout.c:683 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:731 +#: builtin/checkout.c:734 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:737 +#: builtin/checkout.c:740 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4543,7 +4940,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:756 +#: builtin/checkout.c:759 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4570,151 +4967,151 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:792 +#: builtin/checkout.c:795 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:796 +#: builtin/checkout.c:799 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:823 builtin/checkout.c:1062 +#: builtin/checkout.c:826 builtin/checkout.c:1065 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:968 +#: builtin/checkout.c:971 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1008 builtin/worktree.c:212 +#: builtin/checkout.c:1011 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1037 +#: builtin/checkout.c:1040 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1076 +#: builtin/checkout.c:1079 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1079 builtin/checkout.c:1083 +#: builtin/checkout.c:1082 builtin/checkout.c:1086 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098 +#: builtin/checkout.c:1101 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1103 +#: builtin/checkout.c:1106 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 -#: builtin/worktree.c:325 +#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 +#: builtin/worktree.c:326 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1137 +#: builtin/checkout.c:1140 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1142 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1143 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1141 -msgid "detach the HEAD at named commit" +#: builtin/checkout.c:1144 builtin/worktree.c:328 +msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1145 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1147 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1147 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1148 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1150 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1152 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1153 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:1151 builtin/merge.c:230 +#: builtin/checkout.c:1154 builtin/merge.c:231 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 +#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250 msgid "style" msgstr "stil" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1156 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1156 +#: builtin/checkout.c:1159 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1161 msgid "second guess 'git checkout <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1163 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:1161 builtin/clone.c:60 builtin/fetch.c:116 -#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 +#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117 +#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/checkout.c:1192 +#: builtin/checkout.c:1195 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1209 +#: builtin/checkout.c:1212 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1214 +#: builtin/checkout.c:1217 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1250 +#: builtin/checkout.c:1253 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1257 +#: builtin/checkout.c:1260 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -4723,12 +5120,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:1262 +#: builtin/checkout.c:1265 #, 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:1266 +#: builtin/checkout.c:1269 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4882,7 +5279,7 @@ msgid "remove whole directories" msgstr "ta bort hela kataloger" #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 -#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 +#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182 msgid "pattern" msgstr "mönster" @@ -4926,7 +5323,7 @@ msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" @@ -4954,16 +5351,16 @@ msgstr "initiera undermoduler i klonen" msgid "number of submodules cloned in parallel" msgstr "antal undermoduler som klonas parallellt" -#: builtin/clone.c:80 builtin/init-db.c:470 +#: builtin/clone.c:80 builtin/init-db.c:473 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:81 builtin/init-db.c:471 +#: builtin/clone.c:81 builtin/init-db.c:474 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:83 builtin/submodule--helper.c:498 -#: builtin/submodule--helper.c:777 +#: builtin/clone.c:83 builtin/submodule--helper.c:495 +#: builtin/submodule--helper.c:833 msgid "reference repository" msgstr "referensarkiv" @@ -4987,7 +5384,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:92 builtin/fetch.c:117 builtin/grep.c:667 +#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 #: builtin/pull.c:201 msgid "depth" msgstr "djup" @@ -5004,11 +5401,11 @@ msgstr "klona endast en gren, HEAD eller --branch" msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" -#: builtin/clone.c:98 builtin/init-db.c:479 +#: builtin/clone.c:98 builtin/init-db.c:482 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:99 builtin/init-db.c:480 +#: builtin/clone.c:99 builtin/init-db.c:483 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" @@ -5020,11 +5417,11 @@ msgstr "nyckel=värde" msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" @@ -5056,6 +5453,11 @@ msgstr "referensarkivet \"%s\" är grunt" msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" +#: builtin/clone.c:376 +#, c-format +msgid "failed to open '%s'" +msgstr "misslyckades öppna \"%s\"" + #: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" @@ -5076,7 +5478,7 @@ msgstr "misslyckades skapa länken \"%s\"" msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:449 builtin/clone.c:633 +#: builtin/clone.c:449 #, c-format msgid "done.\n" msgstr "klart.\n" @@ -5096,14 +5498,7 @@ msgstr "" 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:628 -#, c-format -msgid "Checking connectivity... " -msgstr "Kontrollerar om vi fick alla objekt..." - -#: builtin/clone.c:631 +#: builtin/clone.c:633 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" @@ -5121,99 +5516,99 @@ msgstr "" msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:767 +#: builtin/clone.c:766 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:830 +#: builtin/clone.c:829 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:832 +#: builtin/clone.c:831 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:864 builtin/receive-pack.c:1731 +#: builtin/clone.c:863 builtin/receive-pack.c:1855 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:868 +#: builtin/clone.c:867 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:879 +#: builtin/clone.c:878 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:882 +#: builtin/clone.c:881 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:895 +#: builtin/clone.c:894 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:901 builtin/fetch.c:1174 +#: builtin/clone.c:900 builtin/fetch.c:1293 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:911 +#: builtin/clone.c:910 #, 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:921 +#: builtin/clone.c:920 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 -#: builtin/worktree.c:220 builtin/worktree.c:247 +#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544 +#: builtin/worktree.c:222 builtin/worktree.c:249 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:939 +#: builtin/clone.c:938 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:957 +#: builtin/clone.c:956 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:959 +#: builtin/clone.c:958 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:998 +#: builtin/clone.c:997 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:1001 +#: builtin/clone.c:1000 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1006 +#: builtin/clone.c:1005 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1010 +#: builtin/clone.c:1009 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:1059 builtin/clone.c:1067 +#: builtin/clone.c:1058 builtin/clone.c:1066 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1070 +#: builtin/clone.c:1069 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -5353,66 +5748,66 @@ msgstr "" "\"git cherry-pick --continue\" kommer därefter att återuppta\n" "cherry-pick för återstående incheckningar.\n" -#: builtin/commit.c:307 +#: builtin/commit.c:308 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:348 +#: builtin/commit.c:349 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:354 +#: builtin/commit.c:355 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:367 +#: builtin/commit.c:368 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:369 +#: builtin/commit.c:370 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 +#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:447 +#: builtin/commit.c:448 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:449 +#: builtin/commit.c:450 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:458 +#: builtin/commit.c:459 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:477 +#: builtin/commit.c:478 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:582 +#: builtin/commit.c:583 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:584 +#: builtin/commit.c:585 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:603 +#: builtin/commit.c:604 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:611 +#: builtin/commit.c:612 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: builtin/commit.c:655 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5420,38 +5815,38 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 +#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:704 builtin/shortlog.c:285 +#: builtin/commit.c:705 builtin/shortlog.c:286 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:706 +#: builtin/commit.c:707 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:710 +#: builtin/commit.c:711 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:737 builtin/commit.c:745 +#: builtin/commit.c:738 builtin/commit.c:746 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:743 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:796 +#: builtin/commit.c:797 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:814 +#: builtin/commit.c:815 #, c-format msgid "" "\n" @@ -5466,7 +5861,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:819 +#: builtin/commit.c:820 #, c-format msgid "" "\n" @@ -5481,7 +5876,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:833 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5491,7 +5886,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:839 +#: builtin/commit.c:840 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5502,146 +5897,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:859 +#: builtin/commit.c:860 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:867 +#: builtin/commit.c:868 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:874 +#: builtin/commit.c:875 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:892 +#: builtin/commit.c:893 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:949 +#: builtin/commit.c:950 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:964 builtin/tag.c:266 +#: builtin/commit.c:965 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:1066 +#: builtin/commit.c:1067 #, 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:1081 builtin/commit.c:1321 +#: builtin/commit.c:1082 builtin/commit.c:1322 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1118 +#: builtin/commit.c:1119 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1148 +#: builtin/commit.c:1149 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:1157 +#: builtin/commit.c:1158 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1160 +#: builtin/commit.c:1161 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:1162 +#: builtin/commit.c:1163 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:1165 +#: builtin/commit.c:1166 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1175 +#: builtin/commit.c:1176 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:1177 +#: builtin/commit.c:1178 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:1185 +#: builtin/commit.c:1186 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:1202 +#: builtin/commit.c:1203 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:1204 +#: builtin/commit.c:1205 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:1206 +#: builtin/commit.c:1207 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:1208 +#: builtin/commit.c:1209 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:1220 builtin/tag.c:474 +#: builtin/commit.c:1221 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1225 +#: builtin/commit.c:1226 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1335 builtin/commit.c:1621 +#: builtin/commit.c:1336 builtin/commit.c:1622 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1337 builtin/commit.c:1623 +#: builtin/commit.c:1338 builtin/commit.c:1624 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 -#: builtin/worktree.c:437 +#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522 +#: builtin/worktree.c:440 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1342 builtin/commit.c:1627 +#: builtin/commit.c:1343 builtin/commit.c:1628 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1345 builtin/commit.c:1630 +#: builtin/commit.c:1346 builtin/commit.c:1631 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 +#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "läge" -#: builtin/commit.c:1348 builtin/commit.c:1633 +#: builtin/commit.c:1349 builtin/commit.c:1634 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:1351 +#: builtin/commit.c:1352 msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1352 parse-options.h:155 +#: builtin/commit.c:1353 parse-options.h:155 msgid "when" msgstr "när" -#: builtin/commit.c:1353 +#: builtin/commit.c:1354 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -5649,201 +6044,201 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1355 +#: builtin/commit.c:1356 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1441 +#: builtin/commit.c:1442 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1443 +#: builtin/commit.c:1444 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1488 +#: builtin/commit.c:1489 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1491 +#: builtin/commit.c:1492 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1591 +#: builtin/commit.c:1592 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1592 +#: builtin/commit.c:1593 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1594 +#: builtin/commit.c:1595 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1595 builtin/tag.c:351 +#: builtin/commit.c:1596 builtin/tag.c:351 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1596 +#: builtin/commit.c:1597 msgid "author" msgstr "författare" -#: builtin/commit.c:1596 +#: builtin/commit.c:1597 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1597 builtin/gc.c:326 +#: builtin/commit.c:1598 builtin/gc.c:326 msgid "date" msgstr "datum" -#: builtin/commit.c:1597 +#: builtin/commit.c:1598 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 -#: builtin/notes.c:558 builtin/tag.c:349 +#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396 +#: builtin/notes.c:559 builtin/tag.c:349 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1598 +#: builtin/commit.c:1599 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 -#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602 +#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1599 +#: builtin/commit.c:1600 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1600 +#: builtin/commit.c:1601 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1601 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1602 +#: builtin/commit.c:1603 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:1603 +#: builtin/commit.c:1604 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:1604 builtin/log.c:1382 builtin/revert.c:86 +#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1605 +#: builtin/commit.c:1606 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1606 +#: builtin/commit.c:1607 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1607 +#: builtin/commit.c:1608 msgid "default" msgstr "standard" -#: builtin/commit.c:1607 builtin/tag.c:354 +#: builtin/commit.c:1608 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:1608 +#: builtin/commit.c:1609 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 +#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1613 +#: builtin/commit.c:1614 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1614 +#: builtin/commit.c:1615 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1615 +#: builtin/commit.c:1616 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1616 +#: builtin/commit.c:1617 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1617 +#: builtin/commit.c:1618 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1618 +#: builtin/commit.c:1619 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1619 -msgid "bypass pre-commit hook" -msgstr "förbigå pre-commit-krok" - #: builtin/commit.c:1620 +msgid "bypass pre-commit and commit-msg hooks" +msgstr "förbigå pre-commit- och commit-msg-krokar" + +#: builtin/commit.c:1621 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1631 +#: builtin/commit.c:1632 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1632 +#: builtin/commit.c:1633 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1637 +#: builtin/commit.c:1638 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1639 +#: builtin/commit.c:1640 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1668 +#: builtin/commit.c:1669 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1718 +#: builtin/commit.c:1719 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1725 +#: builtin/commit.c:1726 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1744 +#: builtin/commit.c:1745 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1755 +#: builtin/commit.c:1756 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1760 +#: builtin/commit.c:1761 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1808 +#: builtin/commit.c:1809 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5858,139 +6253,139 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<flaggor>]" -#: builtin/config.c:56 +#: builtin/config.c:55 msgid "Config file location" msgstr "Konfigurationsfilens plats" -#: builtin/config.c:57 +#: builtin/config.c:56 msgid "use global config file" msgstr "använd global konfigurationsfil" -#: builtin/config.c:58 +#: builtin/config.c:57 msgid "use system config file" msgstr "använd systemets konfigurationsfil" -#: builtin/config.c:59 +#: builtin/config.c:58 msgid "use repository config file" msgstr "använd arkivets konfigurationsfil" -#: builtin/config.c:60 +#: builtin/config.c:59 msgid "use given config file" msgstr "använd angiven konfigurationsfil" -#: builtin/config.c:61 +#: builtin/config.c:60 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:61 +#: builtin/config.c:60 msgid "read config from given blob object" msgstr "läs konfiguration från givet blob-objekt" -#: builtin/config.c:62 +#: builtin/config.c:61 msgid "Action" msgstr "Åtgärd" -#: builtin/config.c:63 +#: builtin/config.c:62 msgid "get value: name [value-regex]" msgstr "hämta värde: namn [värde-reguttr]" -#: builtin/config.c:64 +#: builtin/config.c:63 msgid "get all values: key [value-regex]" msgstr "hämta alla värden: nyckel [värde-reguttr]" -#: builtin/config.c:65 +#: builtin/config.c:64 msgid "get values for regexp: name-regex [value-regex]" msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]" -#: builtin/config.c:66 +#: builtin/config.c:65 msgid "get value specific for the URL: section[.var] URL" msgstr "hämta värde specifikt URL:en: sektion[.var] URL" -#: builtin/config.c:67 +#: builtin/config.c:66 msgid "replace all matching variables: name value [value_regex]" msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]" -#: builtin/config.c:68 +#: builtin/config.c:67 msgid "add a new variable: name value" msgstr "lägg till en ny variabel: namn värde" -#: builtin/config.c:69 +#: builtin/config.c:68 msgid "remove a variable: name [value-regex]" msgstr "ta bort en variabel: namn [värde-reguttr]" -#: builtin/config.c:70 +#: builtin/config.c:69 msgid "remove all matches: name [value-regex]" msgstr "ta bort alla träffar: namn [värde-reguttr]" -#: builtin/config.c:71 +#: builtin/config.c:70 msgid "rename section: old-name new-name" msgstr "byt namn på sektion: gammalt-namn nytt-namn" -#: builtin/config.c:72 +#: builtin/config.c:71 msgid "remove a section: name" msgstr "ta bort en sektion: namn" -#: builtin/config.c:73 +#: builtin/config.c:72 msgid "list all" msgstr "visa alla" -#: builtin/config.c:74 +#: builtin/config.c:73 msgid "open an editor" msgstr "öppna textredigeringsprogram" -#: builtin/config.c:75 +#: builtin/config.c:74 msgid "find the color configured: slot [default]" msgstr "hitta den inställda färgen: slot [default]" -#: builtin/config.c:76 +#: builtin/config.c:75 msgid "find the color setting: slot [stdout-is-tty]" msgstr "hitta färginställningen: slot [stdout-is-tty]" -#: builtin/config.c:77 +#: builtin/config.c:76 msgid "Type" msgstr "Typ" -#: builtin/config.c:78 +#: builtin/config.c:77 msgid "value is \"true\" or \"false\"" msgstr "värdet är \"true\" eller \"false\"" -#: builtin/config.c:79 +#: builtin/config.c:78 msgid "value is decimal number" msgstr "värdet är ett decimalt tal" -#: builtin/config.c:80 +#: builtin/config.c:79 msgid "value is --bool or --int" msgstr "värdet är --bool eller --int" -#: builtin/config.c:81 +#: builtin/config.c:80 msgid "value is a path (file or directory name)" msgstr "värdet är en sökväg (fil- eller katalognamn)" -#: builtin/config.c:82 +#: builtin/config.c:81 msgid "Other" msgstr "Andra" -#: builtin/config.c:83 +#: builtin/config.c:82 msgid "terminate values with NUL byte" msgstr "terminera värden med NUL-byte" -#: builtin/config.c:84 +#: builtin/config.c:83 msgid "show variable names only" msgstr "visa endast variabelnamn" -#: builtin/config.c:85 +#: builtin/config.c:84 msgid "respect include directives on lookup" msgstr "respektera inkluderingsdirektiv vid uppslag" -#: builtin/config.c:86 +#: builtin/config.c:85 msgid "show origin of config (file, standard input, blob, command line)" msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)" -#: builtin/config.c:328 +#: builtin/config.c:327 msgid "unable to parse default color value" msgstr "kan inte tolka standardfärgvärde" -#: builtin/config.c:472 +#: builtin/config.c:471 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -6005,7 +6400,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:614 +#: builtin/config.c:613 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" @@ -6041,7 +6436,7 @@ msgstr "den annoterade taggen %s har inget inbäddat namn" msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" är i verkligheten \"%s\" här" -#: builtin/describe.c:250 builtin/log.c:465 +#: builtin/describe.c:250 builtin/log.c:480 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" @@ -6239,176 +6634,177 @@ msgstr "Applicera referensspecifikation på exporterade referenser" msgid "anonymize output" msgstr "anonymisera utdata" -#: builtin/fetch.c:20 +#: builtin/fetch.c:21 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:22 msgid "git fetch [<options>] <group>" msgstr "git fetch [<flaggor>] <grupp>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:92 builtin/pull.c:174 +#: builtin/fetch.c:93 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:94 builtin/pull.c:177 +#: builtin/fetch.c:95 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" -#: builtin/fetch.c:96 builtin/pull.c:180 +#: builtin/fetch.c:97 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:97 builtin/pull.c:182 +#: builtin/fetch.c:98 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/fetch.c:99 +#: builtin/fetch.c:100 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:101 builtin/pull.c:184 +#: builtin/fetch.c:102 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:103 +#: builtin/fetch.c:104 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:105 +#: builtin/fetch.c:106 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:107 builtin/pull.c:187 +#: builtin/fetch.c:108 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:108 builtin/pull.c:190 +#: builtin/fetch.c:109 builtin/pull.c:190 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:109 builtin/pull.c:191 +#: builtin/fetch.c:110 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:113 builtin/pull.c:199 +#: builtin/fetch.c:114 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:115 +#: builtin/fetch.c:116 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:118 builtin/pull.c:202 +#: builtin/fetch.c:119 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:120 builtin/pull.c:205 +#: builtin/fetch.c:121 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:122 builtin/log.c:1399 +#: builtin/fetch.c:123 builtin/log.c:1426 msgid "dir" msgstr "kat" -#: builtin/fetch.c:123 +#: builtin/fetch.c:124 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:126 +#: builtin/fetch.c:127 msgid "default mode for recursion" msgstr "standardläge för rekursion" -#: builtin/fetch.c:128 builtin/pull.c:208 +#: builtin/fetch.c:129 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:129 builtin/pull.c:210 +#: builtin/fetch.c:130 builtin/pull.c:210 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:130 builtin/pull.c:211 +#: builtin/fetch.c:131 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:386 +#: builtin/fetch.c:387 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:466 +#: builtin/fetch.c:503 +#, c-format +msgid "configuration fetch.output contains invalid value %s" +msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s" + +#: builtin/fetch.c:592 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:471 +#: builtin/fetch.c:596 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:485 -#, c-format -msgid "! %-*s %-*s -> %s (can't fetch in current branch)" -msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)" - -#: builtin/fetch.c:486 builtin/fetch.c:574 +#: builtin/fetch.c:609 builtin/fetch.c:689 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:497 +#: builtin/fetch.c:610 +msgid "can't fetch in current branch" +msgstr "kan inte hämta i aktuell gren" + +#: builtin/fetch.c:619 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552 -msgid " (unable to update local ref)" -msgstr " (kunde inte uppdatera lokal ref)" +#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669 +#: builtin/fetch.c:684 +msgid "unable to update local ref" +msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:517 +#: builtin/fetch.c:639 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:520 +#: builtin/fetch.c:642 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:523 +#: builtin/fetch.c:645 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:569 -msgid "unable to update local ref" -msgstr "kunde inte uppdatera lokal ref" - -#: builtin/fetch.c:569 +#: builtin/fetch.c:684 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:576 -msgid "(non-fast-forward)" -msgstr "(ej snabbspolad)" +#: builtin/fetch.c:689 +msgid "non-fast-forward" +msgstr "ej snabbspolad" -#: builtin/fetch.c:619 +#: builtin/fetch.c:733 #, 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:637 +#: builtin/fetch.c:753 #, 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:724 builtin/fetch.c:816 +#: builtin/fetch.c:839 builtin/fetch.c:934 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:735 +#: builtin/fetch.c:850 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6417,55 +6813,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:787 +#: builtin/fetch.c:904 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:788 +#: builtin/fetch.c:905 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:820 +#: builtin/fetch.c:937 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:821 builtin/remote.c:1025 +#: builtin/fetch.c:938 builtin/remote.c:1020 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:841 +#: builtin/fetch.c:960 #, 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:860 +#: builtin/fetch.c:979 #, 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:863 +#: builtin/fetch.c:982 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:920 +#: builtin/fetch.c:1039 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:1080 +#: builtin/fetch.c:1199 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1082 builtin/remote.c:96 +#: builtin/fetch.c:1201 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1100 +#: builtin/fetch.c:1219 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -6473,32 +6869,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:1123 +#: builtin/fetch.c:1242 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1165 +#: builtin/fetch.c:1284 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1286 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1187 +#: builtin/fetch.c:1306 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1308 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1200 +#: builtin/fetch.c:1319 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1208 +#: builtin/fetch.c:1327 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -6584,67 +6980,65 @@ msgstr "visa endast referenser som ej slagits samman" 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:156 builtin/prune.c:140 -msgid "Checking connectivity" -msgstr "Kontrollerar konnektivitet" - -#: builtin/fsck.c:486 +#: builtin/fsck.c:519 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:552 +#: builtin/fsck.c:588 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:558 +#: builtin/fsck.c:594 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:559 +#: builtin/fsck.c:595 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:560 +#: builtin/fsck.c:596 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:561 +#: builtin/fsck.c:597 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:562 +#: builtin/fsck.c:598 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:563 +#: builtin/fsck.c:599 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:564 +#: builtin/fsck.c:600 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:565 +#: builtin/fsck.c:601 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:566 +#: builtin/fsck.c:602 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:568 +#: builtin/fsck.c:604 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:569 builtin/prune.c:107 +#: builtin/fsck.c:605 builtin/prune.c:107 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:630 +#: builtin/fsck.c:606 +msgid "show verbose names for reachable objects" +msgstr "visa ordrika namn för nåbara objekt" + +#: builtin/fsck.c:671 msgid "Checking objects" msgstr "Kontrollerar objekt" @@ -6933,7 +7327,7 @@ msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" msgid "no pattern given." msgstr "inget mönster angavs." -#: builtin/grep.c:845 builtin/index-pack.c:1477 +#: builtin/grep.c:845 builtin/index-pack.c:1479 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" @@ -7078,334 +7472,330 @@ msgstr "ingen man-visare hanterade förfrågan" msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:408 +#: builtin/help.c:401 msgid "Defining attributes per path" msgstr "Definierar attribut per sökväg" -#: builtin/help.c:409 +#: builtin/help.c:402 msgid "Everyday Git With 20 Commands Or So" msgstr "Git för dagligt bruk i ungefär 20 kommandon" -#: builtin/help.c:410 +#: builtin/help.c:403 msgid "A Git glossary" msgstr "En Git-ordlista" -#: builtin/help.c:411 +#: builtin/help.c:404 msgid "Specifies intentionally untracked files to ignore" msgstr "Ange avsiktligen ospårade filer att ignorera" -#: builtin/help.c:412 +#: builtin/help.c:405 msgid "Defining submodule properties" msgstr "Ange egenskaper för undermoduler" -#: builtin/help.c:413 +#: builtin/help.c:406 msgid "Specifying revisions and ranges for Git" msgstr "Ange versioner och intervall i Git" -#: builtin/help.c:414 +#: builtin/help.c:407 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:415 +#: builtin/help.c:408 msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" -#: builtin/help.c:427 +#: builtin/help.c:420 msgid "The common Git guides are:\n" msgstr "De vanliga Git-vägledningarna är:\n" -#: builtin/help.c:448 builtin/help.c:465 +#: builtin/help.c:441 builtin/help.c:458 #, c-format msgid "usage: %s%s" msgstr "användning: %s%s" -#: builtin/help.c:481 +#: builtin/help.c:474 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "\"git %s\" är ett alias för \"%s\"" -#: builtin/index-pack.c:152 +#: builtin/index-pack.c:153 #, c-format msgid "unable to open %s" msgstr "kunde inte öppna %s" -#: builtin/index-pack.c:202 +#: builtin/index-pack.c:203 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" -#: builtin/index-pack.c:222 +#: builtin/index-pack.c:223 #, c-format msgid "did not receive expected object %s" msgstr "emottog inte det förväntade objektet %s" -#: builtin/index-pack.c:225 +#: builtin/index-pack.c:226 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objektet %s: förväntad typ %s, såg %s" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:268 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "kan inte fylla %d byte" msgstr[1] "kan inte fylla %d byte" -#: builtin/index-pack.c:277 +#: builtin/index-pack.c:278 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:278 +#: builtin/index-pack.c:279 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:290 +#: builtin/index-pack.c:291 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:297 +#: builtin/index-pack.c:298 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" -#: builtin/index-pack.c:313 +#: builtin/index-pack.c:314 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: builtin/index-pack.c:318 +#: builtin/index-pack.c:319 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:332 +#: builtin/index-pack.c:333 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:334 +#: builtin/index-pack.c:335 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:352 +#: builtin/index-pack.c:353 #, c-format -msgid "pack has bad object at offset %lu: %s" -msgstr "paketet har felaktigt objekt vid index %lu: %s" +msgid "pack has bad object at offset %<PRIuMAX>: %s" +msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s" -#: builtin/index-pack.c:473 +#: builtin/index-pack.c:475 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:522 +#: builtin/index-pack.c:524 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:532 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:540 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:569 +#: builtin/index-pack.c:571 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:571 +#: builtin/index-pack.c:573 #, c-format -msgid "premature end of pack file, %lu byte missing" -msgid_plural "premature end of pack file, %lu bytes missing" -msgstr[0] "för tidigt slut på paketfilen, %lu byte saknas" -msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas" +msgid "premature end of pack file, %<PRIuMAX> byte missing" +msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" +msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" +msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" -#: builtin/index-pack.c:597 +#: builtin/index-pack.c:599 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772 -#: builtin/index-pack.c:806 builtin/index-pack.c:815 +#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774 +#: builtin/index-pack.c:808 builtin/index-pack.c:817 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:746 builtin/pack-objects.c:162 -#: builtin/pack-objects.c:254 +#: builtin/index-pack.c:748 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:812 +#: builtin/index-pack.c:814 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:826 +#: builtin/index-pack.c:828 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:840 +#: builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/index-pack.c:843 +#: builtin/index-pack.c:845 msgid "Error in object" msgstr "Fel i objekt" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:847 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Inte alla barnobjekt för %s kan nås" -#: builtin/index-pack.c:917 builtin/index-pack.c:948 +#: builtin/index-pack.c:919 builtin/index-pack.c:950 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1120 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1120 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1150 +#: builtin/index-pack.c:1152 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1157 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1158 +#: builtin/index-pack.c:1160 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1169 +#: builtin/index-pack.c:1171 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1194 +#: builtin/index-pack.c:1196 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1205 +#: builtin/index-pack.c:1207 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1247 +#: builtin/index-pack.c:1249 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1253 +#: builtin/index-pack.c:1255 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "slutfördes med %d lokalt objekt" msgstr[1] "slutfördes med %d lokala objekt" -#: builtin/index-pack.c:1265 +#: builtin/index-pack.c:1267 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1269 +#: builtin/index-pack.c:1271 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paketet har %d oanalyserat delta" msgstr[1] "paketet har %d oanalyserade delta" -#: builtin/index-pack.c:1293 +#: builtin/index-pack.c:1295 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1369 +#: builtin/index-pack.c:1371 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1393 +#: builtin/index-pack.c:1395 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1408 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1414 +#: builtin/index-pack.c:1416 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1429 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1440 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1473 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 +#: builtin/index-pack.c:1483 builtin/index-pack.c:1681 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1542 +#: builtin/index-pack.c:1544 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\"" -#: builtin/index-pack.c:1589 +#: builtin/index-pack.c:1591 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "icke-delta: %d objekt" msgstr[1] "icke-delta: %d objekt" -#: builtin/index-pack.c:1596 +#: builtin/index-pack.c:1598 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "kedjelängd = %d: %lu objekt" msgstr[1] "kedjelängd = %d: %lu objekt" -#: builtin/index-pack.c:1609 +#: builtin/index-pack.c:1611 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1638 -msgid "Cannot come back to cwd" -msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" - -#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 -#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 +#: builtin/index-pack.c:1693 builtin/index-pack.c:1696 +#: builtin/index-pack.c:1712 builtin/index-pack.c:1716 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1723 +#: builtin/index-pack.c:1730 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1731 +#: builtin/index-pack.c:1738 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -7469,27 +7859,27 @@ msgstr "kan inte hantera filtyp %d" msgid "unable to move %s to %s" 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:403 +#: builtin/init-db.c:402 #, c-format -msgid "%s%s Git repository in %s%s\n" -msgstr "%s%s Git-arkiv i %s%s\n" +msgid "Reinitialized existing shared Git repository in %s%s\n" +msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n" -#: builtin/init-db.c:404 -msgid "Reinitialized existing" -msgstr "Ominitierade befintligt" +#: builtin/init-db.c:403 +#, c-format +msgid "Reinitialized existing Git repository in %s%s\n" +msgstr "Ominitierade befintligt Git-arkiv i %s%s\n" -#: builtin/init-db.c:404 -msgid "Initialized empty" -msgstr "Initierade tomt" +#: builtin/init-db.c:407 +#, c-format +msgid "Initialized empty shared Git repository in %s%s\n" +msgstr "Initierade tomt delat Git-arkiv i %s%s\n" -#: builtin/init-db.c:405 -msgid " shared" -msgstr " delat" +#: builtin/init-db.c:408 +#, c-format +msgid "Initialized empty Git repository in %s%s\n" +msgstr "Initierade tomt Git-arkiv i %s%s\n" -#: builtin/init-db.c:452 +#: builtin/init-db.c:455 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7497,25 +7887,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" "shared[=<behörigheter>]] [<katalog>]" -#: builtin/init-db.c:475 +#: builtin/init-db.c:478 msgid "permissions" msgstr "behörigheter" -#: builtin/init-db.c:476 +#: builtin/init-db.c:479 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:510 builtin/init-db.c:515 +#: builtin/init-db.c:513 builtin/init-db.c:518 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:519 +#: builtin/init-db.c:522 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:540 +#: builtin/init-db.c:543 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7524,7 +7914,7 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:568 +#: builtin/init-db.c:571 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" @@ -7557,115 +7947,115 @@ msgstr "släprad(er) att lägga till" msgid "no input file given for in-place editing" msgstr "ingen indatafil angiven för redigering på plats" -#: builtin/log.c:43 +#: builtin/log.c:44 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/log.c:44 +#: builtin/log.c:45 msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." -#: builtin/log.c:83 +#: builtin/log.c:84 #, c-format msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:137 +#: builtin/log.c:139 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: builtin/log.c:138 +#: builtin/log.c:140 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:139 +#: builtin/log.c:141 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:140 +#: builtin/log.c:142 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:143 +#: builtin/log.c:145 msgid "Process line range n,m in file, counting from 1" msgstr "Behandla radintervallet n,m i filen, med början på 1" -#: builtin/log.c:239 +#: builtin/log.c:241 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:471 +#: builtin/log.c:486 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:485 builtin/log.c:578 +#: builtin/log.c:500 builtin/log.c:594 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:602 +#: builtin/log.c:618 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:722 +#: builtin/log.c:739 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:812 +#: builtin/log.c:839 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:827 +#: builtin/log.c:854 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:841 +#: builtin/log.c:868 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:851 +#: builtin/log.c:878 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:957 +#: builtin/log.c:984 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:1036 +#: builtin/log.c:1064 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1064 +#: builtin/log.c:1092 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1109 +#: builtin/log.c:1137 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" -#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 -#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 -#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 -#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305 +#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425 +#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594 +#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/log.c:1231 +#: builtin/log.c:1259 msgid "Could not find exact merge base." msgstr "Kunde inte hitta exakt sammanslagningsbas." -#: builtin/log.c:1235 +#: builtin/log.c:1263 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -7676,307 +8066,307 @@ msgstr "" "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> " "manuellt." -#: builtin/log.c:1255 +#: builtin/log.c:1283 msgid "Failed to find exact merge base" msgstr "Kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1266 +#: builtin/log.c:1294 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1270 +#: builtin/log.c:1298 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1319 +#: builtin/log.c:1347 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1377 +#: builtin/log.c:1404 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:1380 +#: builtin/log.c:1407 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1384 +#: builtin/log.c:1411 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1386 +#: builtin/log.c:1413 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1388 +#: builtin/log.c:1415 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1389 +#: builtin/log.c:1416 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1390 +#: builtin/log.c:1417 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1392 +#: builtin/log.c:1419 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1394 +#: builtin/log.c:1421 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1396 +#: builtin/log.c:1423 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1399 +#: builtin/log.c:1426 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1402 +#: builtin/log.c:1429 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1405 +#: builtin/log.c:1432 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1407 +#: builtin/log.c:1434 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1409 +#: builtin/log.c:1436 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1411 +#: builtin/log.c:1438 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1413 +#: builtin/log.c:1440 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1414 +#: builtin/log.c:1441 msgid "header" msgstr "huvud" -#: builtin/log.c:1415 +#: builtin/log.c:1442 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1416 builtin/log.c:1418 +#: builtin/log.c:1443 builtin/log.c:1445 msgid "email" msgstr "epost" -#: builtin/log.c:1416 +#: builtin/log.c:1443 msgid "add To: header" msgstr "Lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1418 +#: builtin/log.c:1445 msgid "add Cc: header" msgstr "Lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1420 +#: builtin/log.c:1447 msgid "ident" msgstr "ident" -#: builtin/log.c:1421 +#: builtin/log.c:1448 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:1423 +#: builtin/log.c:1450 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1424 +#: builtin/log.c:1451 msgid "make first mail a reply to <message-id>" msgstr "Gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1425 builtin/log.c:1428 +#: builtin/log.c:1452 builtin/log.c:1455 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1426 +#: builtin/log.c:1453 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1429 +#: builtin/log.c:1456 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1433 +#: builtin/log.c:1460 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1435 +#: builtin/log.c:1462 msgid "signature" msgstr "signatur" -#: builtin/log.c:1436 +#: builtin/log.c:1463 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1437 +#: builtin/log.c:1464 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1438 +#: builtin/log.c:1465 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1440 +#: builtin/log.c:1467 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1441 +#: builtin/log.c:1468 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1531 +#: builtin/log.c:1558 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1533 +#: builtin/log.c:1560 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix och -k kan inte användas samtidigt." -#: builtin/log.c:1541 +#: builtin/log.c:1568 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1543 +#: builtin/log.c:1570 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1545 +#: builtin/log.c:1572 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1573 +#: builtin/log.c:1602 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1575 +#: builtin/log.c:1604 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1672 +#: builtin/log.c:1698 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1743 +#: builtin/log.c:1769 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1792 +#: builtin/log.c:1818 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1846 +#: builtin/log.c:1872 #, 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/ls-files.c:378 +#: builtin/ls-files.c:379 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:427 +#: builtin/ls-files.c:428 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:429 +#: builtin/ls-files.c:430 msgid "use lowercase letters for 'assume unchanged' files" msgstr "använd små bokstäver för \"anta oförändrade\"-filer" -#: builtin/ls-files.c:431 +#: builtin/ls-files.c:432 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:433 +#: builtin/ls-files.c:434 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:435 +#: builtin/ls-files.c:436 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:437 +#: builtin/ls-files.c:438 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:439 +#: builtin/ls-files.c:440 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:442 +#: builtin/ls-files.c:443 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:444 +#: builtin/ls-files.c:445 msgid "show files on the filesystem that need to be removed" msgstr "visa filer i filsystemet som behöver tas bort" -#: builtin/ls-files.c:446 +#: builtin/ls-files.c:447 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:448 +#: builtin/ls-files.c:449 msgid "show line endings of files" msgstr "visa radslut i filer" -#: builtin/ls-files.c:450 +#: builtin/ls-files.c:451 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:453 +#: builtin/ls-files.c:454 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:455 +#: builtin/ls-files.c:456 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:457 +#: builtin/ls-files.c:458 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:461 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:464 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:466 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:469 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:472 msgid "if any <file> is not in the index, treat this as an error" msgstr "om en <fil> inte är indexet, betrakta det som ett fel" -#: builtin/ls-files.c:472 +#: builtin/ls-files.c:473 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:474 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:476 msgid "show debugging data" msgstr "visa felsökningsutdata" @@ -8062,189 +8452,175 @@ msgstr "använd fullständiga sökvägsnamn" msgid "list entire tree; not just current directory (implies --full-name)" msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" -#: builtin/merge.c:45 +#: builtin/merge.c:46 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<flaggor>] [<incheckning>...]" -#: builtin/merge.c:46 +#: builtin/merge.c:47 msgid "git merge [<options>] <msg> HEAD <commit>" msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>" -#: builtin/merge.c:47 +#: builtin/merge.c:48 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:101 +#: builtin/merge.c:102 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:139 +#: builtin/merge.c:140 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:144 +#: builtin/merge.c:145 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:194 builtin/pull.c:126 +#: builtin/merge.c:195 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "visa inte en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:198 builtin/pull.c:132 +#: builtin/merge.c:199 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:200 builtin/pull.c:135 +#: builtin/merge.c:201 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet" -#: builtin/merge.c:203 builtin/pull.c:138 +#: builtin/merge.c:204 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:205 builtin/pull.c:141 +#: builtin/merge.c:206 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:207 builtin/pull.c:144 +#: builtin/merge.c:208 builtin/pull.c:144 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:208 +#: builtin/merge.c:209 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:210 builtin/pull.c:150 +#: builtin/merge.c:211 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:214 -msgid "Verify that the named commit has a valid GPG signature" -msgstr "Bekräfta att den namngivna incheckningen har en giltig GPG-signatur" +#: builtin/merge.c:215 builtin/pull.c:153 +msgid "verify that the named commit has a valid GPG signature" +msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur" -#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 +#: builtin/merge.c:216 builtin/notes.c:772 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:216 builtin/pull.c:158 +#: builtin/merge.c:217 builtin/pull.c:158 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:217 builtin/pull.c:161 +#: builtin/merge.c:218 builtin/pull.c:161 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:218 builtin/pull.c:162 +#: builtin/merge.c:219 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:220 +#: builtin/merge.c:221 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:224 +#: builtin/merge.c:225 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:226 builtin/pull.c:169 +#: builtin/merge.c:227 builtin/pull.c:169 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" -#: builtin/merge.c:254 +#: builtin/merge.c:255 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:259 +#: builtin/merge.c:260 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:264 +#: builtin/merge.c:265 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:283 builtin/merge.c:300 +#: builtin/merge.c:284 builtin/merge.c:301 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:330 +#: builtin/merge.c:331 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:343 +#: builtin/merge.c:342 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 -#: builtin/merge.c:1000 -#, c-format -msgid "Could not write to '%s'" -msgstr "Kunde inte skriva till \"%s\"" - -#: builtin/merge.c:375 -msgid "Writing SQUASH_MSG" -msgstr "Skriver SQUASH_MSG" - -#: builtin/merge.c:377 -msgid "Finishing SQUASH_MSG" -msgstr "Avslutar SQUASH_MSG" - -#: builtin/merge.c:400 +#: builtin/merge.c:392 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:451 +#: builtin/merge.c:443 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:541 +#: builtin/merge.c:533 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:660 +#: builtin/merge.c:652 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:674 +#: builtin/merge.c:666 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:687 +#: builtin/merge.c:681 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:776 +#: builtin/merge.c:733 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:785 +#: builtin/merge.c:742 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra " "den.\n" -#: builtin/merge.c:791 +#: builtin/merge.c:748 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -8260,53 +8636,67 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:815 +#: builtin/merge.c:772 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:835 +#: builtin/merge.c:792 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:890 +#: builtin/merge.c:847 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: builtin/merge.c:906 +#: builtin/merge.c:863 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" -#: builtin/merge.c:947 +#: builtin/merge.c:904 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:949 +#: builtin/merge.c:906 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:951 +#: builtin/merge.c:908 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:956 +#: builtin/merge.c:913 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Ingen fjärrspårande gren för %s från %s" -#: builtin/merge.c:1091 +#: builtin/merge.c:960 +#, c-format +msgid "Bad value '%s' in environment '%s'" +msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" + +#: builtin/merge.c:1034 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: builtin/merge.c:1219 +#: builtin/merge.c:1061 +#, c-format +msgid "not something we can merge in %s: %s" +msgstr "inte något vi kan slå ihop med %s: %s" + +#: builtin/merge.c:1095 +msgid "not something we can merge" +msgstr "inte något vi kan slå ihop" + +#: builtin/merge.c:1162 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1235 +#: builtin/merge.c:1178 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8314,7 +8704,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1242 +#: builtin/merge.c:1185 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8322,106 +8712,114 @@ 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:1245 +#: builtin/merge.c:1188 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:1254 +#: builtin/merge.c:1197 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1262 +#: builtin/merge.c:1205 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1279 +#: builtin/merge.c:1222 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1281 +#: builtin/merge.c:1224 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:1286 +#: builtin/merge.c:1229 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1288 +#: builtin/merge.c:1231 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:1344 +#: builtin/merge.c:1287 #, 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:1347 +#: builtin/merge.c:1290 #, 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:1350 +#: builtin/merge.c:1293 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: builtin/merge.c:1353 +#: builtin/merge.c:1296 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" -#: builtin/merge.c:1415 +#: builtin/merge.c:1358 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1439 +#: builtin/merge.c:1367 +msgid "Already up-to-date." +msgstr "Redan à jour." + +#: builtin/merge.c:1382 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1476 +#: builtin/merge.c:1419 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1483 +#: builtin/merge.c:1426 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1515 +#: builtin/merge.c:1451 +msgid "Already up-to-date. Yeeah!" +msgstr "Redan à jour. Toppen!" + +#: builtin/merge.c:1457 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1538 builtin/merge.c:1617 +#: builtin/merge.c:1480 builtin/merge.c:1559 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1484 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1608 +#: builtin/merge.c:1550 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1610 +#: builtin/merge.c:1552 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1619 +#: builtin/merge.c:1561 #, 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:1631 +#: builtin/merge.c:1573 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -8550,68 +8948,68 @@ msgstr "tvinga flytta/ändra namn även om målet finns" msgid "skip move/rename errors" msgstr "hoppa över fel vid flytt/namnändring" -#: builtin/mv.c:152 +#: builtin/mv.c:155 #, c-format msgid "destination '%s' is not a directory" msgstr "destinationen \"%s\" är ingen katalog" -#: builtin/mv.c:163 +#: builtin/mv.c:166 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n" -#: builtin/mv.c:167 +#: builtin/mv.c:170 msgid "bad source" msgstr "felaktig källa" -#: builtin/mv.c:170 +#: builtin/mv.c:173 msgid "can not move directory into itself" msgstr "kan inte flytta katalog till sig själv" -#: builtin/mv.c:173 +#: builtin/mv.c:176 msgid "cannot move directory over file" msgstr "kan inte flytta katalog över fil" -#: builtin/mv.c:182 +#: builtin/mv.c:185 msgid "source directory is empty" msgstr "källkatalogen är tom" -#: builtin/mv.c:207 +#: builtin/mv.c:210 msgid "not under version control" msgstr "inte versionshanterad" -#: builtin/mv.c:210 +#: builtin/mv.c:213 msgid "destination exists" msgstr "destinationen finns" -#: builtin/mv.c:218 +#: builtin/mv.c:221 #, c-format msgid "overwriting '%s'" msgstr "skriver över \"%s\"" -#: builtin/mv.c:221 +#: builtin/mv.c:224 msgid "Cannot overwrite" msgstr "Kan inte skriva över" -#: builtin/mv.c:224 +#: builtin/mv.c:227 msgid "multiple sources for the same target" msgstr "flera källor för samma mål" -#: builtin/mv.c:226 +#: builtin/mv.c:229 msgid "destination directory does not exist" msgstr "destinationskatalogen finns inte" -#: builtin/mv.c:233 +#: builtin/mv.c:236 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, källa=%s, mål=%s" -#: builtin/mv.c:254 +#: builtin/mv.c:257 #, c-format msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" @@ -8768,6 +9166,10 @@ msgstr "git notes prune [<flaggor>]" msgid "git notes get-ref" msgstr "git notes get-ref" +#: builtin/notes.c:94 +msgid "Write/edit the notes for the following object:" +msgstr "Skriv/redigera anteckningar för följande objekt:" + #: builtin/notes.c:147 #, c-format msgid "unable to start 'show' for object '%s'" @@ -8782,80 +9184,75 @@ 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:248 -#, c-format -msgid "could not create file '%s'" -msgstr "kunde inte skapa filen \"%s\"" - -#: builtin/notes.c:193 +#: builtin/notes.c:194 msgid "Please supply the note contents using either -m or -F option" msgstr "Ange innehåll för anteckningen med antingen -m eller -F" -#: builtin/notes.c:202 +#: builtin/notes.c:203 msgid "unable to write note object" msgstr "kunde inte skriva anteckningsobjekt" -#: builtin/notes.c:204 +#: builtin/notes.c:205 #, c-format 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:439 +#: builtin/notes.c:233 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:234 builtin/tag.c:442 +#: builtin/notes.c:235 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" -#: builtin/notes.c:256 +#: builtin/notes.c:257 #, c-format msgid "Failed to read object '%s'." msgstr "Kunde inte läsa objektet \"%s\"." -#: builtin/notes.c:260 +#: builtin/notes.c:261 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"." -#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 -#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 -#: builtin/notes.c:946 +#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494 +#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650 +#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968 msgid "too many parameters" msgstr "för många parametrar" -#: builtin/notes.c:375 builtin/notes.c:662 +#: builtin/notes.c:376 builtin/notes.c:663 #, c-format msgid "No note found for object %s." msgstr "Inga anteckningar hittades för objektet %s." -#: builtin/notes.c:396 builtin/notes.c:559 +#: builtin/notes.c:397 builtin/notes.c:560 msgid "note contents as a string" msgstr "anteckningsinnehåll som sträng" -#: builtin/notes.c:399 builtin/notes.c:562 +#: builtin/notes.c:400 builtin/notes.c:563 msgid "note contents in a file" msgstr "anteckningsinnehåll i en fil" -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:403 builtin/notes.c:566 msgid "reuse and edit specified note object" msgstr "återanvänd och redigera angivet anteckningsobjekt" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:406 builtin/notes.c:569 msgid "reuse specified note object" msgstr "återanvänd angivet anteckningsobjekt" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:409 builtin/notes.c:572 msgid "allow storing empty note" msgstr "tillåt lagra tom anteckning" -#: builtin/notes.c:409 builtin/notes.c:480 +#: builtin/notes.c:410 builtin/notes.c:481 msgid "replace existing notes" msgstr "ersätt befintliga anteckningar" -#: builtin/notes.c:434 +#: builtin/notes.c:435 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -8864,29 +9261,29 @@ msgstr "" "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för " "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:449 builtin/notes.c:528 +#: builtin/notes.c:450 builtin/notes.c:529 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 +#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" -#: builtin/notes.c:481 +#: builtin/notes.c:482 msgid "read objects from stdin" msgstr "läs objekt från standard in" -#: builtin/notes.c:483 +#: builtin/notes.c:484 msgid "load rewriting config for <command> (implies --stdin)" msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)" -#: builtin/notes.c:501 +#: builtin/notes.c:502 msgid "too few parameters" msgstr "för få parametrar" -#: builtin/notes.c:522 +#: builtin/notes.c:523 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -8895,12 +9292,12 @@ msgstr "" "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet " "%s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:534 +#: builtin/notes.c:535 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: builtin/notes.c:586 +#: builtin/notes.c:587 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -8909,15 +9306,20 @@ msgstr "" "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" -#: builtin/notes.c:768 +#: builtin/notes.c:753 +#, c-format +msgid "unknown notes merge strategy %s" +msgstr "okänd sammanslagningsstrategi för anteckningar: %s" + +#: builtin/notes.c:769 msgid "General options" msgstr "Allmänna flaggor" -#: builtin/notes.c:770 +#: builtin/notes.c:771 msgid "Merge options" msgstr "Flaggor för sammanslagning" -#: builtin/notes.c:772 +#: builtin/notes.c:773 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -8925,51 +9327,88 @@ msgstr "" "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:774 +#: builtin/notes.c:775 msgid "Committing unmerged notes" msgstr "Checkar in ej sammanslagna anteckningar" -#: builtin/notes.c:776 +#: builtin/notes.c:777 msgid "finalize notes merge by committing unmerged notes" msgstr "" "färdigställ sammanslagning av anteckningar genom att checka in ej " "sammanslagna anteckningar" -#: builtin/notes.c:778 +#: builtin/notes.c:779 msgid "Aborting notes merge resolution" msgstr "Avbryt lösning av sammanslagning av anteckningar" -#: builtin/notes.c:780 +#: builtin/notes.c:781 msgid "abort notes merge" msgstr "avbryt sammanslagning av anteckningar" -#: builtin/notes.c:857 +#: builtin/notes.c:792 +msgid "cannot mix --commit, --abort or -s/--strategy" +msgstr "kan inte blanda --commit, --abort eller -s/--strategy" + +#: builtin/notes.c:797 +msgid "Must specify a notes ref to merge" +msgstr "Måste ange en antecknings-referens att slå ihop" + +#: builtin/notes.c:821 +#, c-format +msgid "Unknown -s/--strategy: %s" +msgstr "Okänd -s/--strategy: %s" + +#: builtin/notes.c:858 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "Sammanslagning av anteckningar till %s är redan igångsatt på %s" -#: builtin/notes.c:884 +#: builtin/notes.c:861 +#, c-format +msgid "Failed to store link to current notes ref (%s)" +msgstr "Kunde inte lagra länk till aktuell anteckningsreferens (%s)" + +#: builtin/notes.c:863 +#, c-format +msgid "" +"Automatic notes merge failed. Fix conflicts in %s and commit the result with " +"'git notes merge --commit', or abort the merge with 'git notes merge --" +"abort'.\n" +msgstr "" +"Automatisk sammanslagning av anteckningar misslyckades. Rätta konflikter i " +"%s och checka in resultatet med \"git notes merge --commit\", eller avbryt " +"sammanslagningen med \"git notes merge --abort\".\n" + +#: builtin/notes.c:885 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:896 +#: builtin/notes.c:897 msgid "attempt to remove non-existent note is not an error" msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" -#: builtin/notes.c:899 +#: builtin/notes.c:900 msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:980 +#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127 +msgid "do not remove, show only" +msgstr "ta inte bort, bara visa" + +#: builtin/notes.c:939 +msgid "report pruned notes" +msgstr "rapportera borttagna anteckningar" + +#: builtin/notes.c:981 msgid "notes-ref" msgstr "anteckningar-ref" -#: builtin/notes.c:981 +#: builtin/notes.c:982 msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1016 builtin/remote.c:1628 +#: builtin/notes.c:1017 builtin/remote.c:1623 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" @@ -8986,175 +9425,179 @@ msgid "" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:763 +#: builtin/pack-objects.c:766 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit" -#: builtin/pack-objects.c:776 +#: builtin/pack-objects.c:779 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1017 +#: builtin/pack-objects.c:1037 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas" -#: builtin/pack-objects.c:2177 +#: builtin/pack-objects.c:2197 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2563 +#: builtin/pack-objects.c:2611 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2567 +#: builtin/pack-objects.c:2615 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2597 +#: builtin/pack-objects.c:2645 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2647 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2649 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2652 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/pack-objects.c:2605 +#: builtin/pack-objects.c:2653 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2654 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2609 +#: builtin/pack-objects.c:2657 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2611 +#: builtin/pack-objects.c:2659 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2613 +#: builtin/pack-objects.c:2661 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:2663 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2617 +#: builtin/pack-objects.c:2665 msgid "limit pack window by memory in addition to object limit" msgstr "begränsa paketfönster efter minne förutom objektgräns" -#: builtin/pack-objects.c:2619 +#: builtin/pack-objects.c:2667 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "maximal längd på deltakedja tillåten i slutligt paket" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2669 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2671 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2673 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2675 msgid "use threads when searching for best delta matches" msgstr "använd trådar vid sökning efter bästa deltaträffar" -#: builtin/pack-objects.c:2629 +#: builtin/pack-objects.c:2677 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2679 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2633 +#: builtin/pack-objects.c:2681 msgid "limit the objects to those that are not yet packed" msgstr "begränsa objekt till de som ännu inte packats" -#: builtin/pack-objects.c:2636 +#: builtin/pack-objects.c:2684 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2687 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2690 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2693 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2695 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2697 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2650 parse-options.h:142 +#: builtin/pack-objects.c:2699 +msgid "pack loose unreachable objects" +msgstr "packa lösa onåbara objekt" + +#: builtin/pack-objects.c:2700 parse-options.h:142 msgid "time" msgstr "tid" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2701 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2654 +#: builtin/pack-objects.c:2704 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2656 +#: builtin/pack-objects.c:2706 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:2658 +#: builtin/pack-objects.c:2708 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2660 +#: builtin/pack-objects.c:2710 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:2712 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2664 +#: builtin/pack-objects.c:2714 msgid "use a bitmap index if available to speed up counting objects" msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2716 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:2757 +#: builtin/pack-objects.c:2829 msgid "Counting objects" msgstr "Räknar objekt" @@ -9182,15 +9625,11 @@ 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:125 -msgid "do not remove, show only" -msgstr "ta inte bort, bara visa" - -#: builtin/prune.c:106 builtin/worktree.c:126 +#: builtin/prune.c:106 builtin/worktree.c:128 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:109 builtin/worktree.c:128 +#: builtin/prune.c:109 builtin/worktree.c:130 msgid "expire objects older than <time>" msgstr "låt tid gå ut för objekt äldre än <tid>" @@ -9210,14 +9649,10 @@ msgstr "Alternativ gällande sammanslagning" msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:147 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:101 msgid "allow fast-forward" msgstr "tillåt snabbspolning" -#: builtin/pull.c:153 -msgid "verify that the named commit has a valid GPG signature" -msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur" - #: builtin/pull.c:156 msgid "automatically stash/stash pop before and after rebase" msgstr "utför automatiskt stash/stash pop före och efter ombasering" @@ -9235,15 +9670,15 @@ msgstr "antal undermoduler som hämtas parallellt" msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt värde för pull.ff: %s" -#: builtin/pull.c:379 +#: builtin/pull.c:379 git-sh-setup.sh:226 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "Kan inte hämta med ombasering: Du har oköade ändringar." -#: builtin/pull.c:385 +#: builtin/pull.c:385 git-sh-setup.sh:252 msgid "Additionally, your index contains uncommitted changes." msgstr "Dessutom innehåller dit index ändringar som inte har checkats in." -#: builtin/pull.c:387 +#: builtin/pull.c:387 git-sh-setup.sh:245 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" "Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar." @@ -9303,7 +9738,7 @@ msgstr "Se git-pull(1) för detaljer." msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 git-rebase.sh:451 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" @@ -9326,15 +9761,19 @@ msgstr "" "Dina inställningar anger sammanslagning med referensen \"%s\"\n" "från fjärren, men någon sådan referens togs inte emot." -#: builtin/pull.c:864 +#: builtin/pull.c:820 +msgid "ignoring --verify-signatures for rebase" +msgstr "ignorera --verify-signatures för ombasering" + +#: builtin/pull.c:867 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash är endast giltig med --rebase." -#: builtin/pull.c:872 +#: builtin/pull.c:875 msgid "Updating an unborn branch with changes added to the index." msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet." -#: builtin/pull.c:900 +#: builtin/pull.c:903 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9345,7 +9784,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:905 +#: builtin/pull.c:908 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9362,11 +9801,11 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:920 +#: builtin/pull.c:923 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:924 +#: builtin/pull.c:927 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." @@ -9530,12 +9969,12 @@ msgstr "Sänder till %s\n" msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:365 +#: builtin/push.c:366 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:366 +#: builtin/push.c:367 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -9556,103 +9995,117 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:381 +#: builtin/push.c:385 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:382 +#: builtin/push.c:386 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:387 +#: builtin/push.c:391 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:388 +#: builtin/push.c:392 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:393 +#: builtin/push.c:397 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:505 +#: builtin/push.c:515 msgid "repository" msgstr "arkiv" -#: builtin/push.c:506 builtin/send-pack.c:161 +#: builtin/push.c:516 builtin/send-pack.c:161 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:507 builtin/send-pack.c:163 +#: builtin/push.c:517 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:509 +#: builtin/push.c:519 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:510 +#: builtin/push.c:520 msgid "push tags (can't be used with --all or --mirror)" msgstr "sänd taggar (kan inte användas med --all eller --mirror)" -#: builtin/push.c:513 builtin/send-pack.c:164 +#: builtin/push.c:523 builtin/send-pack.c:164 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:515 builtin/send-pack.c:175 +#: builtin/push.c:525 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "refnamn>:<förvänta" -#: builtin/push.c:516 builtin/send-pack.c:176 +#: builtin/push.c:526 builtin/send-pack.c:176 msgid "require old value of ref to be at this value" msgstr "kräv att ref:s tidigare värde är detta" -#: builtin/push.c:519 +#: builtin/push.c:529 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:521 builtin/send-pack.c:169 +#: builtin/push.c:531 builtin/send-pack.c:169 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158 +#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158 #: builtin/send-pack.c:159 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:524 +#: builtin/push.c:534 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:527 +#: builtin/push.c:537 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:529 +#: builtin/push.c:539 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:530 +#: builtin/push.c:540 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:533 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:535 builtin/send-pack.c:170 +#: builtin/push.c:545 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "begär atomiska transaktioner på fjärrsidan" -#: builtin/push.c:549 +#: builtin/push.c:546 +msgid "server-specific" +msgstr "serverspecifik" + +#: builtin/push.c:546 +msgid "option to transmit" +msgstr "" +"inget att checka in\n" +"flagga att sända" + +#: builtin/push.c:560 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är inkompatibel med --all, --mirror och --tags" -#: builtin/push.c:551 +#: builtin/push.c:562 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" +#: builtin/push.c:579 +msgid "push options must not have new line characters" +msgstr "push-flaggor kan inte innehålla radbrytning" + #: builtin/read-tree.c:37 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " @@ -9731,11 +10184,11 @@ msgstr "felsök unpack-trees" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:1719 +#: builtin/receive-pack.c:1843 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:1733 +#: builtin/receive-pack.c:1857 msgid "You must specify a directory." msgstr "Du måste ange en katalog." @@ -9885,12 +10338,12 @@ msgstr "att ange en master-gren ger ingen mening med --mirror" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar" -#: builtin/remote.c:190 builtin/remote.c:633 +#: builtin/remote.c:190 builtin/remote.c:629 #, c-format msgid "remote %s already exists." msgstr "fjärrarkivet %s finns redan." -#: builtin/remote.c:194 builtin/remote.c:637 +#: builtin/remote.c:194 builtin/remote.c:633 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" @@ -9913,17 +10366,17 @@ msgstr "(matchande)" msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858 +#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854 #, c-format msgid "No such remote: %s" msgstr "Inget sådant fjärrarkiv: %s" -#: builtin/remote.c:643 +#: builtin/remote.c:639 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:663 +#: builtin/remote.c:659 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -9934,17 +10387,17 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:699 +#: builtin/remote.c:695 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:733 +#: builtin/remote.c:729 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:796 +#: builtin/remote.c:792 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -9958,282 +10411,292 @@ 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:810 +#: builtin/remote.c:806 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:911 +#: builtin/remote.c:907 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:914 +#: builtin/remote.c:910 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:916 +#: builtin/remote.c:912 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:918 +#: builtin/remote.c:914 msgid " ???" msgstr " ???" -#: builtin/remote.c:959 +#: builtin/remote.c:955 #, 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:967 +#: builtin/remote.c:963 #, c-format msgid "rebases interactively onto remote %s" msgstr "ombaseras interaktivt på fjärren %s" -#: builtin/remote.c:971 +#: builtin/remote.c:964 +#, c-format +msgid "rebases onto remote %s" +msgstr "ombaseras på fjärren %s" + +#: builtin/remote.c:967 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:972 -msgid " and with remote" -msgstr " och med fjärren" - -#: builtin/remote.c:974 +#: builtin/remote.c:970 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:975 -msgid " and with remote" -msgstr " och med fjärren" +#: builtin/remote.c:973 +#, c-format +msgid "%-*s and with remote %s\n" +msgstr "%-*s och med fjärren %s\n" -#: builtin/remote.c:1021 +#: builtin/remote.c:1016 msgid "create" msgstr "skapa" -#: builtin/remote.c:1024 +#: builtin/remote.c:1019 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1028 +#: builtin/remote.c:1023 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1031 +#: builtin/remote.c:1026 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1034 +#: builtin/remote.c:1029 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1041 +#: builtin/remote.c:1036 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1044 +#: builtin/remote.c:1039 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1048 +#: builtin/remote.c:1043 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1051 +#: builtin/remote.c:1046 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1119 +#: builtin/remote.c:1114 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1146 +#: builtin/remote.c:1141 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1147 +#: builtin/remote.c:1142 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1148 builtin/remote.c:1301 +#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1296 msgid "(no URL)" msgstr "(ingen URL)" #. TRANSLATORS: the colon ':' should align with #. the one in " Fetch URL: %s" translation -#: builtin/remote.c:1159 builtin/remote.c:1161 +#: builtin/remote.c:1154 builtin/remote.c:1156 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 +#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1169 +#: builtin/remote.c:1158 +msgid "(not queried)" +msgstr "(inte förfrågad)" + +#: builtin/remote.c:1160 +msgid "(unknown)" +msgstr "(okänd)" + +#: builtin/remote.c:1164 #, 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:1181 +#: builtin/remote.c:1176 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1184 builtin/remote.c:1211 +#: builtin/remote.c:1179 builtin/remote.c:1206 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1193 +#: builtin/remote.c:1188 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:1201 +#: builtin/remote.c:1196 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1208 +#: builtin/remote.c:1203 #, 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:1229 +#: builtin/remote.c:1224 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1231 +#: builtin/remote.c:1226 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1246 +#: builtin/remote.c:1241 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1248 +#: builtin/remote.c:1243 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:1258 +#: builtin/remote.c:1253 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1261 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1268 +#: builtin/remote.c:1263 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1286 +#: builtin/remote.c:1281 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1287 +#: builtin/remote.c:1282 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1297 +#: builtin/remote.c:1292 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1293 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1314 +#: builtin/remote.c:1309 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1317 +#: builtin/remote.c:1312 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1362 +#: builtin/remote.c:1357 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 +#: builtin/remote.c:1420 builtin/remote.c:1474 builtin/remote.c:1542 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1441 +#: builtin/remote.c:1436 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1448 +#: builtin/remote.c:1443 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1465 +#: builtin/remote.c:1460 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:1467 +#: builtin/remote.c:1462 msgid "return all URLs" msgstr "returnera alla URL:er" -#: builtin/remote.c:1495 +#: builtin/remote.c:1490 #, c-format msgid "no URLs configured for remote '%s'" msgstr "ingen URL:er angivna för fjärren \"%s\"" -#: builtin/remote.c:1521 +#: builtin/remote.c:1516 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1523 +#: builtin/remote.c:1518 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1525 +#: builtin/remote.c:1520 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1532 +#: builtin/remote.c:1527 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1573 +#: builtin/remote.c:1568 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1576 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1583 +#: builtin/remote.c:1578 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/remote.c:1597 +#: builtin/remote.c:1592 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" @@ -10241,77 +10704,85 @@ msgstr "var pratsam; måste skrivas före ett underkommando" msgid "git repack [<options>]" msgstr "git repack [<flaggor>]" -#: builtin/repack.c:159 +#: builtin/repack.c:160 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:161 +#: builtin/repack.c:162 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gör onåbara objekt lösa" -#: builtin/repack.c:164 +#: builtin/repack.c:165 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" -#: builtin/repack.c:166 +#: builtin/repack.c:167 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sänd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:168 +#: builtin/repack.c:169 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:170 +#: builtin/repack.c:171 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:173 +#: builtin/repack.c:174 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:175 +#: builtin/repack.c:176 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:176 +#: builtin/repack.c:177 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:177 +#: builtin/repack.c:178 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lös inte upp objekt äldre än detta" -#: builtin/repack.c:179 +#: builtin/repack.c:180 +msgid "with -a, repack unreachable objects" +msgstr "med -a, packa om onåbara objekt" + +#: builtin/repack.c:182 msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" -#: builtin/repack.c:180 builtin/repack.c:184 +#: builtin/repack.c:183 builtin/repack.c:187 msgid "bytes" msgstr "byte" -#: builtin/repack.c:181 +#: builtin/repack.c:184 msgid "same as the above, but limit memory size instead of entries count" msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal" -#: builtin/repack.c:183 +#: builtin/repack.c:186 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:185 +#: builtin/repack.c:188 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:187 +#: builtin/repack.c:190 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:197 +#: builtin/repack.c:200 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:381 +#: builtin/repack.c:204 +msgid "--keep-unreachable and -A are incompatible" +msgstr "--keep-unreachable och -A kan inte användas samtidigt" + +#: builtin/repack.c:391 builtin/worktree.c:115 #, c-format -msgid "removing '%s' failed" +msgid "failed to remove '%s'" msgstr "misslyckades ta bort \"%s\"" #: builtin/replace.c:19 @@ -10535,7 +11006,7 @@ msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-list.c:350 +#: builtin/rev-list.c:362 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" @@ -10627,31 +11098,27 @@ msgstr "alternativ" msgid "option for merge strategy" msgstr "alternativ för sammanslagningsstrategi" -#: builtin/revert.c:104 +#: builtin/revert.c:100 msgid "append commit name" msgstr "lägg till incheckningsnamn" -#: builtin/revert.c:106 +#: builtin/revert.c:102 msgid "preserve initially empty commits" msgstr "behåll incheckningar som börjar som tomma" -#: builtin/revert.c:107 +#: builtin/revert.c:103 msgid "allow commits with empty messages" msgstr "tillåt incheckningar med tomt meddelande" -#: builtin/revert.c:108 +#: builtin/revert.c:104 msgid "keep redundant, empty commits" msgstr "behåll redundanta, tomma incheckningar" -#: builtin/revert.c:112 -msgid "program error" -msgstr "programfel" - -#: builtin/revert.c:197 +#: builtin/revert.c:192 msgid "revert failed" msgstr "\"revert\" misslyckades" -#: builtin/revert.c:212 +#: builtin/revert.c:207 msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" @@ -10943,12 +11410,12 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" msgid "prepend comment character and space to each line" msgstr "lägg in kommentarstecken och blanksteg först på varje rad" -#: builtin/submodule--helper.c:24 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:923 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/submodule--helper.c:31 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:932 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" @@ -10958,8 +11425,8 @@ msgstr "Förväntade fullt referensnamn, fick %s" msgid "cannot strip one component off url '%s'" msgstr "kan inte ta bort en komponent från url:en \"%s\"" -#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 -#: builtin/submodule--helper.c:486 +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:403 +#: builtin/submodule--helper.c:483 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" @@ -10967,65 +11434,65 @@ msgstr "alternativa ankare för relativa sökvägar" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#: builtin/submodule--helper.c:324 builtin/submodule--helper.c:338 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules" -#: builtin/submodule--helper.c:366 +#: builtin/submodule--helper.c:364 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:370 +#: builtin/submodule--helper.c:368 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:380 +#: builtin/submodule--helper.c:378 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n" -#: builtin/submodule--helper.c:387 +#: builtin/submodule--helper.c:385 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:404 msgid "Suppress output for initializing a submodule" msgstr "Dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:411 +#: builtin/submodule--helper.c:409 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<sökväg>]" -#: builtin/submodule--helper.c:432 +#: builtin/submodule--helper.c:430 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:438 +#: builtin/submodule--helper.c:436 #, 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:489 +#: builtin/submodule--helper.c:486 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen skall klonas till" -#: builtin/submodule--helper.c:492 +#: builtin/submodule--helper.c:489 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:495 +#: builtin/submodule--helper.c:492 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:501 +#: builtin/submodule--helper.c:498 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:507 +#: builtin/submodule--helper.c:504 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -11033,87 +11500,110 @@ msgstr "" "git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference " "<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>" -#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 +#: builtin/submodule--helper.c:529 builtin/submodule--helper.c:535 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/submodule--helper.c:534 +#: builtin/submodule--helper.c:531 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:550 +#: builtin/submodule--helper.c:547 #, c-format msgid "cannot open file '%s'" msgstr "kan inte öppna filen \"%s\"" -#: builtin/submodule--helper.c:555 +#: builtin/submodule--helper.c:552 #, c-format msgid "could not close file %s" msgstr "kunde inte stänga filen %s" -#: builtin/submodule--helper.c:562 +#: builtin/submodule--helper.c:559 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:609 +#: builtin/submodule--helper.c:611 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:613 +#: builtin/submodule--helper.c:615 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:639 +#: builtin/submodule--helper.c:641 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:660 +#: builtin/submodule--helper.c:662 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:768 +#: builtin/submodule--helper.c:792 +#, c-format +msgid "Failed to clone '%s'. Retry scheduled" +msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" + +#: builtin/submodule--helper.c:803 +#, c-format +msgid "Failed to clone '%s' a second time, aborting" +msgstr "Misslyckades klona \"%s\" för andra gången, avbryter" + +#: builtin/submodule--helper.c:824 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:771 +#: builtin/submodule--helper.c:827 msgid "path into the working tree, across nested submodule boundaries" msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser" -#: builtin/submodule--helper.c:775 +#: builtin/submodule--helper.c:831 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:779 +#: builtin/submodule--helper.c:835 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Skapa en grund klon trunkerad till angivet antal revisioner" -#: builtin/submodule--helper.c:782 +#: builtin/submodule--helper.c:838 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:783 +#: builtin/submodule--helper.c:840 +msgid "whether the initial clone should follow the shallow recommendation" +msgstr "om den första klonen skall följa rekommendation för grund kloning" + +#: builtin/submodule--helper.c:841 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:788 +#: builtin/submodule--helper.c:846 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:798 +#: builtin/submodule--helper.c:856 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:855 +#: builtin/submodule--helper.c:927 +#, c-format +msgid "" +"Submodule (%s) branch configured to inherit branch from superproject, but " +"the superproject is not on any branch" +msgstr "" +"Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men " +"huvudprojektet är inte på någon gren" + +#: builtin/submodule--helper.c:977 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "underkommandot submodule--helper måste anropas med ett underkommando" -#: builtin/submodule--helper.c:862 +#: builtin/submodule--helper.c:984 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -11459,14 +11949,6 @@ msgstr "<läge>,<objekt>,<sökväg>" msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:958 -msgid "(+/-)x" -msgstr "(+/-)x" - -#: builtin/update-index.c:959 -msgid "override the executable bit of the listed files" -msgstr "överstyr exekveringsbiten för angivna filer" - #: builtin/update-index.c:963 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" @@ -11625,83 +12107,110 @@ msgid "git worktree add [<options>] <path> [<branch>]" msgstr "git worktree add [<flaggor>] <sökväg> [<gren>]" #: builtin/worktree.c:16 +msgid "git worktree list [<options>]" +msgstr "git worktree list [<flaggor>]" + +#: builtin/worktree.c:17 +msgid "git worktree lock [<options>] <path>" +msgstr "git worktree lock [<flaggor>] <sökväg>" + +#: builtin/worktree.c:18 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<flaggor>]" -#: builtin/worktree.c:17 -msgid "git worktree list [<options>]" -msgstr "git worktree list [<flaggor>]" +#: builtin/worktree.c:19 +msgid "git worktree unlock <path>" +msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:40 +#: builtin/worktree.c:42 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Tar bort worktrees/%s: inte en giltig katalog" -#: builtin/worktree.c:46 +#: builtin/worktree.c:48 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" -#: builtin/worktree.c:51 +#: builtin/worktree.c:53 #, 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:62 +#: builtin/worktree.c:64 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" -#: builtin/worktree.c:78 +#: builtin/worktree.c:80 #, 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:113 -#, c-format -msgid "failed to remove '%s'" -msgstr "misslyckades ta bort \"%s\"" - -#: builtin/worktree.c:202 +#: builtin/worktree.c:204 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:234 +#: builtin/worktree.c:236 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:270 +#: builtin/worktree.c:272 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Förbereder %s (identifieraren %s)" -#: builtin/worktree.c:322 +#: builtin/worktree.c:323 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:324 +#: builtin/worktree.c:325 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:326 +#: builtin/worktree.c:327 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:327 -msgid "detach HEAD at named commit" -msgstr "koppla från HEAD vid namngiven incheckning" - -#: builtin/worktree.c:328 +#: builtin/worktree.c:329 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:336 +#: builtin/worktree.c:337 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" +#: builtin/worktree.c:470 +msgid "reason for locking" +msgstr "orsak till lås" + +#: builtin/worktree.c:482 builtin/worktree.c:515 +#, c-format +msgid "'%s' is not a working tree" +msgstr "\"%s\" är inte en arbetskatalog" + +#: builtin/worktree.c:484 builtin/worktree.c:517 +msgid "The main working tree cannot be locked or unlocked" +msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" + +#: builtin/worktree.c:489 +#, c-format +msgid "'%s' is already locked, reason: %s" +msgstr "\"%s\" är redan låst, orsak: %s" + +#: builtin/worktree.c:491 +#, c-format +msgid "'%s' is already locked" +msgstr "\"%s\" är redan låst" + +#: builtin/worktree.c:519 +#, c-format +msgid "'%s' is not locked" +msgstr "\"%s\" är inte låst" + #: builtin/write-tree.c:13 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]" @@ -11718,6 +12227,26 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" +#: upload-pack.c:20 +msgid "git upload-pack [<options>] <dir>" +msgstr "git upload-pack [<flaggor>] <katalog>" + +#: upload-pack.c:837 +msgid "quit after a single request/response exchange" +msgstr "avsluta omedelbart efter första anrop/svar-utväxling" + +#: upload-pack.c:839 +msgid "exit immediately after initial ref advertisement" +msgstr "avsluta omedelbart efter inledande kungörelse av referenser" + +#: upload-pack.c:841 +msgid "do not try <directory>/.git/ if <directory> is no Git directory" +msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog" + +#: upload-pack.c:843 +msgid "interrupt transfer after <n> seconds of inactivity" +msgstr "avbryt överföringen efter <n> sekunders inaktivitet" + #: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "skriv felsökningsmeddelanden på standard fel" @@ -11732,7 +12261,7 @@ msgstr "" "några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n" "<koncept>\" för att läsa mer om specifika underkommandon och koncept." -#: http.c:322 +#: http.c:323 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0" @@ -11864,32 +12393,32 @@ msgstr "använd <n> siffror för att visa SHA-1:or" msgid "update the index with reused conflict resolution if possible" msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt" -#: git-bisect.sh:55 +#: git-bisect.sh:54 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:61 +#: git-bisect.sh:60 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:122 +#: git-bisect.sh:121 #, sh-format msgid "unrecognised option: '$arg'" msgstr "flaggan känns inte igen: \"$arg\"" -#: git-bisect.sh:126 +#: git-bisect.sh:125 #, sh-format msgid "'$arg' does not appear to be a valid revision" msgstr "\"$arg\" verkar inte vara en giltig revision" -#: git-bisect.sh:155 +#: git-bisect.sh:154 msgid "Bad HEAD - I need a HEAD" msgstr "Felaktigt HEAD - Jag behöver ett HEAD" -#: git-bisect.sh:168 +#: git-bisect.sh:167 #, sh-format msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." @@ -11898,27 +12427,28 @@ msgstr "" "<giltig_gren>\"" # cogito-relaterat -#: git-bisect.sh:178 +#: git-bisect.sh:177 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:182 +#: git-bisect.sh:181 msgid "Bad HEAD - strange symbolic ref" msgstr "Felaktigt HEAD - konstig symbolisk referens" -#: git-bisect.sh:234 +#: git-bisect.sh:233 #, sh-format msgid "Bad bisect_write argument: $state" msgstr "Felaktigt argument till bisect_write: $state" -#: git-bisect.sh:263 +#: git-bisect.sh:262 #, sh-format msgid "Bad rev input: $arg" msgstr "Felaktig rev-indata: $arg" -#: 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:281 +#, sh-format +msgid "Bad rev input: $bisected_head" +msgstr "Felaktig rev-indata: $bisected_head" #: git-bisect.sh:290 #, sh-format @@ -12067,7 +12597,47 @@ 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 +#: git-merge-octopus.sh:46 +msgid "" +"Error: Your local changes to the following files would be overwritten by " +"merge" +msgstr "" +"Fel: Dina lokala ändringar av följande filer skulle skrivas över av " +"sammanslagning" + +#: git-merge-octopus.sh:61 +msgid "Automated merge did not work." +msgstr "Automatisk sammanslagning misslyckades." + +#: git-merge-octopus.sh:62 +msgid "Should not be doing an Octopus." +msgstr "Borde inte använda Octopus." + +#: git-merge-octopus.sh:73 +#, sh-format +msgid "Unable to find common commit with $pretty_name" +msgstr "Kunde inte hitta gemensam incheckning med $pretty_name" + +#: git-merge-octopus.sh:77 +#, sh-format +msgid "Already up-to-date with $pretty_name" +msgstr "Redan à jour med $pretty_name" + +#: git-merge-octopus.sh:89 +#, sh-format +msgid "Fast-forwarding to: $pretty_name" +msgstr "Snabbspolar till: $pretty_name" + +#: git-merge-octopus.sh:97 +#, sh-format +msgid "Trying simple merge with $pretty_name" +msgstr "Försök enkel sammanslagning med $pretty_name" + +#: git-merge-octopus.sh:102 +msgid "Simple merge did not work, trying automatic merge." +msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning." + +#: git-rebase.sh:56 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -12078,16 +12648,21 @@ msgstr "" "Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n" "För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"." -#: git-rebase.sh:168 +#: git-rebase.sh:156 git-rebase.sh:395 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "Kunde inte flytta tillbaka till $head_name" + +#: git-rebase.sh:167 msgid "Applied autostash." msgstr "Tillämpade autostash." -#: git-rebase.sh:171 +#: git-rebase.sh:170 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kan inte spara $stash_sha1" -#: git-rebase.sh:172 +#: git-rebase.sh:171 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -12097,27 +12672,27 @@ msgstr "" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" -#: git-rebase.sh:211 +#: git-rebase.sh:210 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: git-rebase.sh:216 +#: git-rebase.sh:215 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:357 +#: git-rebase.sh:356 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: git-rebase.sh:368 +#: git-rebase.sh:367 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:375 +#: git-rebase.sh:374 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: git-rebase.sh:378 +#: git-rebase.sh:377 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -12125,12 +12700,7 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: git-rebase.sh:396 -#, sh-format -msgid "Could not move back to $head_name" -msgstr "Kunde inte flytta tillbaka till $head_name" - -#: git-rebase.sh:415 +#: git-rebase.sh:414 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -12151,98 +12721,98 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där." -#: git-rebase.sh:466 +#: git-rebase.sh:465 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ogiltig uppström $upstream_name" -#: git-rebase.sh:490 +#: git-rebase.sh:489 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: mer än en sammanslagningsbas finns" -#: git-rebase.sh:493 git-rebase.sh:497 +#: git-rebase.sh:492 git-rebase.sh:496 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ingen sammanslagningsbas finns" -#: git-rebase.sh:502 +#: git-rebase.sh:501 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Peka på en giltig incheckning: $onto_name" -#: git-rebase.sh:525 +#: git-rebase.sh:524 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ödesdigert: ingen sådan gren: $branch_name" -#: git-rebase.sh:558 +#: git-rebase.sh:557 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: git-rebase.sh:563 +#: git-rebase.sh:562 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Skapade autostash: $stash_abbrev" -#: git-rebase.sh:567 +#: git-rebase.sh:566 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: git-rebase.sh:587 +#: git-rebase.sh:586 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name är à jour." -#: git-rebase.sh:591 +#: git-rebase.sh:590 #, 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:602 +#: git-rebase.sh:601 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Ändringar från $mb till $onto:" -#: git-rebase.sh:611 +#: git-rebase.sh:610 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:621 +#: git-rebase.sh:620 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." -#: git-stash.sh:51 +#: git-stash.sh:50 msgid "git stash clear with parameters is unimplemented" msgstr "\"git stash clear\" med parametrar har inte implementerats" -#: git-stash.sh:74 +#: git-stash.sh:73 msgid "You do not have the initial commit yet" msgstr "Du har inte den första incheckningen ännu" -#: git-stash.sh:89 +#: git-stash.sh:88 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: git-stash.sh:124 git-stash.sh:137 +#: git-stash.sh:123 git-stash.sh:136 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: git-stash.sh:141 +#: git-stash.sh:140 msgid "No changes selected" msgstr "Inga ändringar valda" -#: git-stash.sh:144 +#: git-stash.sh:143 msgid "Cannot remove temporary index (can't happen)" msgstr "Kan inte ta bort temporärt index (kan inte inträffa)" -#: git-stash.sh:157 +#: git-stash.sh:156 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: git-stash.sh:189 +#: git-stash.sh:188 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Kan inte uppdatera $ref_stash med $w_commit" @@ -12257,7 +12827,7 @@ msgstr "Kan inte uppdatera $ref_stash med $w_commit" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:239 +#: git-stash.sh:238 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -12266,108 +12836,117 @@ msgstr "" "fel: felaktig flagga för \"stash save\": $option\n" " För att ange ett meddelande, använd git stash save -- \"$option\"" -#: git-stash.sh:260 +#: git-stash.sh:259 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: git-stash.sh:264 +#: git-stash.sh:263 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: git-stash.sh:268 +#: git-stash.sh:267 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: git-stash.sh:286 +#: git-stash.sh:268 +#, sh-format +msgid "Saved working directory and index state $stash_msg" +msgstr "Sparade arbetskatalogen och indexstatus $stash_msg" + +#: git-stash.sh:285 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: git-stash.sh:405 +#: git-stash.sh:404 #, sh-format msgid "unknown option: $opt" msgstr "okänd flagga: $opt" -#: git-stash.sh:415 +#: git-stash.sh:414 msgid "No stash found." msgstr "Ingen \"stash\" hittades." -#: git-stash.sh:422 +#: git-stash.sh:421 #, sh-format msgid "Too many revisions specified: $REV" msgstr "För många revisioner angivna: $REV" -#: git-stash.sh:428 +#: git-stash.sh:427 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference är inte en giltig referens" -#: git-stash.sh:456 +#: git-stash.sh:455 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" -#: git-stash.sh:467 +#: git-stash.sh:466 #, sh-format msgid "'$args' is not a stash reference" msgstr "\"$args\" är inte en \"stash\"-referens" -#: git-stash.sh:475 +#: git-stash.sh:474 msgid "unable to refresh index" msgstr "kan inte uppdatera indexet" -#: git-stash.sh:479 +#: git-stash.sh:478 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:487 +#: git-stash.sh:486 msgid "Conflicts in index. Try without --index." msgstr "Konflikter i indexet. Testa utan --index." -#: git-stash.sh:489 +#: git-stash.sh:488 msgid "Could not save index tree" msgstr "Kunde inte spara indexträd" -#: git-stash.sh:523 +#: git-stash.sh:522 msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-stash.sh:538 +#: git-stash.sh:537 msgid "Index was not unstashed." msgstr "Indexet har inte tagits ur kön." -#: git-stash.sh:561 +#: git-stash.sh:551 +msgid "The stash is kept in case you need it again." +msgstr "\"Stash\":en behålls ifall du behöver den igen." + +#: git-stash.sh:560 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-stash.sh:562 +#: git-stash.sh:561 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:570 +#: git-stash.sh:569 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: git-stash.sh:642 +#: git-stash.sh:641 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" -#: git-submodule.sh:219 +#: git-submodule.sh:183 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:229 +#: git-submodule.sh:193 #, 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:246 +#: git-submodule.sh:210 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:250 +#: git-submodule.sh:214 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12378,100 +12957,90 @@ msgstr "" "$sm_path\n" "Använd -f om du verkligen vill lägga till den" -#: git-submodule.sh:268 +#: git-submodule.sh:232 #, 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:270 +#: git-submodule.sh:234 #, 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:278 +#: git-submodule.sh:242 #, 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:280 -#, sh-format -msgid "" -"If you want to reuse this local git directory instead of cloning again from" -msgstr "" -"För att återanvända den lokala git-katalogen istället för att på nytt klona " -"från" - -#: git-submodule.sh:282 -#, 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:283 +#: git-submodule.sh:244 #, sh-format msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" $realrepo\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -"eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--name" -"\"." +"Om du vill återanvända den lokala git-katalogen instället för att klona på " +"nytt från\n" +" $realrepo\n" +"kan du använda flaggan \"--force\". Om den lokala git-katalogen inte är " +"korrekt\n" +"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n" +"flaggan \"--name\"." -#: git-submodule.sh:285 +#: git-submodule.sh:250 #, 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:297 +#: git-submodule.sh:262 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:302 +#: git-submodule.sh:267 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:311 +#: git-submodule.sh:276 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:355 +#: git-submodule.sh:323 #, sh-format msgid "Entering '$displaypath'" msgstr "Går in i \"$displaypath\"" -#: git-submodule.sh:375 +#: git-submodule.sh:343 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" "Stoppar på \"$displaypath\"; skriptet returnerade en status skild från noll." -#: git-submodule.sh:448 +#: git-submodule.sh:414 #, sh-format msgid "pathspec and --all are incompatible" msgstr "sökvägsangivelse och --all är inkompatibla" -#: git-submodule.sh:453 +#: git-submodule.sh:419 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler" -#: git-submodule.sh:470 -#, sh-format -msgid "Submodule work tree '$displaypath' contains a .git directory" -msgstr "" -"Undermodulens arbetskatalog \"$displaypath\" innehåller katalogen \".git\"" - -#: git-submodule.sh:471 +#: git-submodule.sh:439 #, sh-format msgid "" +"Submodule work tree '$displaypath' contains a .git directory\n" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" +"Undermodulsarbetskatalogen \"$displaypath\" innehåller en .git-katalog\n" "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" -#: git-submodule.sh:477 +#: git-submodule.sh:447 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -12480,124 +13049,142 @@ msgstr "" "Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" " "kastar bort dem" -#: git-submodule.sh:480 +#: git-submodule.sh:450 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Rensade katalogen \"$displaypath\"" -#: git-submodule.sh:481 +#: git-submodule.sh:451 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\"" -#: git-submodule.sh:484 +#: git-submodule.sh:454 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\"" -#: git-submodule.sh:493 +#: git-submodule.sh:463 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\"" -#: git-submodule.sh:635 +#: git-submodule.sh:612 #, 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:644 +#: git-submodule.sh:622 #, 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:667 +#: git-submodule.sh:627 +#, sh-format +msgid "" +"Unable to find current ${remote_name}/${branch} revision in submodule path " +"'$sm_path'" +msgstr "" +"Kan inte hitta aktuell revision för ${remote_name}/${branch} i " +"undermodulsökvägen \"$sm_path\"" + +#: git-submodule.sh:645 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\"" -#: git-submodule.sh:680 +#: git-submodule.sh:651 +#, sh-format +msgid "" +"Fetched in submodule path '$displaypath', but it did not contain $sha1. " +"Direct fetching of that commit failed." +msgstr "" +"Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. " +"Direkt hämtning av incheckningen misslyckades." + +#: git-submodule.sh:658 #, 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:681 +#: git-submodule.sh:659 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:685 +#: git-submodule.sh:663 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:686 +#: git-submodule.sh:664 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:691 +#: git-submodule.sh:669 #, 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:692 +#: git-submodule.sh:670 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:697 +#: git-submodule.sh:675 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:698 +#: git-submodule.sh:676 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:729 +#: git-submodule.sh:707 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:837 +#: git-submodule.sh:815 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" -#: git-submodule.sh:889 +#: git-submodule.sh:867 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:909 +#: git-submodule.sh:887 #, 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:912 +#: git-submodule.sh:890 #, 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:915 +#: git-submodule.sh:893 #, 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:940 +#: git-submodule.sh:918 msgid "blob" msgstr "blob" -#: git-submodule.sh:1059 +#: git-submodule.sh:1040 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:1123 +#: git-submodule.sh:1107 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" @@ -12607,6 +13194,696 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\"" msgid "See git-${cmd}(1) for details." msgstr "Se git-${cmd}(1) för detaljer." +#: git-rebase--interactive.sh:131 +#, sh-format +msgid "Rebasing ($new_count/$total)" +msgstr "Ombaserar ($new_count/$total)" + +#: git-rebase--interactive.sh:147 +msgid "" +"\n" +"Commands:\n" +" p, pick = use commit\n" +" r, reword = use commit, but edit the commit message\n" +" e, edit = use commit, but stop for amending\n" +" s, squash = use commit, but meld into previous commit\n" +" f, fixup = like \"squash\", but discard this commit's log message\n" +" x, exec = run command (the rest of the line) using shell\n" +" d, drop = remove commit\n" +"\n" +"These lines can be re-ordered; they are executed from top to bottom.\n" +msgstr "" +"\n" +"Kommandon:\n" +" p, pick = använd incheckning\n" +" r, reword = använd incheckning, men redigera incheckningsmeddelandet\n" +" e, edit = använd incheckning, men stanna för tillägg\n" +" s, squash = använd incheckning, men infoga i föregående incheckning\n" +" f, fixup = som \"squash\", men förkasta incheckningsmeddelandet\n" +" x, exec = kör kommando (resten av raden) i skalet\n" +" d, drop = ta bort incheckning\n" +"\n" +"Du kan byta ordning på raderna, de utförs uppifrån och ned.\n" + +#: git-rebase--interactive.sh:162 +msgid "" +"\n" +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n" +msgstr "" +"\n" +"Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en " +"incheckning.\n" + +#: git-rebase--interactive.sh:166 +msgid "" +"\n" +"If you remove a line here THAT COMMIT WILL BE LOST.\n" +msgstr "" +"\n" +"Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n" + +#: git-rebase--interactive.sh:202 +#, sh-format +msgid "" +"You can amend the commit now, with\n" +"\n" +"\tgit commit --amend $gpg_sign_opt_quoted\n" +"\n" +"Once you are satisfied with your changes, run\n" +"\n" +"\tgit rebase --continue" +msgstr "" +"Du kan utöka incheckningen nu, med\n" +"\n" +"\tgit commit --amend $gpg_sign_opt_quoted\n" +"\n" +"När du är nöjd med dina ändringar kör du\n" +"\n" +"\tgit rebase --continue" + +#: git-rebase--interactive.sh:227 +#, sh-format +msgid "$sha1: not a commit that can be picked" +msgstr "$sha1: inte en incheckning som kan väljas" + +#: git-rebase--interactive.sh:266 +#, sh-format +msgid "Invalid commit name: $sha1" +msgstr "Felaktigt incheckningsnamn: $sha1" + +#: git-rebase--interactive.sh:308 +msgid "Cannot write current commit's replacement sha1" +msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning" + +#: git-rebase--interactive.sh:360 +#, sh-format +msgid "Fast-forward to $sha1" +msgstr "Snabbspolade till $sha1" + +#: git-rebase--interactive.sh:362 +#, sh-format +msgid "Cannot fast-forward to $sha1" +msgstr "Kan inte snabbspola till $sha1" + +#: git-rebase--interactive.sh:371 +#, sh-format +msgid "Cannot move HEAD to $first_parent" +msgstr "Kan inte flytta HEAD till $first_parent" + +#: git-rebase--interactive.sh:376 +#, sh-format +msgid "Refusing to squash a merge: $sha1" +msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1" + +#: git-rebase--interactive.sh:390 +#, sh-format +msgid "Error redoing merge $sha1" +msgstr "Fel när sammanslagningen $sha1 skulle göras om" + +#: git-rebase--interactive.sh:398 +#, sh-format +msgid "Could not pick $sha1" +msgstr "Kunde inte välja $sha1" + +#: git-rebase--interactive.sh:407 +#, sh-format +msgid "This is the commit message #${n}:" +msgstr "Det här är incheckningsmeddelande ${n}:" + +#: git-rebase--interactive.sh:412 +#, sh-format +msgid "The commit message #${n} will be skipped:" +msgstr "Incheckningsmeddelande ${n} kommer hoppas över:" + +#: git-rebase--interactive.sh:423 +#, sh-format +msgid "This is a combination of $count commit." +msgid_plural "This is a combination of $count commits." +msgstr[0] "Det här är en kombination av $count incheckning." +msgstr[1] "Det här är en kombination av $count incheckningar." + +#: git-rebase--interactive.sh:431 +#, sh-format +msgid "Cannot write $fixup_msg" +msgstr "Kan inte skriva $fixup_msg" + +#: git-rebase--interactive.sh:434 +msgid "This is a combination of 2 commits." +msgstr "Det här är en kombination av 2 incheckningar." + +#: git-rebase--interactive.sh:435 +msgid "This is the 1st commit message:" +msgstr "Det här är 1:a incheckningsmeddelandet:" + +#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518 +#: git-rebase--interactive.sh:521 +#, sh-format +msgid "Could not apply $sha1... $rest" +msgstr "kunde inte tillämpa $sha1... $rest" + +#: git-rebase--interactive.sh:549 +#, sh-format +msgid "" +"Could not amend commit after successfully picking $sha1... $rest\n" +"This is most likely due to an empty commit message, or the pre-commit hook\n" +"failed. If the pre-commit hook failed, you may need to resolve the issue " +"before\n" +"you are able to reword the commit." +msgstr "" +"Kunde inte utöka incheckning efter att ha lyckats välja $sha1... $rest\n" +"Det är antagligen på grund av ett tomt incheckningsmeddelande, eller att\n" +"pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n" +"du måste lösa problemet innan du kan skriva om incheckningsmeddelandet." + +#: git-rebase--interactive.sh:564 +#, sh-format +msgid "Stopped at $sha1_abbrev... $rest" +msgstr "Stoppade på $sha1_abbrev... $rest" + +#: git-rebase--interactive.sh:579 +#, sh-format +msgid "Cannot '$squash_style' without a previous commit" +msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning" + +#: git-rebase--interactive.sh:621 +#, sh-format +msgid "Executing: $rest" +msgstr "Kör: $rest" + +#: git-rebase--interactive.sh:629 +#, sh-format +msgid "Execution failed: $rest" +msgstr "Körning misslyckades: $rest" + +#: git-rebase--interactive.sh:631 +msgid "and made changes to the index and/or the working tree" +msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen" + +#: git-rebase--interactive.sh:633 +msgid "" +"You can fix the problem, and then run\n" +"\n" +"\tgit rebase --continue" +msgstr "" +"Du kan rätta problemet och sedan köra\n" +"\n" +"\tgit rebase --continue\"" + +#. TRANSLATORS: after these lines is a command to be issued by the user +#: git-rebase--interactive.sh:646 +#, sh-format +msgid "" +"Execution succeeded: $rest\n" +"but left changes to the index and/or the working tree\n" +"Commit or stash your changes, and then run\n" +"\n" +"\tgit rebase --continue" +msgstr "" +"Körningen lyckades: $rest\n" +"men lämnade kvar ändringar i indexet och/eller arbetskatalogen\n" +"Checka in eller utför \"stash\" på ändringarna och kör sedan\n" +"\n" +"\tgit rebase --continue" + +#: git-rebase--interactive.sh:657 +#, sh-format +msgid "Unknown command: $command $sha1 $rest" +msgstr "Okänt kommando: $command $sha1 $rest" + +#: git-rebase--interactive.sh:658 +msgid "Please fix this using 'git rebase --edit-todo'." +msgstr "Rätta det med \"git rebase --edit-todo\"." + +#: git-rebase--interactive.sh:693 +#, sh-format +msgid "Successfully rebased and updated $head_name." +msgstr "Lyckades ombasera och uppdatera $head_name." + +#: git-rebase--interactive.sh:740 +msgid "Could not skip unnecessary pick commands" +msgstr "Kunde inte hoppa över onödiga \"pick\"-kommandon" + +#: git-rebase--interactive.sh:898 +#, sh-format +msgid "" +"Warning: the SHA-1 is missing or isn't a commit in the following line:\n" +" - $line" +msgstr "" +"Varning: SHA-1 saknas eller inte en incheckning på följande rad:\n" +" - $line" + +#: git-rebase--interactive.sh:931 +#, sh-format +msgid "" +"Warning: the command isn't recognized in the following line:\n" +" - $line" +msgstr "" +"Varning: kommandot kändes inte igen på följande rad:\n" +" - $line" + +#: git-rebase--interactive.sh:970 +msgid "could not detach HEAD" +msgstr "kunde inte koppla från HEAD" + +#: git-rebase--interactive.sh:1008 +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):" +msgstr "" +"Varning: vissa incheckningar kan av misstag ha tappats.\n" +"Tappade incheckningar (nyaste först):" + +#: git-rebase--interactive.sh:1016 +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error." +msgstr "" +"För att undvika det här meddelandet kan du använda \"drop\" för att " +"explicit\n" +"kasta en incheckning.\n" +"\n" +"Använd \"git config rebase.missingCommitsCheck\" för att ändra " +"varningsnivån.\n" +"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error" +"\" (fel)." + +#: git-rebase--interactive.sh:1027 +#, sh-format +msgid "" +"Unrecognized setting $check_level for option rebase.missingCommitsCheck. " +"Ignoring." +msgstr "" +"Okänt val $check_level för flaggan rebase.missingCommitsCheck. Ignorerar." + +#: git-rebase--interactive.sh:1044 +msgid "You can fix this with 'git rebase --edit-todo'." +msgstr "Du kan rätta detta med \"git rebase --edit-todo\"." + +#: git-rebase--interactive.sh:1045 +msgid "Or you can abort the rebase with 'git rebase --abort'." +msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"." + +#: git-rebase--interactive.sh:1069 +msgid "Could not remove CHERRY_PICK_HEAD" +msgstr "Kunde inte ta bort CHERRY_PICK_HEAD" + +#: git-rebase--interactive.sh:1074 +#, sh-format +msgid "" +"You have staged changes in your working tree.\n" +"If these changes are meant to be\n" +"squashed into the previous commit, run:\n" +"\n" +" git commit --amend $gpg_sign_opt_quoted\n" +"\n" +"If they are meant to go into a new commit, run:\n" +"\n" +" git commit $gpg_sign_opt_quoted\n" +"\n" +"In both case, once you're done, continue with:\n" +"\n" +" git rebase --continue\n" +msgstr "" +"Du har köade ändringar i din arbetskatalog.\n" +"Om det är meningen att ändringarna\n" +"skall läggas in i föregående incheckning, kör:\n" +"\n" +" git commit --amend $gpg_sign_opt_quoted\n" +"\n" +"Om de skall checkas in i en egen incheckning, kör:\n" +"\n" +" git commit $gpg_sign_opt_quoted\n" +"\n" +"Oavsett vilket, när du är färdig fortsätter du med:\n" +"\n" +" git rebase --continue\n" + +#: git-rebase--interactive.sh:1091 +msgid "Error trying to find the author identity to amend commit" +msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning" + +#: git-rebase--interactive.sh:1096 +msgid "" +"You have uncommitted changes in your working tree. Please commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "" +"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" +"först och kör sedan \"git rebase --continute\" igen." + +#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105 +msgid "Could not commit staged changes." +msgstr "Kunde inte checka in köade ändringar." + +#: git-rebase--interactive.sh:1129 +msgid "" +"\n" +"You are editing the todo file of an ongoing interactive rebase.\n" +"To continue rebase after editing, run:\n" +" git rebase --continue\n" +"\n" +msgstr "" +"\n" +"Du redigerar \"todo\"-filen för en pågående interaktiv ombasering.\n" +"För att forsätta ombasera efter redigeringen, kör:\n" +" git rebase --continue\n" +"\n" + +#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1298 +msgid "Could not execute editor" +msgstr "Kunde inte starta textredigerare" + +#: git-rebase--interactive.sh:1145 +msgid "You need to set your committer info first" +msgstr "Du måste ställa in din incheckarinformation först" + +#: git-rebase--interactive.sh:1153 +#, sh-format +msgid "Could not checkout $switch_to" +msgstr "Kunde inte checka ut $switch_to" + +#: git-rebase--interactive.sh:1158 +msgid "No HEAD?" +msgstr "Inget HEAD?" + +#: git-rebase--interactive.sh:1159 +#, sh-format +msgid "Could not create temporary $state_dir" +msgstr "Kunde inte skapa temporär $state_dir" + +#: git-rebase--interactive.sh:1161 +msgid "Could not mark as interactive" +msgstr "Kunde inte markera som interaktiv" + +#: git-rebase--interactive.sh:1171 git-rebase--interactive.sh:1176 +msgid "Could not init rewritten commits" +msgstr "Kunde inte initiera omskrivna incheckningar" + +#: git-rebase--interactive.sh:1276 +#, sh-format +msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" +msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" +msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)" +msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)" + +#: git-rebase--interactive.sh:1281 +msgid "" +"\n" +"However, if you remove everything, the rebase will be aborted.\n" +"\n" +msgstr "" +"\n" +"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" +"\n" + +#: git-rebase--interactive.sh:1288 +msgid "Note that empty commits are commented out" +msgstr "Observera att tomma incheckningar är utkommenterade" + +#: git-sh-setup.sh:89 git-sh-setup.sh:94 +#, sh-format +msgid "usage: $dashless $USAGE" +msgstr "använd: $dashless $USAGE" + +#: git-sh-setup.sh:190 +#, sh-format +msgid "Cannot chdir to $cdup, the toplevel of the working tree" +msgstr "Kunde inte byta katalog till $cdup, toppnivån på arbetskatalogen" + +#: git-sh-setup.sh:199 git-sh-setup.sh:206 +#, sh-format +msgid "fatal: $program_name cannot be used without a working tree." +msgstr "ödesdigetrt: $program_name kan inte användas utan arbetskatalog." + +#: git-sh-setup.sh:220 +msgid "Cannot rebase: You have unstaged changes." +msgstr "Kan inte ombasera: Du har oköade ändringar." + +#: git-sh-setup.sh:223 +msgid "Cannot rewrite branches: You have unstaged changes." +msgstr "Kan inte skriva om grenar: Du har oköade ändringar." + +#: git-sh-setup.sh:229 +#, sh-format +msgid "Cannot $action: You have unstaged changes." +msgstr "Kan inte $action: Du har oköade ändringar." + +#: git-sh-setup.sh:242 +msgid "Cannot rebase: Your index contains uncommitted changes." +msgstr "" +"Kan inte ombasera: Ditt index innehåller ändringar som inte checkats in." + +#: git-sh-setup.sh:248 +#, sh-format +msgid "Cannot $action: Your index contains uncommitted changes." +msgstr "" +"Kan inte $action: Ditt index innehåller ändringar som inte checkats in." + +#: git-sh-setup.sh:372 +msgid "You need to run this command from the toplevel of the working tree." +msgstr "Du måste köra kommandot från arbetskatalogens toppnivå." + +#: git-sh-setup.sh:377 +msgid "Unable to determine absolute path of git directory" +msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" + +#~ msgid "bad numeric config value '%s' for '%s': invalid unit" +#~ msgstr "" +#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": ogiltig enhet" + +#~ msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit" +#~ msgstr "" +#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: " +#~ "ogiltig enhet" + +#~ msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit" +#~ msgstr "" +#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: " +#~ "ogiltig enhet" + +#~ msgid "" +#~ "bad numeric config value '%s' for '%s' in standard input: invalid unit" +#~ msgstr "" +#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: " +#~ "ogiltig enhet" + +#~ msgid "" +#~ "bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit" +#~ msgstr "" +#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-" +#~ "blob:en %s: ogiltig enhet" + +#~ msgid "" +#~ "bad numeric config value '%s' for '%s' in command line %s: invalid unit" +#~ msgstr "" +#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden " +#~ "%s: ogiltig enhet" + +#~ msgid "bad numeric config value '%s' for '%s' in %s: invalid unit" +#~ msgstr "" +#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: ogiltig " +#~ "enhet" + +#~ msgid "This is the 2nd commit message:" +#~ msgstr "Det här är 2:a incheckningsmeddelandet:" + +#~ msgid "This is the 3rd commit message:" +#~ msgstr "Det här är 3:e incheckningsmeddelandet:" + +#~ msgid "This is the 4th commit message:" +#~ msgstr "Det här är 4:e incheckningsmeddelandet:" + +#~ msgid "This is the 5th commit message:" +#~ msgstr "Det här är 5:e incheckningsmeddelandet:" + +#~ msgid "This is the 6th commit message:" +#~ msgstr "Det här är 6:e incheckningsmeddelandet:" + +#~ msgid "This is the 7th commit message:" +#~ msgstr "Det här är 7:e incheckningsmeddelandet:" + +#~ msgid "This is the 8th commit message:" +#~ msgstr "Det här är 8:e incheckningsmeddelandet:" + +#~ msgid "This is the 9th commit message:" +#~ msgstr "Det här är 9:e incheckningsmeddelandet:" + +#~ msgid "This is the 10th commit message:" +#~ msgstr "Det här är 10:e incheckningsmeddelandet:" + +#~ msgid "This is the ${n}th commit message:" +#~ msgstr "Det här är ${n}:e incheckningsmeddelandet:" + +#~ msgid "This is the ${n}st commit message:" +#~ msgstr "Det här är ${n}:a incheckningsmeddelandet:" + +#~ msgid "This is the ${n}nd commit message:" +#~ msgstr "Det här är ${n}:a incheckningsmeddelandet:" + +#~ msgid "This is the ${n}rd commit message:" +#~ msgstr "Det här är ${n}:e incheckningsmeddelandet:" + +#~ msgid "The 1st commit message will be skipped:" +#~ msgstr "1:a incheckningsmeddelandet kommer hoppas över:" + +#~ msgid "The 2nd commit message will be skipped:" +#~ msgstr "2:a incheckningsmeddelandet kommer hoppas över:" + +#~ msgid "The 3rd commit message will be skipped:" +#~ msgstr "3:e incheckningsmeddelandet kommer hoppas över:" + +#~ msgid "The 4th commit message will be skipped:" +#~ msgstr "4:e incheckningsmeddelandet kommer hoppas över:" + +#~ msgid "The 5th commit message will be skipped:" +#~ msgstr "5:e incheckningsmeddelandet kommer hoppas över:" + +#~ msgid "The 6th commit message will be skipped:" +#~ msgstr "6:e incheckningsmeddelandet kommer hoppas över:" + +#~ msgid "The 7th commit message will be skipped:" +#~ msgstr "7:e incheckningsmeddelandet kommer hoppas över:" + +#~ msgid "The 8th commit message will be skipped:" +#~ msgstr "8:e incheckningsmeddelandet kommer hoppas över:" + +#~ msgid "The 9th commit message will be skipped:" +#~ msgstr "9:e incheckningsmeddelandet kommer hoppas över:" + +#~ msgid "The 10th commit message will be skipped:" +#~ msgstr "10:e incheckningsmeddelandet kommer hoppas över:" + +#~ msgid "The ${n}th commit message will be skipped:" +#~ msgstr "${n}:e incheckningsmeddelandet kommer hoppas över:" + +#~ msgid "The ${n}st commit message will be skipped:" +#~ msgstr "${n}:a incheckningsmeddelandet kommer hoppas över:" + +#~ msgid "The ${n}nd commit message will be skipped:" +#~ msgstr "${n}:a incheckningsmeddelandet kommer hoppas över:" + +#~ msgid "The ${n}rd commit message will be skipped:" +#~ msgstr "${n}:e incheckningsmeddelandet kommer hoppas över:" + +#~ msgid "could not run gpg." +#~ msgstr "kunde inte köra gpg." + +#~ msgid "gpg did not accept the data" +#~ msgstr "gpg godtog inte data" + +#~ msgid "unsupported object type in the tree" +#~ msgstr "objekttyp som ej stöds upptäcktes i trädet" + +#~ msgid "Fatal merge failure, shouldn't happen." +#~ msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa." + +#~ msgid "Unprocessed path??? %s" +#~ msgstr "Obehandlad sökväg??? %s" + +#~ msgid "Error wrapping up %s" +#~ msgstr "Fel vid ombrytning av %s" + +#~ msgid "Cannot %s during a %s" +#~ msgstr "kan inte %s under en %s" + +#~ msgid "Can't cherry-pick into empty head" +#~ msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" + +#~ msgid "could not open %s for writing" +#~ msgstr "kunde inte öppna %s för skrivning" + +#~ msgid "bug: unhandled unmerged status %x" +#~ msgstr "programfel: ej hanterad \"unmerged\"-status %x" + +#~ msgid "bug: unhandled diff status %c" +#~ msgstr "programfel: diff-status %c ej hanterad" + +#~ msgid "read of %s failed" +#~ msgstr "misslyckades läsa %s" + +#~ msgid "could not write branch description template" +#~ msgstr "kunde inte skriva grenbeskrivningsmall" + +#~ msgid "corrupt index file" +#~ msgstr "indexfilen är trasig" + +#~ msgid "detach the HEAD at named commit" +#~ msgstr "koppla från HEAD vid namngiven incheckning" + +# Vague original, not networking-related, but rather related to the actual +# objects downloaded. +#~ msgid "Checking connectivity... " +#~ msgstr "Kontrollerar om vi fick alla objekt..." + +#~ msgid " (unable to update local ref)" +#~ msgstr " (kunde inte uppdatera lokal ref)" + +#~ msgid "Reinitialized existing" +#~ msgstr "Ominitierade befintligt" + +#~ msgid "Initialized empty" +#~ msgstr "Initierade tomt" + +#~ msgid " shared" +#~ msgstr " delat" + +#~ msgid "Verify that the named commit has a valid GPG signature" +#~ msgstr "Bekräfta att den namngivna incheckningen har en giltig GPG-signatur" + +#~ msgid "Could not write to '%s'" +#~ msgstr "Kunde inte skriva till \"%s\"" + +#~ msgid "Writing SQUASH_MSG" +#~ msgstr "Skriver SQUASH_MSG" + +#~ msgid "Finishing SQUASH_MSG" +#~ msgstr "Avslutar SQUASH_MSG" + +#~ msgid " and with remote" +#~ msgstr " och med fjärren" + +#~ msgid "removing '%s' failed" +#~ msgstr "misslyckades ta bort \"%s\"" + +#~ msgid "program error" +#~ msgstr "programfel" + +#~ msgid "Please call 'bisect_state' with at least one argument." +#~ msgstr "Anropa \"bisect_state\" med minst ett argument." + +#~ msgid "" +#~ "If you want to reuse this local git directory instead of cloning again " +#~ "from" +#~ msgstr "" +#~ "För att återanvända den lokala git-katalogen istället för att på nytt " +#~ "klona från" + +#~ 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" + +#~ msgid "" +#~ "or you are unsure what this means choose another name with the '--name' " +#~ "option." +#~ msgstr "" +#~ "eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--" +#~ "name\"." + +#~ msgid "Submodule work tree '$displaypath' contains a .git directory" +#~ msgstr "" +#~ "Undermodulens arbetskatalog \"$displaypath\" innehåller katalogen \".git\"" + +#~ 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)" + #~ msgid "'%s': %s" #~ msgstr "\"%s\": %s" @@ -12793,9 +14070,6 @@ msgstr "Se git-${cmd}(1) för detaljer." #~ msgid "-b and -B are mutually exclusive" #~ msgstr "-b och -B kan inte användas samtidigt" -#~ msgid "You need to set your committer info first" -#~ msgstr "Du måste ställa in din incheckarinformation först" - #~ msgid "" #~ "When you have resolved this problem, run \"$cmdline --continue\".\n" #~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" @@ -12839,10 +14113,6 @@ msgstr "Se git-${cmd}(1) för detaljer." #~ "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n" #~ "där det är lämpligt för att ange lösning och checka in." -#~ msgid "Pull is not possible because you have unmerged files." -#~ msgstr "" -#~ "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in." - #~ msgid "no branch specified" #~ msgstr "inget grennamn angavs" @@ -12894,9 +14164,6 @@ msgstr "Se git-${cmd}(1) för detaljer." #~ msgid "Failed to lock HEAD during fast_forward_to" #~ msgstr "Misslyckades låsa HEAD under \"fast_forward_to\"" -#~ msgid "invalid commit: %s" -#~ msgstr "felaktig incheckning: %s" - #~ msgid "cannot lock HEAD ref" #~ msgstr "kunde inte låsa HEAD-referens" @@ -13063,15 +14330,6 @@ msgstr "Se git-${cmd}(1) för detaljer." #~ msgstr "Du kan inte kombinera --no-ff med --ff-only." #~ msgid "" -#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n" -#~ "(use 'rm -rf' if you really want to remove it including all of its " -#~ "history)" -#~ msgstr "" -#~ "undermodulen \"%s\" (eller en av dess undermoduler) använder en .git-" -#~ "katalog\n" -#~ "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" - -#~ msgid "" #~ "'%s' has changes staged in the index\n" #~ "(use --cached to keep the file, or -f to force removal)" #~ msgstr "" @@ -13138,9 +14396,6 @@ msgstr "Se git-${cmd}(1) för detaljer." #~ msgid "Not removing %s\n" #~ msgstr "Tar inte bort %s\n" -#~ msgid "Could not read index" -#~ msgstr "Kunde inte läsa indexet" - #~ msgid "git remote set-head <name> (-a | -d | <branch>])" #~ msgstr "git remote set-head <namn> (-a | -d | <gren>])" @@ -13232,6 +14487,3 @@ msgstr "Se git-${cmd}(1) för detaljer." #~ msgid "%s; will overwrite!" #~ msgstr "%s; kommer skriva över!" - -#~ msgid "Failed to write current notes tree to database" -#~ msgstr "Kunde inte skriva aktuellt anteckningsträd till databasen" |