diff options
| -rw-r--r-- | po/sv.po | 873 |
1 files changed, 439 insertions, 434 deletions
@@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.12.0\n" +"Project-Id-Version: git 2.13.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-04-23 09:54+0800\n" -"PO-Revision-Date: 2017-04-23 19:46+0100\n" +"POT-Creation-Date: 2017-05-05 09:35+0800\n" +"PO-Revision-Date: 2017-05-09 08:02+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -601,7 +601,7 @@ msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg." msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280 +#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279 #: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 @@ -618,7 +618,7 @@ msgstr "tillämpa inte ändringar som motsvarar given sökväg" msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4917 builtin/am.c:2286 +#: apply.c:4917 builtin/am.c:2285 msgid "num" msgstr "antal" @@ -670,7 +670,7 @@ msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508 +#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" @@ -678,7 +678,7 @@ msgstr "sökvägar avdelas med NUL-tecken" msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:4949 builtin/am.c:2265 +#: apply.c:4949 builtin/am.c:2264 msgid "action" msgstr "åtgärd" @@ -720,7 +720,7 @@ msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:4973 builtin/am.c:2274 +#: apply.c:4973 builtin/am.c:2273 msgid "root" msgstr "rot" @@ -768,9 +768,9 @@ 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:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59 +#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60 #: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061 -#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545 +#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552 #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129 #: parse-options.h:153 msgid "file" @@ -856,27 +856,27 @@ msgstr "" "Negativa mönster ignoreras i git-attribut\n" "Använd '\\!' för att inleda med ett utropstecken." -#: bisect.c:443 +#: bisect.c:444 #, c-format msgid "Could not open file '%s'" msgstr "Kunde inte öppna filen \"%s\"" -#: bisect.c:448 +#: bisect.c:449 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Felaktigt citerat innehåll i filen \"%s\": %s" -#: bisect.c:656 +#: bisect.c:657 #, c-format msgid "We cannot bisect more!\n" msgstr "Det finns inte mer att göra \"bisect\" på!\n" -#: bisect.c:709 +#: bisect.c:710 #, c-format msgid "Not a valid commit name %s" msgstr "Namnet på incheckningen är inte giltigt: %s" -#: bisect.c:733 +#: bisect.c:734 #, c-format msgid "" "The merge base %s is bad.\n" @@ -885,7 +885,7 @@ msgstr "" "Sammanslagningsbasen %s är trasig.\n" "Det betyder att felet har rättats mellan %s och [%s].\n" -#: bisect.c:738 +#: bisect.c:739 #, c-format msgid "" "The merge base %s is new.\n" @@ -894,7 +894,7 @@ msgstr "" "Sammanslagningsbasen %s är ny.\n" "Egenskapen har ändrats mellan %s och [%s].\n" -#: bisect.c:743 +#: bisect.c:744 #, c-format msgid "" "The merge base %s is %s.\n" @@ -903,7 +903,7 @@ msgstr "" "Sammanslagningsbasen %s är %s.\n" "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n" -#: bisect.c:751 +#: bisect.c:752 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -914,7 +914,7 @@ msgstr "" "git bisect kan inte fungera korrekt i detta fall.\n" "Kanske du skrev fel %s- och %s-revisioner?\n" -#: bisect.c:764 +#: bisect.c:765 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -926,36 +926,36 @@ msgstr "" "%s.\n" "Vi fortsätter ändå." -#: bisect.c:799 +#: bisect.c:800 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisect: en sammanslagningsbas måste testas\n" -#: bisect.c:850 +#: bisect.c:851 #, c-format msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255 +#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:918 +#: bisect.c:919 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" -#: bisect.c:948 +#: bisect.c:949 msgid "reading bisect refs failed" msgstr "misslyckades läsa bisect-referenser" -#: bisect.c:968 +#: bisect.c:969 #, c-format msgid "%s was both %s and %s\n" msgstr "%s var både %s och %s\n" -#: bisect.c:976 +#: bisect.c:977 #, c-format msgid "" "No testable commit found.\n" @@ -964,7 +964,7 @@ msgstr "" "Ingen testbar incheckning hittades.\n" "Kanske du startade med felaktiga sökvägsparametrar?\n" -#: bisect.c:995 +#: bisect.c:996 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -973,7 +973,7 @@ msgstr[1] "(ungefär %d steg)" #. TRANSLATORS: the last %s will be replaced with #. "(roughly %d steps)" translation -#: bisect.c:999 +#: bisect.c:1000 #, 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" @@ -1128,7 +1128,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 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -1137,7 +1137,7 @@ 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:1852 sequencer.c:1162 sequencer.c:2299 +#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321 #: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353 #: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916 #: builtin/merge.c:359 builtin/shortlog.c:176 @@ -1202,8 +1202,8 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457 -#: builtin/am.c:1493 builtin/am.c:2127 +#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455 +#: builtin/am.c:1489 builtin/am.c:2126 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -1231,156 +1231,156 @@ msgstr "minnet slut" msgid "relative config include conditionals must come from files" msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer" -#: config.c:701 +#: config.c:711 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:705 +#: config.c:715 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:709 +#: config.c:719 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:713 +#: config.c:723 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:717 +#: config.c:727 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:721 +#: config.c:731 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:840 +#: config.c:859 msgid "out of range" msgstr "utanför intervallet" -#: config.c:840 +#: config.c:859 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:846 +#: config.c:865 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:851 +#: config.c:870 #, 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:854 +#: config.c:873 #, 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:857 +#: config.c:876 #, 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:860 +#: config.c:879 #, 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:863 +#: config.c:882 #, 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:866 +#: config.c:885 #, 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:953 +#: config.c:980 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:1048 config.c:1059 +#: config.c:1075 config.c:1086 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1176 +#: config.c:1203 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1332 +#: config.c:1359 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1522 +#: config.c:1557 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:1572 +#: config.c:1611 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:1931 +#: config.c:1970 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:1952 +#: config.c:1991 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\"" -#: config.c:1978 +#: config.c:2017 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100" -#: config.c:1989 +#: config.c:2028 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:1991 +#: config.c:2030 #, 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:2050 +#: config.c:2089 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2384 config.c:2609 +#: config.c:2423 config.c:2648 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2502 +#: config.c:2541 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2504 builtin/remote.c:774 +#: config.c:2543 builtin/remote.c:774 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" @@ -1627,171 +1627,176 @@ msgstr "git fetch-pack: förväntade grund lista" msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF" -#: fetch-pack.c:279 +#: fetch-pack.c:280 builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "fjärrfel: %s" + +#: fetch-pack.c:281 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\"" -#: fetch-pack.c:331 +#: fetch-pack.c:333 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc kräver \"multi ack detailed\"" -#: fetch-pack.c:417 +#: fetch-pack.c:419 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:423 +#: fetch-pack.c:425 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:425 +#: fetch-pack.c:427 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:428 +#: fetch-pack.c:430 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:430 +#: fetch-pack.c:432 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:433 +#: fetch-pack.c:435 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" -#: fetch-pack.c:472 +#: fetch-pack.c:474 #, c-format msgid "got %s %d %s" msgstr "fick %s %d %s" -#: fetch-pack.c:486 +#: fetch-pack.c:488 #, c-format msgid "invalid commit %s" msgstr "ogiltig incheckning %s" -#: fetch-pack.c:519 +#: fetch-pack.c:521 msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:529 progress.c:235 +#: fetch-pack.c:531 progress.c:235 msgid "done" msgstr "klart" -#: fetch-pack.c:541 +#: fetch-pack.c:543 #, c-format msgid "got %s (%d) %s" msgstr "fick %s (%d) %s" -#: fetch-pack.c:587 +#: fetch-pack.c:589 #, c-format msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:735 +#: fetch-pack.c:737 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:773 +#: fetch-pack.c:775 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:781 +#: fetch-pack.c:783 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:837 +#: fetch-pack.c:839 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:853 +#: fetch-pack.c:855 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:855 +#: fetch-pack.c:857 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:882 +#: fetch-pack.c:884 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:886 +#: fetch-pack.c:888 msgid "Server supports multi_ack_detailed" msgstr "Servern stöder \"multi_ack_detailed\"" -#: fetch-pack.c:889 +#: fetch-pack.c:891 msgid "Server supports no-done" msgstr "Servern stöder \"no-done\"" -#: fetch-pack.c:895 +#: fetch-pack.c:897 msgid "Server supports multi_ack" msgstr "Servern stöder \"multi_ack\"" -#: fetch-pack.c:899 +#: fetch-pack.c:901 msgid "Server supports side-band-64k" msgstr "Servern stöder \"side-band-64k\"" -#: fetch-pack.c:903 +#: fetch-pack.c:905 msgid "Server supports side-band" msgstr "Servern stöder \"side-band\"" -#: fetch-pack.c:907 +#: fetch-pack.c:909 msgid "Server supports allow-tip-sha1-in-want" msgstr "Servern stöder \"allow-tip-sha1-in-want\"" -#: fetch-pack.c:911 +#: fetch-pack.c:913 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Servern stöder \"allow-reachable-sha1-in-want\"" -#: fetch-pack.c:921 +#: fetch-pack.c:923 msgid "Server supports ofs-delta" msgstr "Servern stöder \"ofs-delta\"" -#: fetch-pack.c:928 +#: fetch-pack.c:930 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:934 +#: fetch-pack.c:936 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:938 +#: fetch-pack.c:940 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:940 +#: fetch-pack.c:942 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:951 +#: fetch-pack.c:953 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:963 +#: fetch-pack.c:965 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1125 +#: fetch-pack.c:1127 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1147 +#: fetch-pack.c:1149 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:1150 +#: fetch-pack.c:1152 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s" @@ -1981,7 +1986,7 @@ msgstr "kunde inte skapa \"%s.lock\": %s" msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393 +#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393 #: builtin/checkout.c:607 builtin/clone.c:749 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -2315,7 +2320,7 @@ msgstr "-TAL" msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: path.c:805 +#: path.c:810 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" @@ -2411,7 +2416,7 @@ msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: read-cache.c:1307 +#: read-cache.c:1442 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2420,7 +2425,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1317 +#: read-cache.c:1452 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2429,42 +2434,41 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:2232 -#, c-format -msgid "could not stat '%s" -msgstr "kunde inte ta status på \"%s\"" - -#: read-cache.c:2232 +#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:2245 +#: read-cache.c:2388 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:2257 +#: read-cache.c:2400 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: refs.c:619 builtin/merge.c:844 +#: refs.c:620 builtin/merge.c:844 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: refs/files-backend.c:2531 +#: refs.c:1667 +msgid "ref updates forbidden inside quarantine environment" +msgstr "referensuppdateringar förbjudna i karantänmiljö" + +#: refs/files-backend.c:1631 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:2534 +#: refs/files-backend.c:1634 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" -#: refs/files-backend.c:2543 +#: refs/files-backend.c:1643 #, c-format msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" @@ -2906,12 +2910,12 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:294 sequencer.c:1675 +#: sequencer.c:294 sequencer.c:1682 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694 +#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" @@ -2921,12 +2925,12 @@ msgstr "kunde inte skriva till \"%s\"" msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:305 sequencer.c:1558 sequencer.c:1682 +#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689 #, c-format msgid "failed to finalize '%s'." msgstr "misslyckades färdigställa \"%s\"." -#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259 +#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257 #: builtin/commit.c:749 builtin/merge.c:1018 #, c-format msgid "could not read '%s'" @@ -3100,7 +3104,7 @@ msgstr "kan inte hämta incheckningsmeddelande för %s" msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:1071 sequencer.c:1820 +#: sequencer.c:1071 sequencer.c:1827 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" @@ -3129,125 +3133,125 @@ msgstr "git %s: misslyckades läsa indexet" msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:1302 +#: sequencer.c:1303 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:1310 +#: sequencer.c:1311 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:1342 +#: sequencer.c:1344 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: sequencer.c:1349 +#: sequencer.c:1356 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:1351 +#: sequencer.c:1358 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: %s" -#: sequencer.c:1356 +#: sequencer.c:1363 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:1367 +#: sequencer.c:1374 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:1369 +#: sequencer.c:1376 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:1432 +#: sequencer.c:1439 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" -#: sequencer.c:1435 +#: sequencer.c:1442 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:1492 +#: sequencer.c:1499 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: %s" -#: sequencer.c:1530 +#: sequencer.c:1537 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:1531 +#: sequencer.c:1538 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1534 +#: sequencer.c:1541 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:1548 +#: sequencer.c:1555 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:1604 sequencer.c:2159 +#: sequencer.c:1611 sequencer.c:2181 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:1606 +#: sequencer.c:1613 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:1608 sequencer.c:1642 +#: sequencer.c:1615 sequencer.c:1649 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:1628 builtin/grep.c:910 +#: sequencer.c:1635 builtin/grep.c:910 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:1630 +#: sequencer.c:1637 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:1631 +#: sequencer.c:1638 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:1637 +#: sequencer.c:1644 #, 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:1648 +#: sequencer.c:1655 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Du verkar ha flyttat HEAD.\n" "Spolar inte tillbaka, kontrollera HEAD!" -#: sequencer.c:1785 sequencer.c:2058 +#: sequencer.c:1792 sequencer.c:2080 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:1825 builtin/difftool.c:616 +#: sequencer.c:1832 builtin/difftool.c:616 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:1841 +#: sequencer.c:1848 msgid "could not read index" msgstr "Kunde inte läsa indexet" -#: sequencer.c:1846 +#: sequencer.c:1853 #, c-format msgid "" "execution failed: %s\n" @@ -3262,11 +3266,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:1852 +#: sequencer.c:1859 msgid "and made changes to the index and/or the working tree\n" msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n" -#: sequencer.c:1858 +#: sequencer.c:1865 #, c-format msgid "" "execution succeeded: %s\n" @@ -3283,17 +3287,17 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:1913 git-rebase.sh:168 +#: sequencer.c:1920 git-rebase.sh:169 #, c-format msgid "Applied autostash." msgstr "Tillämpade autostash." -#: sequencer.c:1925 +#: sequencer.c:1932 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:1927 git-rebase.sh:172 +#: sequencer.c:1934 git-rebase.sh:173 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3304,57 +3308,57 @@ 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" -#: sequencer.c:2009 +#: sequencer.c:2016 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:2036 +#: sequencer.c:2058 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:2066 +#: sequencer.c:2088 msgid "could not read orig-head" msgstr "Kunde inte läsa orig-head" -#: sequencer.c:2070 +#: sequencer.c:2092 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:2077 +#: sequencer.c:2099 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:2084 +#: sequencer.c:2106 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:2168 +#: sequencer.c:2190 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:2173 +#: sequencer.c:2195 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:2182 +#: sequencer.c:2204 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:2184 +#: sequencer.c:2206 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:2186 +#: sequencer.c:2208 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:2189 +#: sequencer.c:2211 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3364,21 +3368,21 @@ msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" "först och kör sedan \"git rebase --continute\" igen." -#: sequencer.c:2199 +#: sequencer.c:2221 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:2279 +#: sequencer.c:2301 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:2283 +#: sequencer.c:2305 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:2316 +#: sequencer.c:2338 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" @@ -3580,7 +3584,7 @@ msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:1679 +#: submodule.c:1678 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -3588,18 +3592,18 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:1691 submodule.c:1747 +#: submodule.c:1690 submodule.c:1746 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:1695 builtin/submodule--helper.c:678 +#: submodule.c:1694 builtin/submodule--helper.c:678 #: builtin/submodule--helper.c:688 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: submodule.c:1698 +#: submodule.c:1697 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3610,20 +3614,20 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:1782 +#: submodule.c:1781 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule.c:1826 +#: submodule.c:1825 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:1846 +#: submodule.c:1845 msgid "BUG: returned path string doesn't match cwd?" msgstr "BUG: returnerad sökvägssträng matchar inte cwd?" -#: submodule.c:1865 +#: submodule.c:1864 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" @@ -4043,8 +4047,8 @@ msgstr "kunde inte öppna \"%s\" för läsning och skrivning" msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" -#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757 +#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015 #: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" @@ -4702,108 +4706,108 @@ msgstr "Kanske menade du att skriva \"git add .\"?\n" msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/am.c:414 +#: builtin/am.c:412 msgid "could not parse author script" msgstr "kunde inte tolka författarskript" -#: builtin/am.c:491 +#: builtin/am.c:489 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:532 +#: builtin/am.c:530 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:569 +#: builtin/am.c:567 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:595 +#: builtin/am.c:593 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:775 +#: builtin/am.c:777 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:840 +#: builtin/am.c:842 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:887 +#: builtin/am.c:889 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:890 builtin/am.c:898 +#: builtin/am.c:892 builtin/am.c:900 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:895 +#: builtin/am.c:897 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:984 +#: builtin/am.c:986 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:989 builtin/clone.c:397 +#: builtin/am.c:991 builtin/clone.c:397 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:993 +#: builtin/am.c:995 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1125 builtin/commit.c:376 +#: builtin/am.c:1127 builtin/commit.c:376 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1176 +#: builtin/am.c:1178 #, 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:1177 +#: builtin/am.c:1179 #, 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:1178 +#: builtin/am.c:1180 #, 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:1316 +#: builtin/am.c:1315 msgid "Patch is empty. Was it split wrong?" msgstr "Patchen är tom. Delades den upp felaktigt?" -#: builtin/am.c:1390 builtin/log.c:1557 +#: builtin/am.c:1386 builtin/log.c:1557 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/am.c:1417 +#: builtin/am.c:1413 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: builtin/am.c:1610 +#: builtin/am.c:1606 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:1612 +#: builtin/am.c:1608 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1631 +#: builtin/am.c:1627 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -4811,39 +4815,39 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1637 +#: builtin/am.c:1633 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1662 +#: builtin/am.c:1658 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1686 builtin/merge.c:631 +#: builtin/am.c:1682 builtin/merge.c:631 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/am.c:1693 +#: builtin/am.c:1689 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 +#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802 #: builtin/merge.c:827 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/am.c:1739 builtin/am.c:1743 +#: builtin/am.c:1735 builtin/am.c:1739 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1759 +#: builtin/am.c:1755 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:1764 +#: builtin/am.c:1760 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -4851,35 +4855,35 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1774 +#: builtin/am.c:1770 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:1824 +#: builtin/am.c:1820 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1861 builtin/am.c:1933 +#: builtin/am.c:1860 builtin/am.c:1932 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1877 +#: builtin/am.c:1876 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1885 +#: builtin/am.c:1884 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1891 +#: builtin/am.c:1890 #, 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:1936 +#: builtin/am.c:1935 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -4889,7 +4893,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:1943 +#: builtin/am.c:1942 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -4897,17 +4901,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:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 +#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 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:2103 +#: builtin/am.c:2102 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2137 +#: builtin/am.c:2136 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -4915,75 +4919,75 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2200 +#: builtin/am.c:2199 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2233 +#: builtin/am.c:2232 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2234 +#: builtin/am.c:2233 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2242 +#: builtin/am.c:2241 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2244 +#: builtin/am.c:2243 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 +#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57 #: builtin/repack.c:178 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2247 +#: builtin/am.c:2246 msgid "add a Signed-off-by line to the commit message" msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2252 +#: builtin/am.c:2251 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2254 +#: builtin/am.c:2253 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2258 +#: builtin/am.c:2257 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:2261 +#: builtin/am.c:2260 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:2264 +#: builtin/am.c:2263 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 -#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 -#: builtin/am.c:2293 +#: builtin/am.c:2265 builtin/am.c:2268 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:2292 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 +#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 #: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135 #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 #: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398 @@ -4991,57 +4995,57 @@ msgstr "sänd det genom git-apply" msgid "n" msgstr "n" -#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37 -#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38 +#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37 +#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2290 +#: builtin/am.c:2289 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2298 +#: builtin/am.c:2297 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2301 +#: builtin/am.c:2300 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2311 +#: builtin/am.c:2310 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232 +#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232 #: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2316 +#: builtin/am.c:2315 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2334 +#: builtin/am.c:2333 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." @@ -5049,16 +5053,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:2341 +#: builtin/am.c:2340 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2356 +#: builtin/am.c:2355 #, 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:2380 +#: builtin/am.c:2379 #, c-format msgid "" "Stray %s directory found.\n" @@ -5067,7 +5071,7 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2386 +#: builtin/am.c:2385 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." @@ -5097,11 +5101,6 @@ msgstr "git archive: förväntade ACK/NAK, fick EOF" msgid "git archive: NACK %s" msgstr "git archive: NACK %s" -#: builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "fjärrfel: %s" - #: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "git archive: protokollfel" @@ -5782,7 +5781,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:1158 builtin/gc.c:352 +#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -5874,7 +5873,7 @@ msgstr "skriv innehåll till temporära filer" #: builtin/checkout-index.c:174 builtin/column.c:30 #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 -#: builtin/worktree.c:472 +#: builtin/worktree.c:477 msgid "string" msgstr "sträng" @@ -6090,8 +6089,8 @@ msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" #: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325 -#: builtin/worktree.c:327 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329 +#: builtin/worktree.c:331 msgid "branch" msgstr "gren" @@ -6107,7 +6106,7 @@ msgstr "skapa/nollställ och checka ut en gren" msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1164 builtin/worktree.c:329 +#: builtin/checkout.c:1164 builtin/worktree.c:333 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" @@ -6358,7 +6357,7 @@ msgid "remove whole directories" msgstr "ta bort hela kataloger" #: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451 -#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348 +#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348 #: builtin/name-rev.c:350 builtin/show-ref.c:176 msgid "pattern" msgstr "mönster" @@ -6614,7 +6613,7 @@ msgstr "kan inte packa om för att städa upp" msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:884 builtin/receive-pack.c:1901 +#: builtin/clone.c:884 builtin/receive-pack.c:1900 msgid "Too many arguments." msgstr "För många argument." @@ -6652,7 +6651,7 @@ msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." #: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252 -#: builtin/worktree.c:222 builtin/worktree.c:249 +#: builtin/worktree.c:221 builtin/worktree.c:251 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" @@ -7104,7 +7103,7 @@ msgid "version" msgstr "version" #: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 -#: builtin/worktree.c:443 +#: builtin/worktree.c:448 msgid "machine-readable output" msgstr "maskinläsbar utdata" @@ -7185,7 +7184,7 @@ msgstr "författare" msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1588 builtin/gc.c:353 +#: builtin/commit.c:1588 builtin/gc.c:357 msgid "date" msgstr "datum" @@ -7350,139 +7349,139 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<flaggor>]" -#: builtin/config.c:55 +#: builtin/config.c:56 msgid "Config file location" msgstr "Konfigurationsfilens plats" -#: builtin/config.c:56 +#: builtin/config.c:57 msgid "use global config file" msgstr "använd global konfigurationsfil" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "use system config file" msgstr "använd systemets konfigurationsfil" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use repository config file" msgstr "använd arkivets konfigurationsfil" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use given config file" msgstr "använd angiven konfigurationsfil" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "read config from given blob object" msgstr "läs konfiguration från givet blob-objekt" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "Action" msgstr "Åtgärd" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "get value: name [value-regex]" msgstr "hämta värde: namn [värde-reguttr]" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "get all values: key [value-regex]" msgstr "hämta alla värden: nyckel [värde-reguttr]" -#: builtin/config.c:64 +#: builtin/config.c:65 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:65 +#: builtin/config.c:66 msgid "get value specific for the URL: section[.var] URL" msgstr "hämta värde specifikt URL:en: sektion[.var] URL" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "replace all matching variables: name value [value_regex]" msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "add a new variable: name value" msgstr "lägg till en ny variabel: namn värde" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "remove a variable: name [value-regex]" msgstr "ta bort en variabel: namn [värde-reguttr]" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "remove all matches: name [value-regex]" msgstr "ta bort alla träffar: namn [värde-reguttr]" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "rename section: old-name new-name" msgstr "byt namn på sektion: gammalt-namn nytt-namn" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "remove a section: name" msgstr "ta bort en sektion: namn" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "list all" msgstr "visa alla" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "open an editor" msgstr "öppna textredigeringsprogram" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "find the color configured: slot [default]" msgstr "hitta den inställda färgen: slot [default]" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "find the color setting: slot [stdout-is-tty]" msgstr "hitta färginställningen: slot [stdout-is-tty]" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "Type" msgstr "Typ" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "value is \"true\" or \"false\"" msgstr "värdet är \"true\" eller \"false\"" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "value is decimal number" msgstr "värdet är ett decimalt tal" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is --bool or --int" msgstr "värdet är --bool eller --int" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is a path (file or directory name)" msgstr "värdet är en sökväg (fil- eller katalognamn)" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "Other" msgstr "Andra" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "terminate values with NUL byte" msgstr "terminera värden med NUL-byte" -#: builtin/config.c:83 +#: builtin/config.c:84 msgid "show variable names only" msgstr "visa endast variabelnamn" -#: builtin/config.c:84 +#: builtin/config.c:85 msgid "respect include directives on lookup" msgstr "respektera inkluderingsdirektiv vid uppslag" -#: builtin/config.c:85 +#: builtin/config.c:86 msgid "show origin of config (file, standard input, blob, command line)" msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)" -#: builtin/config.c:327 +#: builtin/config.c:328 msgid "unable to parse default color value" msgstr "kan inte tolka standardfärgvärde" -#: builtin/config.c:471 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7497,12 +7496,12 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:615 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" -#: builtin/config.c:623 +#: builtin/config.c:627 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -8297,12 +8296,12 @@ msgstr "git gc [<flaggor>]" msgid "Failed to fstat %s: %s" msgstr "Misslyckades ta status (fstat) på %s: %s" -#: builtin/gc.c:306 +#: builtin/gc.c:310 #, c-format msgid "Can't stat %s" msgstr "Kan inte ta status på %s" -#: builtin/gc.c:315 +#: builtin/gc.c:319 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8317,43 +8316,43 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:354 +#: builtin/gc.c:358 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:356 +#: builtin/gc.c:360 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:357 +#: builtin/gc.c:361 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:358 +#: builtin/gc.c:362 msgid "force running gc even if there may be another gc running" msgstr "tvinga gc-körning även om en annan gc kanske körs" -#: builtin/gc.c:375 +#: builtin/gc.c:379 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "Kan inte tolka värdet %s för gc.logexpiry" -#: builtin/gc.c:403 +#: builtin/gc.c:407 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n" -#: builtin/gc.c:405 +#: builtin/gc.c:409 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:406 +#: builtin/gc.c:410 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Se \"git help gc\" för manuell hushållning.\n" -#: builtin/gc.c:427 +#: builtin/gc.c:431 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -8361,7 +8360,7 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:471 +#: builtin/gc.c:475 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -9559,103 +9558,103 @@ 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:461 +#: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:510 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:512 +#: builtin/ls-files.c:519 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:514 +#: builtin/ls-files.c:521 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:516 +#: builtin/ls-files.c:523 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:518 +#: builtin/ls-files.c:525 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:520 +#: builtin/ls-files.c:527 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:522 +#: builtin/ls-files.c:529 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:532 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:534 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:529 +#: builtin/ls-files.c:536 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:538 msgid "show line endings of files" msgstr "visa radslut i filer" -#: builtin/ls-files.c:533 +#: builtin/ls-files.c:540 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:543 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:545 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:547 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:550 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:553 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:555 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:558 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:561 msgid "recurse through submodules" msgstr "rekursera ner i undermoduler" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:563 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:557 +#: builtin/ls-files.c:564 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:565 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:560 +#: builtin/ls-files.c:567 msgid "show debugging data" msgstr "visa felsökningsutdata" @@ -11117,7 +11116,7 @@ msgstr "Se git-pull(1) för detaljer." msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" @@ -11583,7 +11582,7 @@ msgstr "avbryt ombasering" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:796 +#: builtin/receive-pack.c:795 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -11613,7 +11612,7 @@ msgstr "" "För att undvika detta meddelande och fortfarande behålla det\n" "normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"." -#: builtin/receive-pack.c:816 +#: builtin/receive-pack.c:815 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -11634,11 +11633,11 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:1889 +#: builtin/receive-pack.c:1888 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:1903 +#: builtin/receive-pack.c:1902 msgid "You must specify a directory." msgstr "Du måste ange en katalog." @@ -12269,22 +12268,22 @@ msgstr "git replace -d <objekt>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<mönster>]]" -#: builtin/replace.c:329 builtin/replace.c:367 builtin/replace.c:395 +#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396 #, c-format msgid "Not a valid object name: '%s'" msgstr "Objektnamnet är inte giltigt: \"%s\"" -#: builtin/replace.c:359 +#: builtin/replace.c:360 #, c-format msgid "bad mergetag in commit '%s'" msgstr "felaktig sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:361 +#: builtin/replace.c:362 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "felformad sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:372 +#: builtin/replace.c:373 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -12293,45 +12292,45 @@ msgstr "" "den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s" "\" som har förkastats; använd --edit istället för --graft" -#: builtin/replace.c:405 +#: builtin/replace.c:406 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur." -#: builtin/replace.c:406 +#: builtin/replace.c:407 msgid "the signature will be removed in the replacement commit!" msgstr "signaturen kommer att tas bort i ersättningsincheckningen!" -#: builtin/replace.c:412 +#: builtin/replace.c:413 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "kunde inte skriva ersättningsincheckning för: \"%s\"" -#: builtin/replace.c:436 +#: builtin/replace.c:437 msgid "list replace refs" msgstr "visa ersättningsreferenser" -#: builtin/replace.c:437 +#: builtin/replace.c:438 msgid "delete replace refs" msgstr "ta bort ersättningsreferenser" -#: builtin/replace.c:438 +#: builtin/replace.c:439 msgid "edit existing object" msgstr "redigera befintligt objekt" -#: builtin/replace.c:439 +#: builtin/replace.c:440 msgid "change a commit's parents" msgstr "ändra en inchecknings föräldrar" -#: builtin/replace.c:440 +#: builtin/replace.c:441 msgid "replace the ref if it exists" msgstr "ersätt referensen om den finns" -#: builtin/replace.c:441 +#: builtin/replace.c:442 msgid "do not pretty-print contents for --edit" msgstr "använd inte snygg visning av innehåll för --edit" -#: builtin/replace.c:442 +#: builtin/replace.c:443 msgid "use this format" msgstr "använd detta format" @@ -12944,7 +12943,7 @@ 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:356 builtin/submodule--helper.c:382 +#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules" @@ -13258,30 +13257,6 @@ msgstr "inget taggmeddelande?" msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:312 -msgid "tag: tagging " -msgstr "tag: taggar" - -#: builtin/tag.c:320 -msgid "object of unknown type" -msgstr "objekt av okänd typ" - -#: builtin/tag.c:327 -msgid "commit object" -msgstr "incheckningsobjekt" - -#: builtin/tag.c:335 -msgid "tree object" -msgstr "trädobjekt" - -#: builtin/tag.c:338 -msgid "blob object" -msgstr "blob-objekt" - -#: builtin/tag.c:341 -msgid "other tag object" -msgstr "annat taggobjekt" - #: builtin/tag.c:397 msgid "list tag names" msgstr "lista taggnamn" @@ -13715,27 +13690,27 @@ msgstr "git worktree prune [<flaggor>]" msgid "git worktree unlock <path>" msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:42 +#: builtin/worktree.c:43 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Tar bort worktrees/%s: inte en giltig katalog" -#: builtin/worktree.c:48 +#: builtin/worktree.c:49 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" -#: builtin/worktree.c:53 +#: builtin/worktree.c:54 #, 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:64 +#: builtin/worktree.c:65 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" -#: builtin/worktree.c:80 +#: builtin/worktree.c:81 #, 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" @@ -13753,61 +13728,65 @@ msgstr "låt tid gå ut för arbetskataloger äldre än <tid>" msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:236 +#: builtin/worktree.c:235 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:272 +#: builtin/worktree.c:274 #, c-format msgid "Preparing %s (identifier %s)" msgstr "Förbereder %s (identifieraren %s)" -#: builtin/worktree.c:324 +#: builtin/worktree.c:328 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:326 +#: builtin/worktree.c:330 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:328 +#: builtin/worktree.c:332 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:330 +#: builtin/worktree.c:334 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:338 +#: builtin/worktree.c:335 +msgid "keep the new working tree locked" +msgstr "låt arbetskatalogen förbli låst" + +#: builtin/worktree.c:343 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:473 +#: builtin/worktree.c:478 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:485 builtin/worktree.c:518 +#: builtin/worktree.c:490 builtin/worktree.c:523 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:487 builtin/worktree.c:520 +#: builtin/worktree.c:492 builtin/worktree.c:525 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:492 +#: builtin/worktree.c:497 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:494 +#: builtin/worktree.c:499 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:522 +#: builtin/worktree.c:527 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" @@ -13875,15 +13854,20 @@ 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:355 +#: http.c:336 +#, c-format +msgid "negative value for http.postbuffer; defaulting to %d" +msgstr "http.postbuffer har negativt värde; använder förvalet %d" + +#: http.c:357 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegerad styrning stöds inte av cURL < 7.22.0" -#: http.c:364 +#: http.c:366 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" -#: http.c:1755 +#: http.c:1766 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14271,7 +14255,7 @@ msgstr "Försök enkel sammanslagning med $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning." -#: git-rebase.sh:57 +#: git-rebase.sh:58 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" @@ -14282,37 +14266,37 @@ 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:157 git-rebase.sh:396 +#: git-rebase.sh:158 git-rebase.sh:397 #, sh-format msgid "Could not move back to $head_name" msgstr "Kunde inte flytta tillbaka till $head_name" -#: git-rebase.sh:171 +#: git-rebase.sh:172 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kan inte spara $stash_sha1" -#: git-rebase.sh:211 +#: git-rebase.sh:212 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: git-rebase.sh:216 +#: git-rebase.sh:217 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:358 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: git-rebase.sh:368 +#: git-rebase.sh:369 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:376 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: git-rebase.sh:378 +#: git-rebase.sh:379 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -14320,7 +14304,7 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: git-rebase.sh:418 +#: git-rebase.sh:419 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -14341,65 +14325,65 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där." -#: git-rebase.sh:469 +#: git-rebase.sh:470 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ogiltig uppström $upstream_name" -#: git-rebase.sh:493 +#: git-rebase.sh:494 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: mer än en sammanslagningsbas finns" -#: git-rebase.sh:496 git-rebase.sh:500 +#: git-rebase.sh:497 git-rebase.sh:501 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ingen sammanslagningsbas finns" -#: git-rebase.sh:505 +#: git-rebase.sh:506 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Peka på en giltig incheckning: $onto_name" -#: git-rebase.sh:528 +#: git-rebase.sh:529 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ödesdigert: ingen sådan gren: $branch_name" -#: git-rebase.sh:561 +#: git-rebase.sh:562 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: git-rebase.sh:566 +#: git-rebase.sh:567 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Skapade autostash: $stash_abbrev" -#: git-rebase.sh:570 +#: git-rebase.sh:571 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: git-rebase.sh:590 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name är à jour." -#: git-rebase.sh:594 +#: git-rebase.sh:595 #, 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:605 +#: git-rebase.sh:606 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Ändringar från $mb till $onto:" -#: git-rebase.sh:614 +#: git-rebase.sh:615 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:624 +#: git-rebase.sh:625 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." @@ -16157,6 +16141,27 @@ msgstr "" msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "could not stat '%s" +#~ msgstr "kunde inte ta status på \"%s\"" + +#~ msgid "tag: tagging " +#~ msgstr "tag: taggar" + +#~ msgid "object of unknown type" +#~ msgstr "objekt av okänd typ" + +#~ msgid "commit object" +#~ msgstr "incheckningsobjekt" + +#~ msgid "tree object" +#~ msgstr "trädobjekt" + +#~ msgid "blob object" +#~ msgstr "blob-objekt" + +#~ msgid "other tag object" +#~ msgstr "annat taggobjekt" + #~ msgid "" #~ "There is nothing to exclude from by :(exclude) patterns.\n" #~ "Perhaps you forgot to add either ':/' or '.' ?" |