diff options
author | Peter Krefting <peter@softwolves.pp.se> | 2015-09-09 21:46:35 +0100 |
---|---|---|
committer | Peter Krefting <peter@softwolves.pp.se> | 2015-09-09 21:47:09 +0100 |
commit | d8455d17af3dfc934cdebbed4682a206c471cbdc (patch) | |
tree | 141c5257fc894ab2e09d92803e89e7efe5730b93 | |
parent | l10n: Updated Vietnamese translation (2441t) (diff) | |
download | tgif-d8455d17af3dfc934cdebbed4682a206c471cbdc.tar.xz |
l10n: sv.po: Update Swedish translation (2441t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
-rw-r--r-- | po/sv.po | 3723 |
1 files changed, 2102 insertions, 1621 deletions
@@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.5.0\n" +"Project-Id-Version: git 2.6.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-07-14 07:19+0800\n" -"PO-Revision-Date: 2015-07-15 12:51+0100\n" +"POT-Creation-Date: 2015-09-05 09:16+0800\n" +"PO-Revision-Date: 2015-09-09 21:45+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -31,95 +31,107 @@ 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." -#: archive.c:11 +#: advice.c:101 builtin/merge.c:1227 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." + +#: advice.c:103 +msgid "Please, commit your changes before you can merge." +msgstr "Ange ett incheckningsmeddelande för dina ändringar." + +#: advice.c:104 +msgid "Exiting because of unfinished merge." +msgstr "Avslutar på grund av ofullbordad sammanslagning." + +#: archive.c:12 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]" -#: archive.c:12 +#: archive.c:13 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:13 +#: archive.c:14 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <arkiv> [--exec <kmd>] [<flaggor>] <träd-igt> " "[<sökväg>...]" -#: archive.c:14 +#: archive.c:15 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327 +#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: archive.c:427 +#: archive.c:428 msgid "fmt" msgstr "fmt" -#: archive.c:427 +#: archive.c:428 msgid "archive format" msgstr "arkivformat" -#: archive.c:428 builtin/log.c:1204 +#: archive.c:429 builtin/log.c:1229 msgid "prefix" msgstr "prefix" -#: archive.c:429 +#: archive.c:430 msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 -#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99 -#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150 +#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516 +#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987 +#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395 +#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153 msgid "file" msgstr "fil" -#: archive.c:431 builtin/archive.c:89 +#: archive.c:432 builtin/archive.c:89 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:433 +#: archive.c:434 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:434 +#: archive.c:435 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:435 +#: archive.c:436 msgid "store only" msgstr "endast spara" -#: archive.c:436 +#: archive.c:437 msgid "compress faster" msgstr "komprimera snabbare" -#: archive.c:444 +#: archive.c:445 msgid "compress better" msgstr "komprimera bättre" -#: archive.c:447 +#: archive.c:448 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77 +#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77 msgid "repo" msgstr "arkiv" -#: archive.c:450 builtin/archive.c:91 +#: archive.c:451 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478 +#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479 msgid "command" msgstr "kommando" -#: archive.c:452 builtin/archive.c:93 +#: archive.c:453 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "sökväg till kommandot git-upload-archive på fjärren" @@ -242,6 +254,11 @@ msgstr "Objektnamnet är tvetydigt: \"%s\"." msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten är inte giltig: \"%s\"" +#: branch.c:399 +#, c-format +msgid "'%s' is already checked out at '%s'" +msgstr "\"%s\" är redan utcheckad på \"%s\"" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -252,7 +269,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:87 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:765 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -261,9 +278,9 @@ msgstr "kunde inte öppna \"%s\"" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 -#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330 -#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358 +#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708 +#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334 +#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -286,38 +303,38 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "Paketet (bundlen) kräver denna referens:" msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:" -#: bundle.c:251 +#: bundle.c:253 msgid "Could not spawn pack-objects" msgstr "Kunde inte starta pack-objects" -#: bundle.c:269 +#: bundle.c:264 msgid "pack-objects died" msgstr "pack-objects misslyckades" -#: bundle.c:309 +#: bundle.c:304 msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:358 +#: bundle.c:353 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:443 +#: bundle.c:449 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." -#: bundle.c:453 +#: bundle.c:459 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:474 +#: bundle.c:480 msgid "index-pack died" msgstr "index-pack dog" @@ -326,7 +343,8 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:40 +#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1489 +#: builtin/am.c:2101 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -484,22 +502,22 @@ msgstr "kunde inte läsa orderfilen \"%s\"" msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" -#: diff.c:114 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:119 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:214 +#: diff.c:216 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:266 +#: diff.c:268 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -508,16 +526,16 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:2997 +#: diff.c:2998 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:3393 +#: diff.c:3394 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:3556 +#: diff.c:3557 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -526,37 +544,37 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3570 +#: diff.c:3571 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: dir.c:1852 +#: dir.c:1853 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:1945 +#: dir.c:1936 msgid "Untracked cache is disabled on this system." msgstr "Ospårad cache är inaktiverad på detta system." -#: gpg-interface.c:129 gpg-interface.c:200 +#: gpg-interface.c:166 gpg-interface.c:237 msgid "could not run gpg." msgstr "kunde inte köra gpg." -#: gpg-interface.c:141 +#: gpg-interface.c:178 msgid "gpg did not accept the data" msgstr "gpg godtog inte data" -#: gpg-interface.c:152 +#: gpg-interface.c:189 msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" -#: gpg-interface.c:185 +#: gpg-interface.c:222 #, c-format msgid "could not create temporary file '%s': %s" msgstr "kunde inte skapa temporära filen \"%s\": %s" -#: gpg-interface.c:188 +#: gpg-interface.c:225 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "misslyckades skriva fristående signatur till \"%s\": %s" @@ -640,20 +658,12 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: lockfile.c:345 -msgid "BUG: reopen a lockfile that is still open" -msgstr "FEL: återöppna en låsfil som fortfarande är öppen" - -#: lockfile.c:347 -msgid "BUG: reopen a lockfile that has been committed" -msgstr "FEL: återöppna en låsfil som har överlämnats" - #: merge.c:41 msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587 -#: builtin/clone.c:647 +#: merge.c:94 builtin/am.c:1974 builtin/am.c:2009 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:715 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -700,7 +710,7 @@ msgstr "kan inte läsa objektet %s: \"%s\"" msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:788 builtin/clone.c:306 +#: merge-recursive.c:788 builtin/clone.c:364 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" @@ -913,19 +923,19 @@ msgstr "Kunde inte skriva indexet." msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd" -#: notes-utils.c:82 +#: notes-utils.c:100 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Felaktigt värde för notes.rewriteMode: '%s'" -#: notes-utils.c:92 +#: notes-utils.c:110 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: notes-utils.c:119 +#: notes-utils.c:137 #, c-format msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" @@ -935,28 +945,28 @@ msgstr "Felaktigt värde på %s: \"%s\"" msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" -#: parse-options.c:546 +#: parse-options.c:563 msgid "..." msgstr "..." -#: parse-options.c:564 +#: parse-options.c:581 #, c-format msgid "usage: %s" msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:568 +#: parse-options.c:585 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:571 +#: parse-options.c:588 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:605 +#: parse-options.c:622 msgid "-NUM" msgstr "-TAL" @@ -1025,7 +1035,7 @@ msgstr "" "Ingenting att exkludera från med :(exkludera)-mönster.\n" "Glömde du kanske att antingen lägga till \":/\" eller \".\"?" -#: pretty.c:968 +#: pretty.c:969 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" @@ -1033,7 +1043,7 @@ msgstr "kunde inte tolka format för --pretty" msgid "done" msgstr "klart" -#: read-cache.c:1295 +#: read-cache.c:1296 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1042,7 +1052,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1305 +#: read-cache.c:1306 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1051,6 +1061,31 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" +#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 +#: builtin/merge.c:983 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "Kunde inte öppna \"%s\" för skrivning" + +#: refs.c:3001 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "kunde inte ta bort referensen %s: %s" + +#: refs.c:3004 +#, c-format +msgid "could not delete references: %s" +msgstr "kunde inte ta bort referenser: %s" + +#: refs.c:3013 +#, c-format +msgid "could not remove reference %s" +msgstr "kunde inte ta bort referensen %s" + +#: ref-filter.c:660 +msgid "unable to parse format" +msgstr "kan inte tolka formatet" + #: remote.c:792 #, c-format msgid "Cannot fetch both %s and %s to %s" @@ -1170,7 +1205,16 @@ msgstr[1] "" 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:2366 +#: revision.c:2198 +msgid "your current branch appears to be broken" +msgstr "din nuvarande gren verkar vara trasig" + +#: revision.c:2201 +#, c-format +msgid "your current branch '%s' does not have any commits yet" +msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar" + +#: revision.c:2395 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" @@ -1183,31 +1227,27 @@ msgstr "misslyckades öppna /dev/null" msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) misslyckades" -#: send-pack.c:272 +#: send-pack.c:295 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:378 +#: send-pack.c:404 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" -#: send-pack.c:389 +#: send-pack.c:406 +msgid "" +"not sending a push certificate since the receiving end does not support --" +"signed push" +msgstr "" +"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --" +"signed" + +#: send-pack.c:418 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stöder inte push med --atomic" -#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 -#: builtin/merge.c:983 -#, c-format -msgid "Could not open '%s' for writing" -msgstr "Kunde inte öppna \"%s\" för skrivning" - -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 -#: builtin/merge.c:988 -#, c-format -msgid "Could not write to '%s'" -msgstr "Kunde inte skriva till \"%s\"" - -#: sequencer.c:195 +#: sequencer.c:183 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -1215,7 +1255,7 @@ msgstr "" "efter att ha löst konflikterna, markera de rättade sökvägarna\n" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"" -#: sequencer.c:198 +#: sequencer.c:186 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -1225,220 +1265,220 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:211 sequencer.c:861 sequencer.c:944 +#: sequencer.c:199 sequencer.c:842 sequencer.c:922 #, c-format msgid "Could not write to %s" msgstr "Kunde inte skriva till %s" -#: sequencer.c:214 +#: sequencer.c:202 #, c-format msgid "Error wrapping up %s" msgstr "Fel vid ombrytning av %s" -#: sequencer.c:229 +#: sequencer.c:217 msgid "Your local changes would be overwritten by cherry-pick." msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"." -#: sequencer.c:231 +#: sequencer.c:219 msgid "Your local changes would be overwritten by revert." msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"." -#: sequencer.c:234 +#: sequencer.c:222 msgid "Commit your changes or stash them to proceed." msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta." #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:321 +#: sequencer.c:309 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:339 +#: sequencer.c:327 msgid "Could not resolve HEAD commit\n" msgstr "Kunde inte bestämma HEAD:s incheckning\n" -#: sequencer.c:359 +#: sequencer.c:347 msgid "Unable to update cache tree\n" msgstr "Kan inte uppdatera cacheträd\n" -#: sequencer.c:411 +#: sequencer.c:399 #, c-format msgid "Could not parse commit %s\n" msgstr "Kunde inte tolka incheckningen %s\n" -#: sequencer.c:416 +#: sequencer.c:404 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:482 +#: sequencer.c:469 msgid "Your index file is unmerged." msgstr "Din indexfil har inte slagits ihop." -#: sequencer.c:501 +#: sequencer.c:488 #, 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:509 +#: sequencer.c:496 #, c-format msgid "Commit %s does not have parent %d" msgstr "Incheckning %s har inte förälder %d" -#: sequencer.c:513 +#: sequencer.c:500 #, 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:526 +#: sequencer.c:513 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:530 +#: sequencer.c:517 #, c-format msgid "Cannot get commit message for %s" msgstr "Kan inte hämta incheckningsmeddelande för %s" -#: sequencer.c:616 +#: sequencer.c:603 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:617 +#: sequencer.c:604 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:653 +#: sequencer.c:639 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:661 +#: sequencer.c:647 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:665 +#: sequencer.c:651 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:725 +#: sequencer.c:711 #, c-format msgid "Cannot %s during a %s" msgstr "kan inte %s under en %s" -#: sequencer.c:747 +#: sequencer.c:733 #, c-format msgid "Could not parse line %d." msgstr "Kan inte tolka rad %d." -#: sequencer.c:752 +#: sequencer.c:738 msgid "No commits parsed." msgstr "Inga incheckningar lästes." -#: sequencer.c:765 +#: sequencer.c:750 #, c-format msgid "Could not open %s" msgstr "Kunde inte öppna %s" -#: sequencer.c:769 +#: sequencer.c:754 #, c-format msgid "Could not read %s." msgstr "kunde inte läsa %s." -#: sequencer.c:776 +#: sequencer.c:761 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Oanvändbart manus: %s" -#: sequencer.c:806 +#: sequencer.c:791 #, c-format msgid "Invalid key: %s" msgstr "Felaktig nyckel: %s" -#: sequencer.c:809 +#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49 #, c-format msgid "Invalid value for %s: %s" msgstr "Felaktigt värde för %s: %s" -#: sequencer.c:821 +#: sequencer.c:804 #, c-format msgid "Malformed options sheet: %s" msgstr "Trasigt manus: %s" -#: sequencer.c:842 +#: sequencer.c:823 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:843 +#: sequencer.c:824 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:847 +#: sequencer.c:828 #, c-format msgid "Could not create sequencer directory %s" msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:863 sequencer.c:948 +#: sequencer.c:844 sequencer.c:926 #, c-format msgid "Error wrapping up %s." msgstr "Fel vid ombrytning av %s." -#: sequencer.c:882 sequencer.c:1018 +#: sequencer.c:863 sequencer.c:996 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:884 +#: sequencer.c:865 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:886 +#: sequencer.c:867 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:908 builtin/apply.c:4291 +#: sequencer.c:887 builtin/apply.c:4291 #, c-format msgid "cannot open %s: %s" msgstr "kan inte öppna %s: %s" -#: sequencer.c:911 +#: sequencer.c:890 #, c-format msgid "cannot read %s: %s" msgstr "kan inte läsa %s: %s" -#: sequencer.c:912 +#: sequencer.c:891 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:918 +#: sequencer.c:897 #, 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:941 +#: sequencer.c:919 #, c-format msgid "Could not format %s." msgstr "Kunde inte formatera %s." -#: sequencer.c:1086 +#: sequencer.c:1064 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:1089 +#: sequencer.c:1067 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:1123 +#: sequencer.c:1101 msgid "Can't revert as initial commit" msgstr "Kan inte ångra som första incheckning" -#: sequencer.c:1124 +#: sequencer.c:1102 msgid "Can't cherry-pick into empty head" msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" @@ -1469,32 +1509,32 @@ msgstr "" "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" "genom att köra \"git config advice.objectNameWarning false\"" -#: submodule.c:64 submodule.c:98 +#: submodule.c:61 submodule.c:95 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Kan inte ändra .gitmodules-fil som inte slagits ihop, lös " "sammanslagningskonflikter först" -#: submodule.c:68 submodule.c:102 +#: submodule.c:65 submodule.c:99 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s" -#: submodule.c:76 +#: submodule.c:73 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" -#: submodule.c:109 +#: submodule.c:106 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Kunde inte ta bort .gitmodules-posten för %s" -#: submodule.c:120 +#: submodule.c:117 msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:1115 +#: submodule.c:1045 #, c-format msgid "Could not set core.worktree in %s" msgstr "Kunde inte sätta core.worktree i %s" @@ -1524,6 +1564,11 @@ msgstr "kunde inte läsa indatafilen \"%s\"" msgid "could not read from stdin" msgstr "Kunde inte läsa från standard in" +#: transport-helper.c:1025 +#, c-format +msgid "Could not read ref %s" +msgstr "Kunde inte läsa referensen %s" + #: unpack-trees.c:203 msgid "Checking out files" msgstr "Checkar ut filer" @@ -1557,196 +1602,212 @@ msgstr "felaktigt portnummer" msgid "invalid '..' path segment" msgstr "felaktigt \"..\"-sökvägssegment" -#: wrapper.c:523 +#: wrapper.c:219 wrapper.c:362 +#, c-format +msgid "could not open '%s' for reading and writing" +msgstr "kunde inte öppna \"%s\" för läsning och skrivning" + +#: wrapper.c:221 wrapper.c:364 +#, c-format +msgid "could not open '%s' for writing" +msgstr "kunde inte öppna \"%s\" för skrivning" + +#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688 +#: builtin/merge.c:1076 builtin/pull.c:380 +#, c-format +msgid "could not open '%s' for reading" +msgstr "kunde inte öppna \"%s\" för läsning" + +#: wrapper.c:579 #, c-format msgid "unable to access '%s': %s" msgstr "kan inte komma åt \"%s\": %s" -#: wrapper.c:544 +#: wrapper.c:600 #, c-format msgid "unable to access '%s'" msgstr "kan inte komma åt \"%s\"" -#: wrapper.c:555 +#: wrapper.c:611 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "kan inte slå upp aktuell användare i passwd-filen: %s" -#: wrapper.c:556 +#: wrapper.c:612 msgid "no such user" msgstr "okänd användare" -#: wrapper.c:564 +#: wrapper.c:620 msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" -#: wrapper.c:575 +#: wrapper.c:631 #, c-format msgid "could not open %s for writing" msgstr "kunde inte öppna %s för skrivning" -#: wrapper.c:587 +#: wrapper.c:642 builtin/am.c:424 #, c-format msgid "could not write to %s" msgstr "kunde inte skriva till %s" -#: wrapper.c:593 +#: wrapper.c:648 #, c-format msgid "could not close %s" msgstr "kunde inte stänga %s" -#: wt-status.c:150 +#: wt-status.c:149 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" -#: wt-status.c:177 wt-status.c:204 +#: wt-status.c:176 wt-status.c:203 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:178 wt-status.c:205 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)" -#: wt-status.c:183 +#: wt-status.c:182 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (använd \"git add <fil>...\" för att ange lösning)" -#: wt-status.c:185 wt-status.c:189 +#: wt-status.c:184 wt-status.c:188 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)" -#: wt-status.c:187 +#: wt-status.c:186 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:197 wt-status.c:880 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:216 wt-status.c:890 +#: wt-status.c:215 wt-status.c:889 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" -#: wt-status.c:220 +#: wt-status.c:219 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:222 +#: wt-status.c:221 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)" -#: wt-status.c:223 +#: wt-status.c:222 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (använd \"git checkout -- <fil>...\" för att förkasta ändringar i " "arbetskatalogen)" -#: wt-status.c:225 +#: wt-status.c:224 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" -#: wt-status.c:237 +#: wt-status.c:236 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)" -#: wt-status.c:252 +#: wt-status.c:251 msgid "both deleted:" msgstr "borttaget av bägge:" -#: wt-status.c:254 +#: wt-status.c:253 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:256 +#: wt-status.c:255 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:258 +#: wt-status.c:257 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:260 +#: wt-status.c:259 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:262 +#: wt-status.c:261 msgid "both added:" msgstr "tillagt av bägge:" -#: wt-status.c:264 +#: wt-status.c:263 msgid "both modified:" msgstr "ändrat av bägge:" -#: wt-status.c:266 +#: wt-status.c:265 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "programfel: ej hanterad \"unmerged\"-status %x" -#: wt-status.c:274 +#: wt-status.c:273 msgid "new file:" msgstr "ny fil:" -#: wt-status.c:276 +#: wt-status.c:275 msgid "copied:" msgstr "kopierad:" -#: wt-status.c:278 +#: wt-status.c:277 msgid "deleted:" msgstr "borttagen:" -#: wt-status.c:280 +#: wt-status.c:279 msgid "modified:" msgstr "ändrad:" -#: wt-status.c:282 +#: wt-status.c:281 msgid "renamed:" msgstr "namnbytt:" -#: wt-status.c:284 +#: wt-status.c:283 msgid "typechange:" msgstr "typbyte:" -#: wt-status.c:286 +#: wt-status.c:285 msgid "unknown:" msgstr "okänd:" -#: wt-status.c:288 +#: wt-status.c:287 msgid "unmerged:" msgstr "osammanslagen:" -#: wt-status.c:370 +#: wt-status.c:369 msgid "new commits, " msgstr "nya incheckningar, " -#: wt-status.c:372 +#: wt-status.c:371 msgid "modified content, " msgstr "ändrat innehåll, " -#: wt-status.c:374 +#: wt-status.c:373 msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:391 +#: wt-status.c:390 #, c-format msgid "bug: unhandled diff status %c" msgstr "programfel: diff-status %c ej hanterad" -#: wt-status.c:755 +#: wt-status.c:754 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:757 +#: wt-status.c:756 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:838 +#: wt-status.c:837 msgid "" "Do not touch the line above.\n" "Everything below will be removed." @@ -1754,68 +1815,99 @@ msgstr "" "Rör inte raden ovan.\n" "Allt nedan kommer tas bort." -#: wt-status.c:949 +#: wt-status.c:948 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:952 +#: wt-status.c:951 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:955 +#: wt-status.c:954 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:958 +#: wt-status.c:957 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:968 +#: wt-status.c:967 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:971 +#: wt-status.c:970 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:975 +#: wt-status.c:974 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:977 +#: wt-status.c:976 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:979 +#: wt-status.c:978 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:1039 wt-status.c:1056 +#: wt-status.c:1105 +msgid "No commands done." +msgstr "Inga kommandon utförda." + +#: wt-status.c:1108 +#, 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 +#, c-format +msgid " (see more in file %s)" +msgstr " (se fler i filen %s)" + +#: wt-status.c:1124 +msgid "No commands remaining." +msgstr "Inga kommandon återstår." + +#: wt-status.c:1127 +#, 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 +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 #, 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:1044 wt-status.c:1061 +#: wt-status.c:1153 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1047 +#: wt-status.c:1167 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1049 +#: wt-status.c:1169 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1051 +#: wt-status.c:1171 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:1064 +#: wt-status.c:1177 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1068 +#: wt-status.c:1181 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1823,118 +1915,122 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1073 +#: wt-status.c:1186 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:1076 +#: wt-status.c:1189 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:1080 +#: wt-status.c:1193 #, 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:1085 +#: wt-status.c:1198 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:1088 +#: wt-status.c:1201 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:1090 +#: wt-status.c:1203 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:1100 +#: wt-status.c:1213 #, 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:1105 +#: wt-status.c:1218 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1108 +#: wt-status.c:1221 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1110 +#: wt-status.c:1223 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:1119 +#: wt-status.c:1232 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1124 +#: wt-status.c:1237 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1127 +#: wt-status.c:1240 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1129 +#: wt-status.c:1242 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1140 +#: wt-status.c:1253 #, 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:1144 +#: wt-status.c:1257 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1147 +#: wt-status.c:1260 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:1324 +#: wt-status.c:1437 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1331 +#: wt-status.c:1445 +msgid "interactive rebase in progress; onto " +msgstr "interaktiv ombasering pågår; ovanpå" + +#: wt-status.c:1447 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå" -#: wt-status.c:1336 +#: wt-status.c:1452 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1338 +#: wt-status.c:1454 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1341 +#: wt-status.c:1457 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1358 +#: wt-status.c:1474 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1372 +#: wt-status.c:1488 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1374 +#: wt-status.c:1490 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1378 +#: wt-status.c:1494 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1946,32 +2042,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1384 +#: wt-status.c:1500 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1386 +#: wt-status.c:1502 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1392 +#: wt-status.c:1508 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1397 +#: wt-status.c:1513 #, 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:1400 +#: wt-status.c:1516 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1403 +#: wt-status.c:1519 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1980,48 +2076,48 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1406 +#: wt-status.c:1522 #, 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:1409 +#: wt-status.c:1525 #, 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:1412 wt-status.c:1417 +#: wt-status.c:1528 wt-status.c:1533 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1415 +#: wt-status.c:1531 #, 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:1419 +#: wt-status.c:1535 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1528 +#: wt-status.c:1644 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1534 +#: wt-status.c:1650 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1561 +#: wt-status.c:1677 msgid "gone" msgstr "försvunnen" -#: wt-status.c:1563 wt-status.c:1571 +#: wt-status.c:1679 wt-status.c:1687 msgid "behind " msgstr "efter " -#: compat/precompose_utf8.c:55 builtin/clone.c:345 +#: compat/precompose_utf8.c:55 builtin/clone.c:403 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -2048,7 +2144,7 @@ msgstr "ta bort \"%s\"\n" msgid "Unstaged changes after refreshing the index:" msgstr "Ospårade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:194 builtin/rev-parse.c:796 +#: builtin/add.c:194 builtin/rev-parse.c:799 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" @@ -2083,15 +2179,15 @@ msgstr "Kunde inte tillämpa \"%s\"" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" -#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369 -#: builtin/rm.c:268 +#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110 +#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545 +#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "testkörning" #: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616 -#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 +#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636 +#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "var pratsam" @@ -2099,7 +2195,7 @@ msgstr "var pratsam" msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286 msgid "select hunks interactively" msgstr "välj stycken interaktivt" @@ -2166,15 +2262,422 @@ msgstr "Inget angivet, inget tillagt.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940 +#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430 +#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" +#: builtin/am.c:41 +#, c-format +msgid "could not stat %s" +msgstr "kunde inte ta status på %s" + +#: builtin/am.c:270 builtin/am.c:1318 builtin/commit.c:737 +#: builtin/merge.c:1079 +#, c-format +msgid "could not read '%s'" +msgstr "kunde inte läsa \"%s\"" + +#: builtin/am.c:444 +msgid "could not parse author script" +msgstr "kunde inte tolka författarskript" + +#: builtin/am.c:521 +#, c-format +msgid "'%s' was deleted by the applypatch-msg hook" +msgstr "\"%s\" togs bort av kroken applypatch-msg" + +#: builtin/am.c:562 builtin/notes.c:300 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "Felaktig indatarad: \"%s\"." + +#: builtin/am.c:599 builtin/notes.c:315 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" + +#: builtin/am.c:625 +msgid "fseek failed" +msgstr "\"fseek\" misslyckades" + +#: builtin/am.c:786 builtin/am.c:874 +#, c-format +msgid "could not open '%s' for reading: %s" +msgstr "kunde inte öppna \"%s\" för läsning: %s" + +#: builtin/am.c:793 +#, c-format +msgid "could not open '%s' for writing: %s" +msgstr "Kunde inte öppna \"%s\" för skrivning: %s" + +#: builtin/am.c:802 +#, c-format +msgid "could not parse patch '%s'" +msgstr "kunde inte tolka patchen \"%s\"" + +#: builtin/am.c:867 +msgid "Only one StGIT patch series can be applied at once" +msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" + +#: builtin/am.c:915 +msgid "invalid timestamp" +msgstr "ogiltig tidsstämpel" + +#: builtin/am.c:918 builtin/am.c:926 +msgid "invalid Date line" +msgstr "ogiltig \"Date\"-rad" + +#: builtin/am.c:923 +msgid "invalid timezone offset" +msgstr "ogiltig tidszons-offset" + +#: builtin/am.c:1010 +msgid "Patch format detection failed." +msgstr "Misslyckades detektera patchformat." + +#: builtin/am.c:1015 builtin/clone.c:368 +#, c-format +msgid "failed to create directory '%s'" +msgstr "misslyckades skapa katalogen \"%s\"" + +#: builtin/am.c:1019 +msgid "Failed to split patches." +msgstr "Misslyckades dela patchar." + +#: builtin/am.c:1151 builtin/commit.c:362 +msgid "unable to write index file" +msgstr "kan inte skriva indexfil" + +#: builtin/am.c:1202 +#, c-format +msgid "When you have resolved this problem, run \"%s --continue\"." +msgstr "När du har löst problemet, kör \"%s --continue\"." + +#: builtin/am.c:1203 +#, c-format +msgid "If you prefer to skip this patch, run \"%s --skip\" instead." +msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället." + +#: builtin/am.c:1204 +#, c-format +msgid "To restore the original branch and stop patching, run \"%s --abort\"." +msgstr "" +"För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"." + +#: builtin/am.c:1312 +msgid "Patch is empty. Was it split wrong?" +msgstr "Patchen är tom. Delades den upp felaktigt?" + +#: builtin/am.c:1386 builtin/log.c:1345 +#, c-format +msgid "invalid ident line: %s" +msgstr "ogiltig ident-rad: %s" + +#: builtin/am.c:1413 +#, c-format +msgid "unable to parse commit %s" +msgstr "kunde inte tolka incheckningen %s" + +#: builtin/am.c:1587 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "" +"Arkivet saknar objekt som behövs för att falla tillbaka på 3-" +"vägssammanslagning." + +#: builtin/am.c:1589 +msgid "Using index info to reconstruct a base tree..." +msgstr "Använder indexinfo för att återskapa ett basträd..." + +#: builtin/am.c:1608 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"Har du handredigerat din patch?\n" +"Den kan inte tillämpas på blobbar som antecknats i dess index." + +#: builtin/am.c:1614 +msgid "Falling back to patching base and 3-way merge..." +msgstr "" +"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." + +#: builtin/am.c:1639 +msgid "Failed to merge in the changes." +msgstr "Misslyckades slå ihop ändringarna." + +#: builtin/am.c:1664 builtin/merge.c:632 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree misslyckades skriva ett träd" + +#: builtin/am.c:1671 +msgid "applying to an empty history" +msgstr "tillämpar på en tom historik" + +#: builtin/am.c:1684 builtin/commit.c:1752 builtin/merge.c:829 +#: builtin/merge.c:854 +msgid "failed to write commit object" +msgstr "kunde inte skriva incheckningsobjekt" + +#: builtin/am.c:1716 builtin/am.c:1720 +#, c-format +msgid "cannot resume: %s does not exist." +msgstr "kan inte återuppta: %s finns inte." + +#: builtin/am.c:1736 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "" +"kan inte vara interaktiv om standard in inte är ansluten till en terminal." + +#: builtin/am.c:1741 +msgid "Commit Body is:" +msgstr "Incheckningskroppen är:" + +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#. +#: builtin/am.c:1751 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " +msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " + +#: builtin/am.c:1801 +#, c-format +msgid "Dirty index: cannot apply patches (dirty: %s)" +msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" + +#: builtin/am.c:1836 builtin/am.c:1907 +#, c-format +msgid "Applying: %.*s" +msgstr "Tillämpar: %.*s" + +#: builtin/am.c:1852 +msgid "No changes -- Patch already applied." +msgstr "Inga ändringar -- Patchen har redan tillämpats." + +#: builtin/am.c:1860 +#, c-format +msgid "Patch failed at %s %.*s" +msgstr "Patch misslyckades på %s %.*s" + +#: builtin/am.c:1866 +#, c-format +msgid "The copy of the patch that failed is found in: %s" +msgstr "En kopia av patchen som misslyckades finns i: %s" + +#: builtin/am.c:1910 +msgid "" +"No changes - did you forget to use 'git add'?\n" +"If there is nothing left to stage, chances are that something else\n" +"already introduced the same changes; you might want to skip this patch." +msgstr "" +"Inga ändringar - glömde du använda \"git add\"?\n" +"Om det inte är något kvar att köa kan det hända att något annat redan\n" +"introducerat samma ändringar; kanske du bör hoppa över patchen." + +#: builtin/am.c:1917 +msgid "" +"You still have unmerged paths in your index.\n" +"Did you forget to use 'git add'?" +msgstr "" +"Du har fortfarande sökvägar som inte slagits samman i ditt index.\n" +"Glömde du använda \"git add\"?" + +#: builtin/am.c:2025 builtin/am.c:2029 builtin/am.c:2041 builtin/reset.c:308 +#: builtin/reset.c:316 +#, c-format +msgid "Could not parse object '%s'." +msgstr "Kan inte tolka objektet \"%s\"" + +#: builtin/am.c:2077 +msgid "failed to clean index" +msgstr "misslyckades städa upp indexet" + +#: builtin/am.c:2111 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" +"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" +"Återställer inte till ORIG_HEAD" + +#: builtin/am.c:2172 +#, c-format +msgid "Invalid value for --patch-format: %s" +msgstr "Felaktigt värde för --patch-format: %s" + +#: builtin/am.c:2194 +msgid "git am [options] [(<mbox>|<Maildir>)...]" +msgstr "git am [flaggor] [(<mbox>|<Maildir>)...]" + +#: builtin/am.c:2195 +msgid "git am [options] (--continue | --skip | --abort)" +msgstr "git am [flaggor] (--continue | --skip | --abort)" + +#: builtin/am.c:2201 +msgid "run interactively" +msgstr "kör interaktivt" + +#: builtin/am.c:2203 +msgid "historical option -- no-op" +msgstr "historisk flagga -- no-op" + +#: builtin/am.c:2205 +msgid "allow fall back on 3way merging if needed" +msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" + +#: builtin/am.c:2206 builtin/init-db.c:509 builtin/prune-packed.c:57 +#: builtin/repack.c:171 +msgid "be quiet" +msgstr "var tyst" + +#: builtin/am.c:2208 +msgid "add a Signed-off-by line to the commit message" +msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" + +#: builtin/am.c:2211 +msgid "recode into utf8 (default)" +msgstr "koda om till utf8 (standard)" + +#: builtin/am.c:2213 +msgid "pass -k flag to git-mailinfo" +msgstr "sänd flaggan -k till git-mailinfo" + +#: builtin/am.c:2215 +msgid "pass -b flag to git-mailinfo" +msgstr "sänd flaggan -b till git-mailinfo" + +#: builtin/am.c:2217 +msgid "pass -m flag to git-mailinfo" +msgstr "sänd flaggan -m till git-mailinfo" + +#: builtin/am.c:2219 +msgid "pass --keep-cr flag to git-mailsplit for mbox format" +msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet" + +#: builtin/am.c:2222 +msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" +msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr" + +#: builtin/am.c:2225 +msgid "strip everything before a scissors line" +msgstr "ta bort allting före en saxlinje" + +#: builtin/am.c:2226 builtin/apply.c:4563 +msgid "action" +msgstr "åtgärd" + +#: builtin/am.c:2227 builtin/am.c:2230 builtin/am.c:2233 builtin/am.c:2236 +#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248 +#: builtin/am.c:2254 +msgid "pass it through git-apply" +msgstr "sänd det genom git-apply" + +#: builtin/am.c:2235 builtin/apply.c:4587 +msgid "root" +msgstr "rot" + +#: builtin/am.c:2238 builtin/am.c:2241 builtin/apply.c:4525 +#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93 +#: builtin/pull.c:167 +msgid "path" +msgstr "sökväg" + +#: builtin/am.c:2244 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672 +#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127 +#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664 +#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132 +#: parse-options.h:134 parse-options.h:243 +msgid "n" +msgstr "n" + +#: builtin/am.c:2247 builtin/apply.c:4531 +msgid "num" +msgstr "antal" + +#: builtin/am.c:2250 builtin/for-each-ref.c:34 builtin/replace.c:438 +msgid "format" +msgstr "format" + +#: builtin/am.c:2251 +msgid "format the patch(es) are in" +msgstr "format för patch(ar)" + +#: builtin/am.c:2257 +msgid "override error message when patch failure occurs" +msgstr "överstyr felmeddelanden när patchfel uppstår" + +#: builtin/am.c:2259 +msgid "continue applying patches after resolving a conflict" +msgstr "fortsätt applicera patchar efter att ha löst en konflikt" + +#: builtin/am.c:2262 +msgid "synonyms for --continue" +msgstr "synonymer till --continue" + +#: builtin/am.c:2265 +msgid "skip the current patch" +msgstr "hoppa över den aktuella grenen" + +#: builtin/am.c:2268 +msgid "restore the original branch and abort the patching operation." +msgstr "återställ originalgrenen och avbryt patchningen." + +#: builtin/am.c:2272 +msgid "lie about committer date" +msgstr "ljug om incheckningsdatum" + +#: builtin/am.c:2274 +msgid "use current timestamp for author date" +msgstr "använd nuvarande tidsstämpel för författardatum" + +#: builtin/am.c:2276 builtin/commit.c:1590 builtin/merge.c:225 +#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606 +msgid "key-id" +msgstr "nyckel-id" + +#: builtin/am.c:2277 +msgid "GPG-sign commits" +msgstr "GPG-signera incheckningar" + +#: builtin/am.c:2280 +msgid "(internal use for git-rebase)" +msgstr "(används internt av git-rebase)" + +#: builtin/am.c:2295 +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." +msgstr "" +"Flaggan -b/--binary har varit utan funktion länge, och\n" +"kommer tas bort. Vi ber dig att inte använda den längre." + +#: builtin/am.c:2302 +msgid "failed to read the index" +msgstr "misslyckades läsa indexet" + +#: builtin/am.c:2317 +#, c-format +msgid "previous rebase directory %s still exists but mbox given." +msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs." + +#: builtin/am.c:2341 +#, c-format +msgid "" +"Stray %s directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "" +"Kvarbliven katalog %s hittades.\n" +"Använd \"git am --abort\" för att ta bort den." + +#: builtin/am.c:2347 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "Lösningsoperation pågår inte, vi återupptar inte." + #: builtin/apply.c:59 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<flaggor>] [<patch>...]" @@ -2438,7 +2941,7 @@ msgstr "%s: patchen kan inte tillämpas" msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3909 builtin/checkout.c:232 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\"" @@ -2517,11 +3020,6 @@ msgstr "indata känns inte igen" msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85 -#: builtin/fetch.c:92 -msgid "path" -msgstr "sökväg" - #: builtin/apply.c:4526 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" @@ -2530,10 +3028,6 @@ 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" -#: builtin/apply.c:4531 -msgid "num" -msgstr "antal" - #: builtin/apply.c:4532 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" @@ -2590,10 +3084,6 @@ 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" -#: builtin/apply.c:4563 -msgid "action" -msgstr "åtgärd" - #: builtin/apply.c:4564 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" @@ -2626,10 +3116,6 @@ 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" -#: builtin/apply.c:4587 -msgid "root" -msgstr "rot" - #: builtin/apply.c:4588 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" @@ -2712,11 +3198,11 @@ msgstr "utför 'git bisect next'" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning" -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" @@ -2897,321 +3383,321 @@ msgstr "fjärrspårande grenen \"%s\" hittades inte." msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:258 +#: builtin/branch.c:259 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\"" -#: builtin/branch.c:259 +#: builtin/branch.c:260 #, c-format msgid "Error deleting branch '%s'" msgstr "Fel vid borttagning av grenen \"%s\"" -#: builtin/branch.c:266 +#: builtin/branch.c:267 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" -#: builtin/branch.c:267 +#: builtin/branch.c:268 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:368 +#: builtin/branch.c:369 #, c-format msgid "branch '%s' does not point at a commit" msgstr "grenen \"%s\" pekar inte på en incheckning" -#: builtin/branch.c:451 +#: builtin/branch.c:452 #, c-format msgid "[%s: gone]" msgstr "[%s: försvunnen]" -#: builtin/branch.c:456 +#: builtin/branch.c:457 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:461 +#: builtin/branch.c:462 #, c-format msgid "[%s: behind %d]" msgstr "[%s: bakom %d] " -#: builtin/branch.c:463 +#: builtin/branch.c:464 #, c-format msgid "[behind %d]" msgstr "[bakom %d] " -#: builtin/branch.c:467 +#: builtin/branch.c:468 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: före %d] " -#: builtin/branch.c:469 +#: builtin/branch.c:470 #, c-format msgid "[ahead %d]" msgstr "[före %d] " -#: builtin/branch.c:472 +#: builtin/branch.c:473 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: före %d, bakom %d] " -#: builtin/branch.c:475 +#: builtin/branch.c:476 #, c-format msgid "[ahead %d, behind %d]" msgstr "[före %d, bakom %d] " -#: builtin/branch.c:488 +#: builtin/branch.c:489 msgid " **** invalid ref ****" msgstr " **** ogiltig ref ****" -#: builtin/branch.c:579 +#: builtin/branch.c:580 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: builtin/branch.c:582 +#: builtin/branch.c:583 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" -#: builtin/branch.c:588 +#: builtin/branch.c:589 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frånkopplat vid %s)" -#: builtin/branch.c:591 +#: builtin/branch.c:592 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frånkopplat från %s)" -#: builtin/branch.c:595 +#: builtin/branch.c:596 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:642 +#: builtin/branch.c:643 #, c-format msgid "object '%s' does not point to a commit" msgstr "objektet \"%s\" pekar på en incheckning" -#: builtin/branch.c:690 +#: builtin/branch.c:691 msgid "some refs could not be read" msgstr "vissa referenser kunde inte läsas" -#: builtin/branch.c:703 +#: builtin/branch.c:704 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:713 +#: builtin/branch.c:714 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:728 +#: builtin/branch.c:729 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:732 +#: builtin/branch.c:733 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:736 +#: builtin/branch.c:737 #, 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:743 +#: builtin/branch.c:744 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:758 +#: builtin/branch.c:759 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: builtin/branch.c:780 +#: builtin/branch.c:781 #, c-format msgid "could not write branch description template: %s" msgstr "kunde inte skriva grenbeskrivningsmall: %s" -#: builtin/branch.c:810 +#: builtin/branch.c:811 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:812 +#: builtin/branch.c:813 msgid "show hash and subject, give twice for upstream branch" msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren" -#: builtin/branch.c:813 +#: builtin/branch.c:814 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:814 +#: builtin/branch.c:815 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:816 +#: builtin/branch.c:817 msgid "change upstream info" msgstr "ändra uppströmsinformation" -#: builtin/branch.c:820 +#: builtin/branch.c:821 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:821 +#: builtin/branch.c:822 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851 -#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582 -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616 -#: builtin/tag.c:622 +#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852 +#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618 +#: builtin/tag.c:624 msgid "commit" msgstr "incheckning" -#: builtin/branch.c:825 builtin/branch.c:831 +#: builtin/branch.c:826 builtin/branch.c:832 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:837 +#: builtin/branch.c:838 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:838 +#: builtin/branch.c:839 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:840 +#: builtin/branch.c:841 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:841 +#: builtin/branch.c:842 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:842 +#: builtin/branch.c:843 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:843 +#: builtin/branch.c:844 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:844 +#: builtin/branch.c:845 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:845 +#: builtin/branch.c:846 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:847 +#: builtin/branch.c:848 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:848 +#: builtin/branch.c:849 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:851 +#: builtin/branch.c:852 msgid "print only not merged branches" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:857 +#: builtin/branch.c:858 msgid "print only merged branches" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:861 +#: builtin/branch.c:862 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:874 +#: builtin/branch.c:875 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:878 builtin/clone.c:622 +#: builtin/branch.c:879 builtin/clone.c:690 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:900 +#: builtin/branch.c:901 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:911 builtin/branch.c:950 +#: builtin/branch.c:912 builtin/branch.c:951 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:926 +#: builtin/branch.c:927 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:931 +#: builtin/branch.c:932 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:938 +#: builtin/branch.c:939 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu" -#: builtin/branch.c:941 +#: builtin/branch.c:942 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:956 +#: builtin/branch.c:957 msgid "too many branches for a rename operation" msgstr "för många grenar för namnbyte" -#: builtin/branch.c:961 +#: builtin/branch.c:962 msgid "too many branches to set new upstream" msgstr "för många grenar för att byta uppström" -#: builtin/branch.c:965 +#: builtin/branch.c:966 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren." -#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011 +#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:972 +#: builtin/branch.c:973 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:984 +#: builtin/branch.c:985 msgid "too many branches to unset upstream" msgstr "för många grenar för att ta bort uppström" -#: builtin/branch.c:988 +#: builtin/branch.c:989 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren." -#: builtin/branch.c:994 +#: builtin/branch.c:995 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:1008 +#: builtin/branch.c:1009 msgid "it does not make sense to create 'HEAD' manually" msgstr "kan inte skapa \"HEAD\" manuellt" -#: builtin/branch.c:1014 +#: builtin/branch.c:1015 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett " "grennamn" -#: builtin/branch.c:1017 +#: builtin/branch.c:1018 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3220,7 +3706,7 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to\n" -#: builtin/branch.c:1034 +#: builtin/branch.c:1035 #, c-format msgid "" "\n" @@ -3231,12 +3717,12 @@ msgstr "" "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" "\n" -#: builtin/branch.c:1035 +#: builtin/branch.c:1036 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1036 +#: builtin/branch.c:1037 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3254,7 +3740,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:369 +#: builtin/cat-file.c:428 msgid "" "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" "<type>|--textconv) <object>" @@ -3262,54 +3748,62 @@ msgstr "" "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" "<typ>|--textconv) <objekt>" -#: builtin/cat-file.c:370 +#: builtin/cat-file.c:429 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-" "objects>" msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] < <objektlista>" -#: builtin/cat-file.c:407 +#: builtin/cat-file.c:466 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:408 +#: builtin/cat-file.c:467 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:409 +#: builtin/cat-file.c:468 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:411 +#: builtin/cat-file.c:470 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:412 +#: builtin/cat-file.c:471 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:414 +#: builtin/cat-file.c:473 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:416 +#: builtin/cat-file.c:475 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:418 +#: builtin/cat-file.c:476 +msgid "buffer --batch output" +msgstr "buffra utdata från --batch" + +#: builtin/cat-file.c:478 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:421 +#: builtin/cat-file.c:481 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:424 +#: builtin/cat-file.c:484 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 +msgid "show all objects with --batch or --batch-check" +msgstr "visa alla objekt med --batch eller --batch-check" + #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..." @@ -3334,7 +3828,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:1202 builtin/gc.c:279 +#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -3431,113 +3925,113 @@ msgstr "när filer skapas, lägg till <sträng> först" msgid "copy out the files from named stage" msgstr "kopiera ut filer från namngiven etapp" -#: builtin/checkout.c:24 +#: builtin/checkout.c:25 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<flaggor>] <gren>" -#: builtin/checkout.c:25 +#: builtin/checkout.c:26 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..." -#: builtin/checkout.c:134 builtin/checkout.c:167 +#: builtin/checkout.c:133 builtin/checkout.c:166 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:136 builtin/checkout.c:169 +#: builtin/checkout.c:135 builtin/checkout.c:168 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:152 +#: builtin/checkout.c:151 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner" -#: builtin/checkout.c:196 +#: builtin/checkout.c:195 #, c-format msgid "path '%s' does not have necessary versions" msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" -#: builtin/checkout.c:213 +#: builtin/checkout.c:212 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:230 +#: builtin/checkout.c:229 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "indexfilen är trasig" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:627 +#: builtin/checkout.c:622 #, c-format -msgid "Can not do reflog for '%s'\n" -msgstr "Kan inte skapa referenslog för \"%s\"\n" +msgid "Can not do reflog for '%s': %s\n" +msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:663 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:670 +#: builtin/checkout.c:667 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:673 +#: builtin/checkout.c:670 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:677 +#: builtin/checkout.c:674 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:679 builtin/checkout.c:1134 +#: builtin/checkout.c:676 builtin/checkout.c:1065 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:681 +#: builtin/checkout.c:678 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:733 +#: builtin/checkout.c:730 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:739 +#: builtin/checkout.c:736 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3560,7 +4054,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:758 +#: builtin/checkout.c:755 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -3587,150 +4081,145 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:794 +#: builtin/checkout.c:791 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:798 +#: builtin/checkout.c:795 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:825 builtin/checkout.c:1129 +#: builtin/checkout.c:822 builtin/checkout.c:1060 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:931 -#, c-format -msgid "'%s' is already checked out at '%s'" -msgstr "\"%s\" är redan utcheckad på \"%s\"" - -#: builtin/checkout.c:1036 +#: builtin/checkout.c:967 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1075 +#: builtin/checkout.c:1006 builtin/worktree.c:210 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1035 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1074 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1146 builtin/checkout.c:1150 +#: builtin/checkout.c:1077 builtin/checkout.c:1081 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162 -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093 +#: builtin/checkout.c:1096 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1101 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83 -#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282 -#: builtin/worktree.c:284 +#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83 +#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317 +#: builtin/worktree.c:319 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1204 +#: builtin/checkout.c:1135 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1206 +#: builtin/checkout.c:1137 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1207 +#: builtin/checkout.c:1138 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1208 +#: builtin/checkout.c:1139 msgid "detach the HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1209 +#: builtin/checkout.c:1140 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1211 +#: builtin/checkout.c:1142 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1211 +#: builtin/checkout.c:1142 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1143 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1214 +#: builtin/checkout.c:1145 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1216 +#: builtin/checkout.c:1147 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1217 +#: builtin/checkout.c:1148 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:1218 builtin/merge.c:227 +#: builtin/checkout.c:1149 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244 +#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249 msgid "style" msgstr "stil" -#: builtin/checkout.c:1220 +#: builtin/checkout.c:1151 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1223 +#: builtin/checkout.c:1154 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1225 +#: builtin/checkout.c:1156 msgid "second guess 'git checkout <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1227 +#: builtin/checkout.c:1158 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:1252 +#: builtin/checkout.c:1181 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1269 +#: builtin/checkout.c:1198 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1274 +#: builtin/checkout.c:1203 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1310 +#: builtin/checkout.c:1239 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1317 +#: builtin/checkout.c:1246 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3739,12 +4228,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:1322 +#: builtin/checkout.c:1251 #, 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:1326 +#: builtin/checkout.c:1255 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3752,39 +4241,39 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/clean.c:26 +#: builtin/clean.c:25 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <mönster>] [-x | -X] [--] " "<sökvägar>..." -#: builtin/clean.c:30 +#: builtin/clean.c:29 #, c-format msgid "Removing %s\n" msgstr "Tar bort %s\n" -#: builtin/clean.c:31 +#: builtin/clean.c:30 #, c-format msgid "Would remove %s\n" msgstr "Skulle ta bort %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:31 #, c-format msgid "Skipping repository %s\n" msgstr "Hoppar över arkivet %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:32 #, c-format msgid "Would skip repository %s\n" msgstr "Skulle hoppa över arkivet %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:33 #, c-format msgid "failed to remove %s" msgstr "misslyckades ta bort %s" -#: builtin/clean.c:295 +#: builtin/clean.c:317 msgid "" "Prompt help:\n" "1 - select a numbered item\n" @@ -3796,7 +4285,7 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" " - (tomt) markera ingenting" -#: builtin/clean.c:299 +#: builtin/clean.c:321 msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -3816,36 +4305,36 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering" -#: builtin/clean.c:515 +#: builtin/clean.c:537 #, c-format msgid "Huh (%s)?" msgstr "Vadå (%s)?" -#: builtin/clean.c:657 +#: builtin/clean.c:679 #, c-format msgid "Input ignore patterns>> " msgstr "Ange ignoreringsmönster>>" -#: builtin/clean.c:694 +#: builtin/clean.c:716 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "VARNING: Hittar inte poster som motsvarar: %s" -#: builtin/clean.c:715 +#: builtin/clean.c:737 msgid "Select items to delete" msgstr "Välj poster att ta bort" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:756 +#: builtin/clean.c:778 #, c-format msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]?" -#: builtin/clean.c:781 +#: builtin/clean.c:803 msgid "Bye." msgstr "Hej då." -#: builtin/clean.c:789 +#: builtin/clean.c:811 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3863,62 +4352,62 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:816 +#: builtin/clean.c:838 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: builtin/clean.c:817 +#: builtin/clean.c:839 msgid "What now" msgstr "Vad nu" -#: builtin/clean.c:825 +#: builtin/clean.c:847 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Skulle ta bort följande post:" msgstr[1] "Skulle ta bort följande poster:" -#: builtin/clean.c:842 +#: builtin/clean.c:864 msgid "No more files to clean, exiting." msgstr "Inga fler filer att städa, avslutar." -#: builtin/clean.c:873 +#: builtin/clean.c:895 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:875 +#: builtin/clean.c:897 msgid "force" msgstr "tvinga" -#: builtin/clean.c:876 +#: builtin/clean.c:898 msgid "interactive cleaning" msgstr "städa interaktivt" -#: builtin/clean.c:878 +#: builtin/clean.c:900 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714 +#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714 #: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:880 +#: builtin/clean.c:902 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:881 +#: builtin/clean.c:903 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:883 +#: builtin/clean.c:905 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:901 +#: builtin/clean.c:923 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:905 +#: builtin/clean.c:927 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -3926,7 +4415,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:908 +#: builtin/clean.c:930 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -3938,8 +4427,8 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224 -#: builtin/push.c:523 +#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224 +#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" @@ -3947,7 +4436,7 @@ msgstr "tvinga förloppsrapportering" msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" @@ -3971,11 +4460,11 @@ msgstr "skapa som ett delat arkiv" msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:75 builtin/init-db.c:500 +#: builtin/clone.c:75 builtin/init-db.c:501 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:76 builtin/init-db.c:501 +#: builtin/clone.c:76 builtin/init-db.c:502 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" @@ -4003,7 +4492,8 @@ msgstr "checka ut <gren> istället för fjärrens HEAD" msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659 +#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/pull.c:186 msgid "depth" msgstr "djup" @@ -4015,11 +4505,11 @@ msgstr "skapa en grund klon på detta djup" msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:91 builtin/init-db.c:509 +#: builtin/clone.c:91 builtin/init-db.c:510 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:92 builtin/init-db.c:510 +#: builtin/clone.c:92 builtin/init-db.c:511 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" @@ -4031,57 +4521,52 @@ msgstr "nyckel=värde" msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:240 +#: builtin/clone.c:298 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: builtin/clone.c:244 +#: builtin/clone.c:302 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: builtin/clone.c:247 +#: builtin/clone.c:305 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: builtin/clone.c:310 -#, c-format -msgid "failed to create directory '%s'" -msgstr "misslyckades skapa katalogen \"%s\"" - -#: builtin/clone.c:312 builtin/diff.c:84 +#: builtin/clone.c:370 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: builtin/clone.c:314 +#: builtin/clone.c:372 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:328 +#: builtin/clone.c:386 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:350 +#: builtin/clone.c:408 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:354 +#: builtin/clone.c:412 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:377 builtin/clone.c:551 +#: builtin/clone.c:435 builtin/clone.c:619 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:389 +#: builtin/clone.c:447 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4091,124 +4576,124 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och försöka checka ut igen med \"git checkout -f HEAD\"\n" -#: builtin/clone.c:466 +#: builtin/clone.c:524 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." # Vague original, not networking-related, but rather related to the actual # objects downloaded. -#: builtin/clone.c:546 +#: builtin/clone.c:614 #, c-format msgid "Checking connectivity... " msgstr "Kontrollerar om vi fick alla objekt..." -#: builtin/clone.c:549 +#: builtin/clone.c:617 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: builtin/clone.c:613 +#: builtin/clone.c:681 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" -#: builtin/clone.c:644 +#: builtin/clone.c:712 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:731 +#: builtin/clone.c:799 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:733 +#: builtin/clone.c:801 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:763 +#: builtin/clone.c:831 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:767 +#: builtin/clone.c:835 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:778 +#: builtin/clone.c:846 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:781 +#: builtin/clone.c:849 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:794 +#: builtin/clone.c:862 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:800 builtin/fetch.c:1160 +#: builtin/clone.c:868 builtin/fetch.c:1168 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:810 +#: builtin/clone.c:878 #, 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:820 +#: builtin/clone.c:888 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193 -#: builtin/worktree.c:220 +#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218 +#: builtin/worktree.c:245 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:838 +#: builtin/clone.c:906 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:856 +#: builtin/clone.c:924 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:858 +#: builtin/clone.c:926 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:883 +#: builtin/clone.c:951 msgid "--dissociate given, but there is no --reference" msgstr "--dissociate angavs, men --reference har inte angivits" -#: builtin/clone.c:900 +#: builtin/clone.c:968 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:903 +#: builtin/clone.c:971 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:908 +#: builtin/clone.c:976 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:912 +#: builtin/clone.c:980 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:961 builtin/clone.c:969 +#: builtin/clone.c:1029 builtin/clone.c:1037 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:972 +#: builtin/clone.c:1040 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -4352,66 +4837,62 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:344 +#: builtin/commit.c:345 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:350 +#: builtin/commit.c:351 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:361 -msgid "unable to write index file" -msgstr "kan inte skriva indexfil" - -#: builtin/commit.c:363 +#: builtin/commit.c:364 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:365 +#: builtin/commit.c:366 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:445 +#: builtin/commit.c:444 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:447 +#: builtin/commit.c:446 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:456 +#: builtin/commit.c:455 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:475 +#: builtin/commit.c:474 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:580 +#: builtin/commit.c:579 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:582 +#: builtin/commit.c:581 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:601 +#: builtin/commit.c:600 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:609 +#: builtin/commit.c:608 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: builtin/commit.c:653 +#: builtin/commit.c:652 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4419,43 +4900,38 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:702 builtin/shortlog.c:273 +#: builtin/commit.c:701 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:704 +#: builtin/commit.c:703 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:708 +#: builtin/commit.c:707 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:730 +#: builtin/commit.c:729 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:734 +#: builtin/commit.c:733 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:738 builtin/merge.c:1079 -#, c-format -msgid "could not read '%s'" -msgstr "kunde inte läsa \"%s\"" - -#: builtin/commit.c:785 +#: builtin/commit.c:784 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:803 +#: builtin/commit.c:802 #, c-format msgid "" "\n" @@ -4470,7 +4946,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:808 +#: builtin/commit.c:807 #, c-format msgid "" "\n" @@ -4485,7 +4961,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:820 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4495,7 +4971,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:827 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4506,145 +4982,145 @@ 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:848 +#: builtin/commit.c:847 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:855 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:863 +#: builtin/commit.c:862 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:880 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:938 +#: builtin/commit.c:937 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:953 builtin/tag.c:495 +#: builtin/commit.c:952 builtin/tag.c:495 #, 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:1055 +#: builtin/commit.c:1054 #, 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:1070 builtin/commit.c:1310 +#: builtin/commit.c:1069 builtin/commit.c:1309 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1107 +#: builtin/commit.c:1106 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1137 +#: builtin/commit.c:1136 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:1146 +#: builtin/commit.c:1145 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1149 +#: builtin/commit.c:1148 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:1151 +#: builtin/commit.c:1150 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:1154 +#: builtin/commit.c:1153 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1164 +#: builtin/commit.c:1163 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:1166 +#: builtin/commit.c:1165 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:1174 +#: builtin/commit.c:1173 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:1191 +#: builtin/commit.c:1190 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:1193 +#: builtin/commit.c:1192 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:1195 +#: builtin/commit.c:1194 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:1197 +#: builtin/commit.c:1196 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:1209 builtin/tag.c:728 +#: builtin/commit.c:1208 builtin/tag.c:730 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1213 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1324 builtin/commit.c:1603 +#: builtin/commit.c:1323 builtin/commit.c:1602 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1326 builtin/commit.c:1605 +#: builtin/commit.c:1325 builtin/commit.c:1604 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509 +#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1331 builtin/commit.c:1609 +#: builtin/commit.c:1330 builtin/commit.c:1608 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1334 builtin/commit.c:1612 +#: builtin/commit.c:1333 builtin/commit.c:1611 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980 -#: builtin/fast-export.c:983 builtin/tag.c:603 +#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981 +#: builtin/fast-export.c:984 builtin/tag.c:604 msgid "mode" msgstr "läge" -#: builtin/commit.c:1337 builtin/commit.c:1615 +#: builtin/commit.c:1336 builtin/commit.c:1614 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:1340 +#: builtin/commit.c:1339 msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1341 parse-options.h:152 +#: builtin/commit.c:1340 parse-options.h:155 msgid "when" msgstr "när" -#: builtin/commit.c:1342 +#: builtin/commit.c:1341 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4652,209 +5128,196 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1343 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1430 +#: builtin/commit.c:1429 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1432 +#: builtin/commit.c:1431 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1477 +#: builtin/commit.c:1476 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1480 +#: builtin/commit.c:1479 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1573 +#: builtin/commit.c:1572 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1574 +#: builtin/commit.c:1573 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1576 +#: builtin/commit.c:1575 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1577 builtin/tag.c:601 +#: builtin/commit.c:1576 builtin/tag.c:602 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1578 +#: builtin/commit.c:1577 msgid "author" msgstr "författare" -#: builtin/commit.c:1578 +#: builtin/commit.c:1577 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1579 builtin/gc.c:280 +#: builtin/commit.c:1578 builtin/gc.c:268 msgid "date" msgstr "datum" -#: builtin/commit.c:1579 +#: builtin/commit.c:1578 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391 -#: builtin/notes.c:554 builtin/tag.c:599 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392 +#: builtin/notes.c:555 builtin/tag.c:600 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1580 +#: builtin/commit.c:1579 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1581 +#: builtin/commit.c:1580 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1582 +#: builtin/commit.c:1581 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1583 +#: builtin/commit.c:1582 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1584 +#: builtin/commit.c:1583 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:1585 +#: builtin/commit.c:1584 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:1586 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1587 +#: builtin/commit.c:1586 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1588 +#: builtin/commit.c:1587 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1589 +#: builtin/commit.c:1588 msgid "default" msgstr "standard" -#: builtin/commit.c:1589 builtin/tag.c:604 +#: builtin/commit.c:1588 builtin/tag.c:605 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" -#: builtin/commit.c:1590 +#: builtin/commit.c:1589 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92 -#: builtin/tag.c:605 -msgid "key-id" -msgstr "nyckel-id" - -#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156 +#: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1595 +#: builtin/commit.c:1594 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1596 +#: builtin/commit.c:1595 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1597 +#: builtin/commit.c:1596 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1598 +#: builtin/commit.c:1597 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1599 +#: builtin/commit.c:1598 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1600 +#: builtin/commit.c:1599 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1601 +#: builtin/commit.c:1600 msgid "bypass pre-commit hook" msgstr "förbigå pre-commit-krok" -#: builtin/commit.c:1602 +#: builtin/commit.c:1601 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1613 +#: builtin/commit.c:1612 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1614 +#: builtin/commit.c:1613 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1619 +#: builtin/commit.c:1618 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1621 +#: builtin/commit.c:1620 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1650 +#: builtin/commit.c:1649 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1689 builtin/merge.c:1076 -#, c-format -msgid "could not open '%s' for reading" -msgstr "kunde inte öppna \"%s\" för läsning" - -#: builtin/commit.c:1696 +#: builtin/commit.c:1695 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1703 +#: builtin/commit.c:1702 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1722 +#: builtin/commit.c:1721 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1733 +#: builtin/commit.c:1732 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1738 +#: builtin/commit.c:1737 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854 -msgid "failed to write commit object" -msgstr "kunde inte skriva incheckningsobjekt" - -#: builtin/commit.c:1786 +#: builtin/commit.c:1785 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -4869,131 +5332,135 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<flaggor>]" -#: builtin/config.c:53 +#: builtin/config.c:54 msgid "Config file location" msgstr "Konfigurationsfilens plats" -#: builtin/config.c:54 +#: builtin/config.c:55 msgid "use global config file" msgstr "använd global konfigurationsfil" -#: builtin/config.c:55 +#: builtin/config.c:56 msgid "use system config file" msgstr "använd systemets konfigurationsfil" -#: builtin/config.c:56 +#: builtin/config.c:57 msgid "use repository config file" msgstr "använd arkivets konfigurationsfil" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "use given config file" msgstr "använd angiven konfigurationsfil" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "read config from given blob object" msgstr "läs konfiguration från givet blob-objekt" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "Action" msgstr "Åtgärd" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "get value: name [value-regex]" msgstr "hämta värde: namn [värde-reguttr]" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "get all values: key [value-regex]" msgstr "hämta alla värden: nyckel [värde-reguttr]" -#: builtin/config.c:62 +#: builtin/config.c:63 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:63 +#: builtin/config.c:64 msgid "get value specific for the URL: section[.var] URL" msgstr "hämta värde specifikt URL:en: sektion[.var] URL" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "replace all matching variables: name value [value_regex]" msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "add a new variable: name value" msgstr "lägg till en ny variabel: namn värde" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "remove a variable: name [value-regex]" msgstr "ta bort en variabel: namn [värde-reguttr]" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "remove all matches: name [value-regex]" msgstr "ta bort alla träffar: namn [värde-reguttr]" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "rename section: old-name new-name" msgstr "byt namn på sektion: gammalt-namn nytt-namn" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "remove a section: name" msgstr "ta bort en sektion: namn" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "list all" msgstr "visa alla" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "open an editor" msgstr "öppna textredigeringsprogram" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "find the color configured: slot [default]" msgstr "hitta den inställda färgen: slot [default]" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "find the color setting: slot [stdout-is-tty]" msgstr "hitta färginställningen: slot [stdout-is-tty]" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "Type" msgstr "Typ" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "value is \"true\" or \"false\"" msgstr "värdet är \"true\" eller \"false\"" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "value is decimal number" msgstr "värdet är ett decimalt tal" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "value is --bool or --int" msgstr "värdet är --bool eller --int" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "value is a path (file or directory name)" msgstr "värdet är en sökväg (fil- eller katalognamn)" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "Other" msgstr "Andra" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "terminate values with NUL byte" msgstr "terminera värden med NUL-byte" -#: builtin/config.c:81 +#: builtin/config.c:82 +msgid "show variable names only" +msgstr "visa endast variabelnamn" + +#: builtin/config.c:83 msgid "respect include directives on lookup" msgstr "respektera inkluderingsdirektiv vid uppslag" -#: builtin/config.c:316 +#: builtin/config.c:311 msgid "unable to parse default color value" msgstr "kan inte tolka standardfärgvärde" -#: builtin/config.c:457 +#: builtin/config.c:449 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5008,7 +5475,7 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:587 +#: builtin/config.c:583 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" @@ -5044,7 +5511,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:452 +#: builtin/describe.c:250 builtin/log.c:459 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" @@ -5190,229 +5657,229 @@ msgstr "mer än två blobbar angavs: \"%s\"" msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." -#: builtin/fast-export.c:24 +#: builtin/fast-export.c:25 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" -#: builtin/fast-export.c:979 +#: builtin/fast-export.c:980 msgid "show progress after <n> objects" msgstr "visa förlopp efter <n> objekt" -#: builtin/fast-export.c:981 +#: builtin/fast-export.c:982 msgid "select handling of signed tags" msgstr "välj hantering av signerade taggar" -#: builtin/fast-export.c:984 +#: builtin/fast-export.c:985 msgid "select handling of tags that tag filtered objects" msgstr "välj hantering av taggar som har taggfiltrerade objekt" -#: builtin/fast-export.c:987 +#: builtin/fast-export.c:988 msgid "Dump marks to this file" msgstr "Dump märken till filen" -#: builtin/fast-export.c:989 +#: builtin/fast-export.c:990 msgid "Import marks from this file" msgstr "Importera märken från filen" -#: builtin/fast-export.c:991 +#: builtin/fast-export.c:992 msgid "Fake a tagger when tags lack one" msgstr "Fejka taggare när taggen saknar en" -#: builtin/fast-export.c:993 +#: builtin/fast-export.c:994 msgid "Output full tree for each commit" msgstr "Skriv ut hela trädet för varje incheckning" -#: builtin/fast-export.c:995 +#: builtin/fast-export.c:996 msgid "Use the done feature to terminate the stream" msgstr "Använd done-funktionen för att avsluta strömmen" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:997 msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" -#: builtin/fast-export.c:997 +#: builtin/fast-export.c:998 msgid "refspec" msgstr "referensspecifikation" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:999 msgid "Apply refspec to exported refs" msgstr "Applicera referensspecifikation på exporterade referenser" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1000 msgid "anonymize output" msgstr "anonymisera utdata" -#: builtin/fetch.c:19 +#: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/fetch.c:20 +#: builtin/fetch.c:21 msgid "git fetch [<options>] <group>" msgstr "git fetch [<flaggor>] <grupp>" -#: builtin/fetch.c:21 +#: builtin/fetch.c:22 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:89 +#: builtin/fetch.c:90 builtin/pull.c:162 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:91 +#: builtin/fetch.c:92 builtin/pull.c:165 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:93 +#: builtin/fetch.c:94 builtin/pull.c:168 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:94 +#: builtin/fetch.c:95 builtin/pull.c:170 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/fetch.c:96 +#: builtin/fetch.c:97 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:98 +#: builtin/fetch.c:99 builtin/pull.c:172 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:100 +#: builtin/fetch.c:101 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:102 +#: builtin/fetch.c:103 builtin/pull.c:175 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:103 +#: builtin/fetch.c:104 builtin/pull.c:178 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:104 +#: builtin/fetch.c:105 builtin/pull.c:179 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:108 +#: builtin/fetch.c:109 builtin/pull.c:184 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:110 +#: builtin/fetch.c:111 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:113 +#: builtin/fetch.c:114 builtin/pull.c:187 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:115 +#: builtin/fetch.c:116 builtin/pull.c:190 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:117 builtin/log.c:1208 +#: builtin/fetch.c:118 builtin/log.c:1233 msgid "dir" msgstr "kat" -#: builtin/fetch.c:118 +#: builtin/fetch.c:119 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:121 +#: builtin/fetch.c:122 msgid "default mode for recursion" msgstr "standardläge för rekursion" -#: builtin/fetch.c:123 +#: builtin/fetch.c:124 builtin/pull.c:193 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:124 +#: builtin/fetch.c:125 builtin/pull.c:195 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:125 +#: builtin/fetch.c:126 builtin/pull.c:196 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:377 +#: builtin/fetch.c:378 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:457 +#: builtin/fetch.c:458 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:462 +#: builtin/fetch.c:463 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:476 +#: builtin/fetch.c:477 #, 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:477 builtin/fetch.c:563 +#: builtin/fetch.c:478 builtin/fetch.c:564 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:488 +#: builtin/fetch.c:489 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543 +#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544 msgid " (unable to update local ref)" msgstr " (kunde inte uppdatera lokal ref)" -#: builtin/fetch.c:508 +#: builtin/fetch.c:509 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:511 +#: builtin/fetch.c:512 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:514 +#: builtin/fetch.c:515 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:559 +#: builtin/fetch.c:560 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:559 +#: builtin/fetch.c:560 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:565 +#: builtin/fetch.c:566 msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:599 builtin/fetch.c:832 +#: builtin/fetch.c:600 builtin/fetch.c:842 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: builtin/fetch.c:608 +#: builtin/fetch.c:609 #, 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:626 +#: builtin/fetch.c:627 #, 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:714 builtin/fetch.c:797 +#: builtin/fetch.c:715 builtin/fetch.c:807 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:725 +#: builtin/fetch.c:726 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5421,55 +5888,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:777 +#: builtin/fetch.c:778 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:778 +#: builtin/fetch.c:779 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:802 +#: builtin/fetch.c:811 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:803 builtin/remote.c:1057 +#: builtin/fetch.c:812 builtin/remote.c:1034 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:822 +#: builtin/fetch.c:832 #, 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:841 +#: builtin/fetch.c:851 #, 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:844 +#: builtin/fetch.c:854 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:900 +#: builtin/fetch.c:910 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:1063 +#: builtin/fetch.c:1071 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1065 builtin/remote.c:90 +#: builtin/fetch.c:1073 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1083 +#: builtin/fetch.c:1091 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5477,216 +5944,207 @@ 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:1106 +#: builtin/fetch.c:1114 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1148 +#: builtin/fetch.c:1156 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1150 +#: builtin/fetch.c:1158 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1173 +#: builtin/fetch.c:1181 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1175 +#: builtin/fetch.c:1183 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1186 +#: builtin/fetch.c:1194 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1194 +#: builtin/fetch.c:1202 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" -#: builtin/fmt-merge-msg.c:13 +#: builtin/fmt-merge-msg.c:14 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]" -#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698 -#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 -#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590 -#: parse-options.h:131 parse-options.h:238 -msgid "n" -msgstr "n" - -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:670 msgid "populate log with at most <n> entries from shortlog" msgstr "fyll i loggen med som mest <n> poster från shortlog" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:673 msgid "alias for --log (deprecated)" msgstr "alias för --log (avråds)" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:676 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:676 +#: builtin/fmt-merge-msg.c:677 msgid "use <text> as start of message" msgstr "inled meddelande med <text>" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:678 msgid "file to read from" msgstr "fil att läsa från" -#: builtin/for-each-ref.c:687 -msgid "unable to parse format" -msgstr "kan inte tolka formatet" - -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:9 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<flaggor>] [<mönster>]" -#: builtin/for-each-ref.c:1098 +#: builtin/for-each-ref.c:24 msgid "quote placeholders suitably for shells" msgstr "citera platshållare passande för skal" -#: builtin/for-each-ref.c:1100 +#: builtin/for-each-ref.c:26 msgid "quote placeholders suitably for perl" msgstr "citera platshållare passande för perl" -#: builtin/for-each-ref.c:1102 +#: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for python" msgstr "citera platshållare passande för python" -#: builtin/for-each-ref.c:1104 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for Tcl" msgstr "citera platshållare passande för Tcl" -#: builtin/for-each-ref.c:1107 +#: builtin/for-each-ref.c:33 msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:1108 builtin/replace.c:438 -msgid "format" -msgstr "format" - -#: builtin/for-each-ref.c:1108 +#: builtin/for-each-ref.c:34 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/for-each-ref.c:1109 +#: builtin/for-each-ref.c:35 msgid "key" msgstr "nyckel" -#: builtin/for-each-ref.c:1110 +#: builtin/for-each-ref.c:36 msgid "field name to sort on" msgstr "fältnamn att sortera på" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:147 builtin/prune.c:137 +#: builtin/fsck.c:163 builtin/prune.c:137 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: builtin/fsck.c:548 +#: builtin/fsck.c:568 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:611 +#: builtin/fsck.c:631 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:617 +#: builtin/fsck.c:637 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:618 +#: builtin/fsck.c:638 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:619 +#: builtin/fsck.c:639 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:620 +#: builtin/fsck.c:640 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:621 +#: builtin/fsck.c:641 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:622 +#: builtin/fsck.c:642 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:623 +#: builtin/fsck.c:643 msgid "also consider packs and alternate objects" msgstr "ta även hänsyn till paket och alternativa objekt" -#: builtin/fsck.c:624 +# Vague original, not networking-related, but rather related to the actual +# objects in the database. +#: builtin/fsck.c:644 +msgid "check only connectivity" +msgstr "kontrollera endast konnektivitet" + +#: builtin/fsck.c:645 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:626 +#: builtin/fsck.c:647 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:627 builtin/prune.c:107 +#: builtin/fsck.c:648 builtin/prune.c:107 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:677 +#: builtin/fsck.c:707 msgid "Checking objects" msgstr "Kontrollerar objekt" -#: builtin/gc.c:24 +#: builtin/gc.c:25 msgid "git gc [<options>]" msgstr "git gc [<flaggor>]" -#: builtin/gc.c:67 +#: builtin/gc.c:55 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: builtin/gc.c:112 +#: builtin/gc.c:100 #, c-format msgid "insanely long object directory %.*s" msgstr "tokigt lång objektkatalog %.*s" -#: builtin/gc.c:281 +#: builtin/gc.c:269 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:283 +#: builtin/gc.c:271 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:284 +#: builtin/gc.c:272 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:285 +#: builtin/gc.c:273 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:327 +#: builtin/gc.c:315 #, 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:329 +#: builtin/gc.c:317 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:330 +#: builtin/gc.c:318 #, 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:348 +#: builtin/gc.c:336 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5694,7 +6152,7 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:376 +#: builtin/gc.c:364 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5938,7 +6396,7 @@ msgstr "" msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <sökvägslista>" -#: builtin/hash-object.c:92 builtin/tag.c:612 +#: builtin/hash-object.c:92 builtin/tag.c:614 msgid "type" msgstr "typ" @@ -6092,129 +6550,129 @@ msgstr "användning: %s%s" msgid "`git %s' is aliased to `%s'" msgstr "\"git %s\" är ett alias för \"%s\"" -#: builtin/index-pack.c:151 +#: builtin/index-pack.c:152 #, c-format msgid "unable to open %s" msgstr "kunde inte öppna %s" -#: builtin/index-pack.c:201 +#: builtin/index-pack.c:202 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" -#: builtin/index-pack.c:221 +#: builtin/index-pack.c:222 #, c-format msgid "did not receive expected object %s" msgstr "emottog inte det förväntade objektet %s" -#: builtin/index-pack.c:224 +#: builtin/index-pack.c:225 #, 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:266 +#: builtin/index-pack.c:267 #, 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:276 +#: builtin/index-pack.c:277 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:277 +#: builtin/index-pack.c:278 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:289 +#: builtin/index-pack.c:290 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:296 +#: builtin/index-pack.c:297 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:312 +#: builtin/index-pack.c:313 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:318 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:331 +#: builtin/index-pack.c:332 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:333 +#: builtin/index-pack.c:334 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:351 +#: builtin/index-pack.c:352 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "paketet har felaktigt objekt vid index %lu: %s" -#: builtin/index-pack.c:472 +#: builtin/index-pack.c:473 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:521 +#: builtin/index-pack.c:522 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:529 +#: builtin/index-pack.c:530 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:537 +#: builtin/index-pack.c:538 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:568 +#: builtin/index-pack.c:569 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:570 +#: builtin/index-pack.c:571 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "för tidigt slut på paketfilen, %lu byte saknas" msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas" -#: builtin/index-pack.c:596 +#: builtin/index-pack.c:597 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771 -#: builtin/index-pack.c:805 builtin/index-pack.c:814 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:745 builtin/pack-objects.c:162 +#: builtin/index-pack.c:746 builtin/pack-objects.c:162 #: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:811 +#: builtin/index-pack.c:812 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:825 +#: builtin/index-pack.c:826 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:839 +#: builtin/index-pack.c:840 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" @@ -6328,7 +6786,7 @@ msgstr "felaktig pack.indexversion=%<PRIu32>" msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1658 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1663 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" @@ -6357,110 +6815,110 @@ 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:1622 +#: builtin/index-pack.c:1623 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1670 builtin/index-pack.c:1673 -#: builtin/index-pack.c:1685 builtin/index-pack.c:1689 +#: builtin/index-pack.c:1675 builtin/index-pack.c:1678 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1694 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1703 +#: builtin/index-pack.c:1708 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1707 builtin/index-pack.c:1716 +#: builtin/index-pack.c:1712 builtin/index-pack.c:1721 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1724 +#: builtin/index-pack.c:1729 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/init-db.c:35 +#: builtin/init-db.c:36 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" -#: builtin/init-db.c:62 +#: builtin/init-db.c:63 #, c-format msgid "insanely long template name %s" msgstr "tokigt långt namn på mallen %s" -#: builtin/init-db.c:67 +#: builtin/init-db.c:68 #, c-format msgid "cannot stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: builtin/init-db.c:73 +#: builtin/init-db.c:74 #, c-format msgid "cannot stat template '%s'" msgstr "kan inte ta status på mallen \"%s\"" -#: builtin/init-db.c:80 +#: builtin/init-db.c:81 #, c-format msgid "cannot opendir '%s'" msgstr "kan inte öppna katalogen (opendir) \"%s\"" -#: builtin/init-db.c:97 +#: builtin/init-db.c:98 #, c-format msgid "cannot readlink '%s'" msgstr "kan inte läsa länk (readlink) \"%s\"" -#: builtin/init-db.c:99 +#: builtin/init-db.c:100 #, c-format msgid "insanely long symlink %s" msgstr "tokigt lång symbolisk länk %s" -#: builtin/init-db.c:102 +#: builtin/init-db.c:103 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\"" -#: builtin/init-db.c:106 +#: builtin/init-db.c:107 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "kan inte kopiera \"%s\" till \"%s\"" -#: builtin/init-db.c:110 +#: builtin/init-db.c:111 #, c-format msgid "ignoring template %s" msgstr "ignorerar mallen %s" -#: builtin/init-db.c:136 +#: builtin/init-db.c:137 #, c-format msgid "insanely long template path %s" msgstr "tokigt lång mallsökväg %s" -#: builtin/init-db.c:144 +#: builtin/init-db.c:145 #, c-format msgid "templates not found %s" msgstr "mallarna hittades inte %s" -#: builtin/init-db.c:157 +#: builtin/init-db.c:158 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\"" -#: builtin/init-db.c:211 +#: builtin/init-db.c:212 #, c-format msgid "insane git directory %s" msgstr "tokig git-katalog %s" -#: builtin/init-db.c:343 builtin/init-db.c:346 +#: builtin/init-db.c:344 builtin/init-db.c:347 #, c-format msgid "%s already exists" msgstr "%s finns redan" -#: builtin/init-db.c:374 +#: builtin/init-db.c:375 #, c-format msgid "unable to handle file type %d" msgstr "kan inte hantera filtyp %d" -#: builtin/init-db.c:377 +#: builtin/init-db.c:378 #, c-format msgid "unable to move %s to %s" msgstr "kan inte flytta %s till %s" @@ -6468,24 +6926,24 @@ msgstr "kan inte flytta %s till %s" #. TRANSLATORS: The first '%s' is either "Reinitialized #. existing" or "Initialized empty", the second " shared" or #. "", and the last '%s%s' is the verbatim directory name. -#: builtin/init-db.c:433 +#: builtin/init-db.c:434 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git-arkiv i %s%s\n" -#: builtin/init-db.c:434 +#: builtin/init-db.c:435 msgid "Reinitialized existing" msgstr "Ominitierade befintligt" -#: builtin/init-db.c:434 +#: builtin/init-db.c:435 msgid "Initialized empty" msgstr "Initierade tomt" -#: builtin/init-db.c:435 +#: builtin/init-db.c:436 msgid " shared" msgstr " delat" -#: builtin/init-db.c:482 +#: builtin/init-db.c:483 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -6493,29 +6951,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" "shared[=<behörigheter>]] [<katalog>]" -#: builtin/init-db.c:505 +#: builtin/init-db.c:506 msgid "permissions" msgstr "behörigheter" -#: builtin/init-db.c:506 +#: builtin/init-db.c:507 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:508 builtin/prune-packed.c:57 builtin/repack.c:171 -msgid "be quiet" -msgstr "var tyst" - -#: builtin/init-db.c:540 builtin/init-db.c:545 +#: builtin/init-db.c:541 builtin/init-db.c:546 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:549 +#: builtin/init-db.c:550 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:570 +#: builtin/init-db.c:571 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6524,7 +6978,7 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:598 +#: builtin/init-db.c:599 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" @@ -6549,283 +7003,278 @@ msgstr "släprad" msgid "trailer(s) to add" msgstr "släprad(er) att lägga till" -#: builtin/log.c:41 +#: builtin/log.c:43 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/log.c:42 +#: builtin/log.c:44 msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." -#: builtin/log.c:81 +#: builtin/log.c:83 #, c-format msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:127 +#: builtin/log.c:131 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: builtin/log.c:128 +#: builtin/log.c:132 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:129 +#: builtin/log.c:133 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:130 +#: builtin/log.c:134 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:133 +#: builtin/log.c:137 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:229 +#: builtin/log.c:233 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:458 +#: builtin/log.c:465 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:472 builtin/log.c:564 +#: builtin/log.c:479 builtin/log.c:572 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:588 +#: builtin/log.c:596 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:689 +#: builtin/log.c:714 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:773 +#: builtin/log.c:798 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:789 +#: builtin/log.c:814 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:803 +#: builtin/log.c:828 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:813 +#: builtin/log.c:838 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:919 +#: builtin/log.c:944 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:998 +#: builtin/log.c:1023 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1026 +#: builtin/log.c:1051 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1071 +#: builtin/log.c:1096 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1186 +#: builtin/log.c:1211 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:1189 +#: builtin/log.c:1214 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1193 +#: builtin/log.c:1218 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1195 +#: builtin/log.c:1220 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1197 +#: builtin/log.c:1222 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1198 +#: builtin/log.c:1223 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1199 +#: builtin/log.c:1224 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1201 +#: builtin/log.c:1226 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1203 +#: builtin/log.c:1228 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1205 +#: builtin/log.c:1230 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1208 +#: builtin/log.c:1233 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1211 +#: builtin/log.c:1236 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1214 +#: builtin/log.c:1239 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1216 +#: builtin/log.c:1241 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1218 +#: builtin/log.c:1243 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1220 +#: builtin/log.c:1245 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1221 +#: builtin/log.c:1246 msgid "header" msgstr "huvud" -#: builtin/log.c:1222 +#: builtin/log.c:1247 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1223 builtin/log.c:1225 +#: builtin/log.c:1248 builtin/log.c:1250 msgid "email" msgstr "epost" -#: builtin/log.c:1223 +#: builtin/log.c:1248 msgid "add To: header" msgstr "Lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1225 +#: builtin/log.c:1250 msgid "add Cc: header" msgstr "Lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1227 +#: builtin/log.c:1252 msgid "ident" msgstr "ident" -#: builtin/log.c:1228 +#: builtin/log.c:1253 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:1230 +#: builtin/log.c:1255 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1231 +#: builtin/log.c:1256 msgid "make first mail a reply to <message-id>" msgstr "Gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1232 builtin/log.c:1235 +#: builtin/log.c:1257 builtin/log.c:1260 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1233 +#: builtin/log.c:1258 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1236 +#: builtin/log.c:1261 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1240 +#: builtin/log.c:1265 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1242 +#: builtin/log.c:1267 msgid "signature" msgstr "signatur" -#: builtin/log.c:1243 +#: builtin/log.c:1268 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1245 +#: builtin/log.c:1270 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1246 +#: builtin/log.c:1271 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1320 -#, c-format -msgid "invalid ident line: %s" -msgstr "ogiltig ident-rad: %s" - -#: builtin/log.c:1335 +#: builtin/log.c:1360 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1337 +#: builtin/log.c:1362 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix och -k kan inte användas samtidigt." -#: builtin/log.c:1345 +#: builtin/log.c:1370 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1347 +#: builtin/log.c:1372 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1349 +#: builtin/log.c:1374 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1372 +#: builtin/log.c:1397 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1374 +#: builtin/log.c:1399 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1472 +#: builtin/log.c:1496 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1535 +#: builtin/log.c:1559 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1583 +#: builtin/log.c:1607 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1637 +#: builtin/log.c:1661 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" -#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662 +#: builtin/log.c:1672 builtin/log.c:1674 builtin/log.c:1686 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" @@ -6989,32 +7438,32 @@ msgstr "Tillgängliga strategier är:" msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:193 +#: builtin/merge.c:193 builtin/pull.c:119 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:196 +#: builtin/merge.c:196 builtin/pull.c:122 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:197 +#: builtin/merge.c:197 builtin/pull.c:125 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:199 +#: builtin/merge.c:199 builtin/pull.c:128 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:202 +#: builtin/merge.c:202 builtin/pull.c:131 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:204 +#: builtin/merge.c:204 builtin/pull.c:134 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:206 +#: builtin/merge.c:206 builtin/pull.c:137 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" @@ -7022,7 +7471,7 @@ msgstr "redigera meddelande innan incheckning" msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:209 +#: builtin/merge.c:209 builtin/pull.c:143 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" @@ -7030,19 +7479,20 @@ msgstr "avbryt om snabbspolning inte är möjlig" 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:214 builtin/notes.c:753 builtin/revert.c:89 +#: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148 +#: builtin/revert.c:89 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:215 +#: builtin/merge.c:215 builtin/pull.c:149 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:216 +#: builtin/merge.c:216 builtin/pull.c:152 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:217 +#: builtin/merge.c:217 builtin/pull.c:153 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" @@ -7080,6 +7530,12 @@ msgstr " (inget att platta till)" msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" +#: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 +#: builtin/merge.c:988 +#, c-format +msgid "Could not write to '%s'" +msgstr "Kunde inte skriva till \"%s\"" + #: builtin/merge.c:372 msgid "Writing SQUASH_MSG" msgstr "Skriver SQUASH_MSG" @@ -7103,10 +7559,6 @@ msgstr "\"%s\" verkar inte peka på en incheckning" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:632 -msgid "git write-tree failed to write a tree" -msgstr "git write-tree misslyckades skriva ett träd" - #: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." @@ -7203,10 +7655,6 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1227 git-pull.sh:74 -msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." - #: builtin/merge.c:1231 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" @@ -7500,7 +7948,7 @@ msgstr "%s, källa=%s, mål=%s" msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361 +#: builtin/mv.c:256 builtin/remote.c:722 builtin/repack.c:362 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" @@ -7545,11 +7993,11 @@ msgstr "tillåt att skriva \"odefinierade\" namn (standard)" msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" -#: builtin/notes.c:24 +#: builtin/notes.c:25 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]" -#: builtin/notes.c:25 +#: builtin/notes.c:26 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" @@ -7557,12 +8005,12 @@ msgstr "" "git notes [--ref <anteckningsref>] add [-f] [--allow-empty] [-m <medd> | -F " "<fil> | (-c | -C) <objekt>] [<objekt>]" -#: builtin/notes.c:26 +#: builtin/notes.c:27 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" "git notes [--ref <anteckningsref>] copy [-f] <från-objekt> <till-objekt>" -#: builtin/notes.c:27 +#: builtin/notes.c:28 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" @@ -7570,204 +8018,194 @@ msgstr "" "git notes [--ref <anteckningsref>] append [--allow-empty] [-m <medd> | -F " "<fil> | (-c | -C) <objekt>] [<objekt>]" -#: builtin/notes.c:28 +#: builtin/notes.c:29 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <anteckningsref>] edit [--allow-empty] [<objekt>]" -#: builtin/notes.c:29 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <anteckningsref>] show [<objekt>]" -#: builtin/notes.c:30 +#: builtin/notes.c:31 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" "git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi>] " "<anteckningsref>" -#: builtin/notes.c:31 +#: builtin/notes.c:32 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:32 +#: builtin/notes.c:33 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:33 +#: builtin/notes.c:34 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]" -#: builtin/notes.c:34 +#: builtin/notes.c:35 msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref <anteckningsref>] prune [-n | -v]" -#: builtin/notes.c:35 +#: builtin/notes.c:36 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <anteckningsref>] get-ref" -#: builtin/notes.c:40 +#: builtin/notes.c:41 msgid "git notes [list [<object>]]" msgstr "git notes [list [<objekt>]]" -#: builtin/notes.c:45 +#: builtin/notes.c:46 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<flaggor>] [<objekt>]" -#: builtin/notes.c:50 +#: builtin/notes.c:51 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<flaggor>] <från-objekt> <till-objekt>" -#: builtin/notes.c:51 +#: builtin/notes.c:52 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<från-objekt> <till-objekt>]..." -#: builtin/notes.c:56 +#: builtin/notes.c:57 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<flaggor>] [<objekt>]" -#: builtin/notes.c:61 +#: builtin/notes.c:62 msgid "git notes edit [<object>]" msgstr "git notes edit [<objekt>]" -#: builtin/notes.c:66 +#: builtin/notes.c:67 msgid "git notes show [<object>]" msgstr "git notes show [<objekt>]" -#: builtin/notes.c:71 +#: builtin/notes.c:72 msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<flaggor>] <anteckningsref>" -#: builtin/notes.c:72 +#: builtin/notes.c:73 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<flaggor>]" -#: builtin/notes.c:73 +#: builtin/notes.c:74 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<flaggor>]" -#: builtin/notes.c:78 +#: builtin/notes.c:79 msgid "git notes remove [<object>]" msgstr "git notes remove [<objekt>]" -#: builtin/notes.c:83 +#: builtin/notes.c:84 msgid "git notes prune [<options>]" msgstr "git notes prune [<flaggor>]" -#: builtin/notes.c:88 +#: builtin/notes.c:89 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:146 +#: builtin/notes.c:147 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "kunde inte starta \"show\" för objektet \"%s\"" -#: builtin/notes.c:150 +#: builtin/notes.c:151 msgid "could not read 'show' output" msgstr "kunde inte läsa utdata från \"show\"" -#: builtin/notes.c:158 +#: builtin/notes.c:159 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" -#: builtin/notes.c:173 builtin/tag.c:477 +#: builtin/notes.c:174 builtin/tag.c:477 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: builtin/notes.c:192 +#: builtin/notes.c:193 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:201 +#: builtin/notes.c:202 msgid "unable to write note object" msgstr "kunde inte skriva anteckningsobjekt" -#: builtin/notes.c:203 +#: builtin/notes.c:204 #, c-format msgid "The note contents have been left in %s" msgstr "Anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:231 builtin/tag.c:693 +#: builtin/notes.c:232 builtin/tag.c:695 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:233 builtin/tag.c:696 +#: builtin/notes.c:234 builtin/tag.c:698 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" -#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305 -#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506 -#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652 -#: builtin/notes.c:854 builtin/tag.c:709 +#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 +#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507 +#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653 +#: builtin/notes.c:877 builtin/tag.c:711 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/notes.c:255 +#: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." msgstr "Kunde inte läsa objektet \"%s\"." -#: builtin/notes.c:259 +#: builtin/notes.c:260 #, 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:299 -#, c-format -msgid "Malformed input line: '%s'." -msgstr "Felaktig indatarad: \"%s\"." - -#: builtin/notes.c:314 -#, c-format -msgid "Failed to copy notes from '%s' to '%s'" -msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" - -#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489 -#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645 -#: builtin/notes.c:919 +#: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490 +#: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646 +#: builtin/notes.c:942 msgid "too many parameters" msgstr "för många parametrar" -#: builtin/notes.c:371 builtin/notes.c:658 +#: builtin/notes.c:372 builtin/notes.c:659 #, c-format msgid "No note found for object %s." msgstr "Inga anteckningar hittades för objektet %s." -#: builtin/notes.c:392 builtin/notes.c:555 +#: builtin/notes.c:393 builtin/notes.c:556 msgid "note contents as a string" msgstr "anteckningsinnehåll som sträng" -#: builtin/notes.c:395 builtin/notes.c:558 +#: builtin/notes.c:396 builtin/notes.c:559 msgid "note contents in a file" msgstr "anteckningsinnehåll i en fil" -#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560 -#: builtin/notes.c:563 builtin/tag.c:628 +#: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561 +#: builtin/notes.c:564 builtin/tag.c:630 msgid "object" msgstr "objekt" -#: builtin/notes.c:398 builtin/notes.c:561 +#: builtin/notes.c:399 builtin/notes.c:562 msgid "reuse and edit specified note object" msgstr "återanvänd och redigera angivet anteckningsobjekt" -#: builtin/notes.c:401 builtin/notes.c:564 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "reuse specified note object" msgstr "återanvänd angivet anteckningsobjekt" -#: builtin/notes.c:404 builtin/notes.c:567 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "allow storing empty note" msgstr "tillåt lagra tom anteckning" -#: builtin/notes.c:405 builtin/notes.c:476 +#: builtin/notes.c:406 builtin/notes.c:477 msgid "replace existing notes" msgstr "ersätt befintliga anteckningar" -#: builtin/notes.c:430 +#: builtin/notes.c:431 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7776,29 +8214,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:445 builtin/notes.c:524 +#: builtin/notes.c:446 builtin/notes.c:525 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859 +#: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" -#: builtin/notes.c:477 +#: builtin/notes.c:478 msgid "read objects from stdin" msgstr "läs objekt från standard in" -#: builtin/notes.c:479 +#: builtin/notes.c:480 msgid "load rewriting config for <command> (implies --stdin)" msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)" -#: builtin/notes.c:497 +#: builtin/notes.c:498 msgid "too few parameters" msgstr "för få parametrar" -#: builtin/notes.c:518 +#: builtin/notes.c:519 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7807,12 +8245,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:530 +#: builtin/notes.c:531 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: builtin/notes.c:582 +#: builtin/notes.c:583 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -7821,15 +8259,15 @@ msgstr "" "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" -#: builtin/notes.c:750 +#: builtin/notes.c:764 msgid "General options" msgstr "Allmänna flaggor" -#: builtin/notes.c:752 +#: builtin/notes.c:766 msgid "Merge options" msgstr "Flaggor för sammanslagning" -#: builtin/notes.c:754 +#: builtin/notes.c:768 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -7837,57 +8275,66 @@ msgstr "" "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:756 +#: builtin/notes.c:770 msgid "Committing unmerged notes" msgstr "Checkar in ej sammanslagna anteckningar" -#: builtin/notes.c:758 +#: builtin/notes.c:772 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:760 +#: builtin/notes.c:774 msgid "Aborting notes merge resolution" msgstr "Avbryt lösning av sammanslagning av anteckningar" -#: builtin/notes.c:762 +#: builtin/notes.c:776 msgid "abort notes merge" msgstr "avbryt sammanslagning av anteckningar" -#: builtin/notes.c:857 +#: builtin/notes.c:853 +#, 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:880 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:869 +#: builtin/notes.c:892 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:872 +#: builtin/notes.c:895 msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:953 +#: builtin/notes.c:976 msgid "notes-ref" msgstr "anteckningar-ref" -#: builtin/notes.c:954 +#: builtin/notes.c:977 msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:989 builtin/remote.c:1618 +#: builtin/notes.c:1012 builtin/remote.c:1588 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" #: builtin/pack-objects.c:28 -msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" -msgstr "git pack-objects --stdout [flaggor...] [< reflista | < objektlista]" +msgid "" +"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" +msgstr "" +"git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]" #: builtin/pack-objects.c:29 -msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" -msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]" +msgid "" +"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" +msgstr "" +"git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" #: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format @@ -7916,153 +8363,143 @@ msgstr "indexversionen %s stöds ej" msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2595 -#, c-format -msgid "option %s does not accept negative form" -msgstr "flaggan %s godtar inte negativ form" - -#: builtin/pack-objects.c:2599 -#, c-format -msgid "unable to parse value '%s' for option %s" -msgstr "kunde inte tolka värdet \"%s\" för flaggan %s" - -#: builtin/pack-objects.c:2619 +#: builtin/pack-objects.c:2602 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2604 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2606 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2609 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsmätaren visas" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:2610 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2611 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2614 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2633 +#: builtin/pack-objects.c:2616 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2618 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2620 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2622 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:2641 +#: builtin/pack-objects.c:2624 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:2643 +#: builtin/pack-objects.c:2626 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2628 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2630 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2632 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:2651 +#: builtin/pack-objects.c:2634 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2636 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2638 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:2658 +#: builtin/pack-objects.c:2641 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2644 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2664 +#: builtin/pack-objects.c:2647 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2650 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2652 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2654 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2672 parse-options.h:139 +#: builtin/pack-objects.c:2655 parse-options.h:142 msgid "time" msgstr "tid" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2656 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2676 +#: builtin/pack-objects.c:2659 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2678 +#: builtin/pack-objects.c:2661 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2663 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2665 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2667 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2669 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:2688 +#: builtin/pack-objects.c:2671 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:2779 +#: builtin/pack-objects.c:2762 msgid "Counting objects" msgstr "Räknar objekt" @@ -8090,31 +8527,191 @@ 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:112 +#: builtin/prune.c:105 builtin/worktree.c:121 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" -#: builtin/prune.c:106 builtin/worktree.c:113 +#: builtin/prune.c:106 builtin/worktree.c:122 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:109 builtin/worktree.c:115 +#: builtin/prune.c:109 builtin/worktree.c:124 msgid "expire objects older than <time>" msgstr "låt tid gå ut för objekt äldre än <tid>" -#: builtin/push.c:14 +#: builtin/pull.c:69 +msgid "git pull [options] [<repository> [<refspec>...]]" +msgstr "git pull [flaggor] [<arkiv> [<refspec>...]]" + +#: builtin/pull.c:113 +msgid "Options related to merging" +msgstr "Alternativ gällande sammanslagning" + +#: builtin/pull.c:115 +msgid "false|true|preserve" +msgstr "false|true|preserve" + +#: builtin/pull.c:116 +msgid "incorporate changes by rebasing rather than merging" +msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" + +#: builtin/pull.c:140 builtin/revert.c:105 +msgid "allow fast-forward" +msgstr "tillåt snabbspolning" + +#: builtin/pull.c:146 +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:160 +msgid "Options related to fetching" +msgstr "Alternativ gällande hämtningar" + +#: builtin/pull.c:268 +#, c-format +msgid "Invalid value for pull.ff: %s" +msgstr "Felaktigt värde för pull.ff: %s" + +#: builtin/pull.c:352 +msgid "Cannot pull with rebase: You have unstaged changes." +msgstr "Kan inte hämta med ombasering: Du har oköade ändringar." + +#: builtin/pull.c:358 +msgid "Additionally, your index contains uncommitted changes." +msgstr "Dessutom innehåller dit index ändringar som inte har checkats in." + +#: builtin/pull.c:360 +msgid "Cannot pull with rebase: Your index contains uncommitted changes." +msgstr "" +"Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar." + +#: builtin/pull.c:436 +msgid "" +"There is no candidate for rebasing against among the refs that you just " +"fetched." +msgstr "" +"Det finns ingen kandidat för ombasering bland referenserna du precis har " +"hämtat." + +#: builtin/pull.c:438 +msgid "" +"There are no candidates for merging among the refs that you just fetched." +msgstr "" +"Det finns ingen kandidat för sammanslagning bland referenserna du precis har " +"hämtat." + +#: builtin/pull.c:439 +msgid "" +"Generally this means that you provided a wildcard refspec which had no\n" +"matches on the remote end." +msgstr "" +"Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n" +"motsvarade något i fjärränden." + +#: builtin/pull.c:442 +#, c-format +msgid "" +"You asked to pull from the remote '%s', but did not specify\n" +"a branch. Because this is not the default configured remote\n" +"for your current branch, you must specify a branch on the command line." +msgstr "" +"Du bad om att hämta från fjärren \"%s\", men angav inte någon\n" +"gren. Eftersom det inte är den fjärr som är konfigurerad som\n" +"standard för aktuell gren måste du ange en gren på kommandoraden." + +#: builtin/pull.c:447 +msgid "You are not currently on a branch." +msgstr "Du är inte på någon gren för närvarande." + +#: builtin/pull.c:449 builtin/pull.c:464 +msgid "Please specify which branch you want to rebase against." +msgstr "Ange vilken gren du vill ombasera mot." + +#: builtin/pull.c:451 builtin/pull.c:466 +msgid "Please specify which branch you want to merge with." +msgstr "Ange vilken gren du vill slå samman med." + +#: builtin/pull.c:452 builtin/pull.c:467 +msgid "See git-pull(1) for details." +msgstr "Se git-pull(1) för detaljer." + +#: builtin/pull.c:462 +msgid "There is no tracking information for the current branch." +msgstr "Det finns ingen spårningsinformation för aktuell gren." + +#: builtin/pull.c:471 +#, c-format +msgid "" +"If you wish to set tracking information for this branch you can do so with:\n" +"\n" +" git branch --set-upstream-to=%s/<branch> %s\n" +msgstr "" +"Om du vill ange spårningsinformation för grenen kan du göra det med:\n" +"\n" +" git branch --set-upstream-to=%s/<gren> %s\n" + +#: builtin/pull.c:476 +#, c-format +msgid "" +"Your configuration specifies to merge with the ref '%s'\n" +"from the remote, but no such ref was fetched." +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:830 +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:859 +#, c-format +msgid "" +"fetch updated the current branch head.\n" +"fast-forwarding your working tree from\n" +"commit %s." +msgstr "" +"fetch uppdaterade huvudet för aktuell gren.\n" +"snabbspolar din arbetskatalog från\n" +"incheckningen %s." + +#: builtin/pull.c:864 +#, c-format +msgid "" +"Cannot fast-forward your working tree.\n" +"After making sure that you saved anything precious from\n" +"$ git diff %s\n" +"output, run\n" +"$ git reset --hard\n" +"to recover." +msgstr "" +"Kan inte snabbspola din arbetskatalog.\n" +"När du är säker på att du har sparat allt värdefullt i utdata från\n" +"$ git diff %s\n" +"kör du\n" +"$ git reset --hard\n" +"för att återgå." + +#: builtin/pull.c:879 +msgid "Cannot merge multiple branches into empty head." +msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." + +#: builtin/pull.c:883 +msgid "Cannot rebase onto multiple branches." +msgstr "Kan inte ombasera ovanpå flera grenar." + +#: builtin/push.c:15 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/push.c:85 +#: builtin/push.c:86 msgid "tag shorthand without <tag>" msgstr "taggförkortning utan <tagg>" -#: builtin/push.c:95 +#: builtin/push.c:96 msgid "--delete only accepts plain target ref names" msgstr "--delete godtar endast enkla målreferensnamn" -#: builtin/push.c:139 +#: builtin/push.c:140 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -8123,7 +8720,7 @@ msgstr "" "För att välja ett av alternativen permanent, se push.default i \"git help " "config\"." -#: builtin/push.c:142 +#: builtin/push.c:143 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -8148,7 +8745,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:157 +#: builtin/push.c:158 #, c-format msgid "" "You are not currently on a branch.\n" @@ -8163,7 +8760,7 @@ msgstr "" "\n" " git push %s HEAD:<namn-på-fjärrgren>\n" -#: builtin/push.c:171 +#: builtin/push.c:172 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -8176,12 +8773,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:179 +#: builtin/push.c:180 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända." -#: builtin/push.c:182 +#: builtin/push.c:183 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -8192,7 +8789,7 @@ msgstr "" "aktuella grenen \"%s\", utan att tala om för mig vad som\n" "skall sändas för att uppdatera fjärrgrenen." -#: builtin/push.c:205 +#: builtin/push.c:206 msgid "" "push.default is unset; its implicit value has changed in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -8240,14 +8837,14 @@ msgstr "" "liknande läget \"current\" istället för \"simple\" om du ibland använder\n" "äldre versioner av Git.)" -#: builtin/push.c:272 +#: builtin/push.c:273 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Du angav inga referensspecifikationer att sända, och push.default är " "\"nothing\"." -#: builtin/push.c:279 +#: builtin/push.c:280 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -8259,7 +8856,7 @@ msgstr "" "\"git pull ....\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:285 +#: builtin/push.c:286 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -8271,7 +8868,7 @@ msgstr "" "\"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:291 +#: builtin/push.c:292 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -8285,11 +8882,11 @@ msgstr "" "(t.ex. \"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer." -#: builtin/push.c:298 +#: builtin/push.c:299 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren." -#: builtin/push.c:301 +#: builtin/push.c:302 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -8300,22 +8897,22 @@ msgstr "" "pekar på något som inte är en incheckning, utan att använda flaggan\n" "\"--force\".\n" -#: builtin/push.c:360 +#: builtin/push.c:361 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:364 +#: builtin/push.c:365 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:394 +#: builtin/push.c:395 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:395 +#: builtin/push.c:396 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -8336,109 +8933,110 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:410 +#: builtin/push.c:411 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:411 +#: builtin/push.c:412 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:416 +#: builtin/push.c:417 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:417 +#: builtin/push.c:418 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:422 +#: builtin/push.c:423 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:502 +#: builtin/push.c:539 msgid "repository" msgstr "arkiv" -#: builtin/push.c:503 +#: builtin/push.c:540 builtin/send-pack.c:161 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:504 +#: builtin/push.c:541 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:506 +#: builtin/push.c:543 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:507 +#: builtin/push.c:544 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:510 +#: builtin/push.c:547 builtin/send-pack.c:164 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:512 +#: builtin/push.c:549 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "refnamn>:<förvänta" -#: builtin/push.c:513 +#: builtin/push.c:550 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:516 +#: builtin/push.c:553 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:518 +#: builtin/push.c:555 builtin/send-pack.c:169 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:519 builtin/push.c:520 +#: builtin/push.c:556 builtin/push.c:557 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:521 +#: builtin/push.c:558 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:524 +#: builtin/push.c:561 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:526 +#: builtin/push.c:563 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:527 +#: builtin/push.c:564 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:529 +#: builtin/push.c:567 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:530 +#: builtin/push.c:569 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "begär atomiska transaktioner på fjärrsidan" -#: builtin/push.c:539 +#: builtin/push.c:579 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är inkompatibel med --all, --mirror och --tags" -#: builtin/push.c:541 +#: builtin/push.c:581 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" #: builtin/read-tree.c:37 msgid "" -"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])" @@ -8506,12 +9104,12 @@ msgstr "hoppa över att applicera filter för gles utcheckning" msgid "debug unpack-trees" msgstr "felsök unpack-trees" -#: builtin/reflog.c:430 +#: builtin/reflog.c:432 #, c-format -msgid "%s' for '%s' is not a valid timestamp" +msgid "'%s' for '%s' is not a valid timestamp" msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" -#: builtin/reflog.c:547 builtin/reflog.c:552 +#: builtin/reflog.c:549 builtin/reflog.c:554 #, c-format msgid "'%s' is not a valid timestamp" msgstr "\"%s\" är inte en giltig tidsstämpel" @@ -8648,12 +9246,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:187 builtin/remote.c:640 +#: builtin/remote.c:187 builtin/remote.c:637 #, c-format msgid "remote %s already exists." msgstr "fjärrarkivet %s finns redan." -#: builtin/remote.c:191 builtin/remote.c:644 +#: builtin/remote.c:191 builtin/remote.c:641 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" @@ -8676,27 +9274,27 @@ msgstr "(matchande)" msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 +#: builtin/remote.c:588 builtin/remote.c:594 builtin/remote.c:600 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Kunde inte tillämpa \"%s\" på \"%s\"" -#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892 +#: builtin/remote.c:630 builtin/remote.c:769 builtin/remote.c:869 #, c-format msgid "No such remote: %s" msgstr "Inget sådant fjärrarkiv: %s" -#: builtin/remote.c:650 +#: builtin/remote.c:647 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:656 builtin/remote.c:844 +#: builtin/remote.c:653 builtin/remote.c:821 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:671 +#: builtin/remote.c:668 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8707,32 +9305,27 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:677 +#: builtin/remote.c:674 #, c-format msgid "Could not append '%s'" msgstr "Kunde inte lägga till på \"%s\"" -#: builtin/remote.c:688 +#: builtin/remote.c:685 #, c-format msgid "Could not set '%s'" msgstr "Kunde inte sätta \"%s\"" -#: builtin/remote.c:710 +#: builtin/remote.c:707 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:744 +#: builtin/remote.c:741 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:763 -#, c-format -msgid "Could not remove branch %s" -msgstr "Kunde inte ta bort grenen %s" - -#: builtin/remote.c:830 +#: builtin/remote.c:807 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8746,262 +9339,262 @@ 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:945 +#: builtin/remote.c:922 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:948 +#: builtin/remote.c:925 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:950 +#: builtin/remote.c:927 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:952 +#: builtin/remote.c:929 msgid " ???" msgstr " ???" -#: builtin/remote.c:993 +#: builtin/remote.c:970 #, 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:1000 +#: builtin/remote.c:977 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:1003 +#: builtin/remote.c:980 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:1004 +#: builtin/remote.c:981 msgid " and with remote" msgstr " och med fjärren" -#: builtin/remote.c:1006 +#: builtin/remote.c:983 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:1007 +#: builtin/remote.c:984 msgid " and with remote" msgstr " och med fjärren" -#: builtin/remote.c:1053 +#: builtin/remote.c:1030 msgid "create" msgstr "skapa" -#: builtin/remote.c:1056 +#: builtin/remote.c:1033 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1060 +#: builtin/remote.c:1037 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1063 +#: builtin/remote.c:1040 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1066 +#: builtin/remote.c:1043 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1073 +#: builtin/remote.c:1050 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1076 +#: builtin/remote.c:1053 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1080 +#: builtin/remote.c:1057 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1083 +#: builtin/remote.c:1060 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1151 +#: builtin/remote.c:1128 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1178 +#: builtin/remote.c:1155 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1179 +#: builtin/remote.c:1156 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1180 builtin/remote.c:1331 +#: builtin/remote.c:1157 builtin/remote.c:1308 msgid "(no URL)" msgstr "(ingen URL)" -#: builtin/remote.c:1189 builtin/remote.c:1191 +#: builtin/remote.c:1166 builtin/remote.c:1168 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197 +#: builtin/remote.c:1170 builtin/remote.c:1172 builtin/remote.c:1174 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1199 +#: builtin/remote.c:1176 #, 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:1211 +#: builtin/remote.c:1188 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1214 builtin/remote.c:1241 +#: builtin/remote.c:1191 builtin/remote.c:1218 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1223 +#: builtin/remote.c:1200 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:1231 +#: builtin/remote.c:1208 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1238 +#: builtin/remote.c:1215 #, 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:1259 +#: builtin/remote.c:1236 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1261 +#: builtin/remote.c:1238 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1276 +#: builtin/remote.c:1253 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1278 +#: builtin/remote.c:1255 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:1288 +#: builtin/remote.c:1265 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1273 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1275 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1316 +#: builtin/remote.c:1293 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1317 +#: builtin/remote.c:1294 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1327 +#: builtin/remote.c:1304 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1328 +#: builtin/remote.c:1305 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1351 +#: builtin/remote.c:1321 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1354 +#: builtin/remote.c:1324 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1399 +#: builtin/remote.c:1369 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1465 builtin/remote.c:1539 +#: builtin/remote.c:1435 builtin/remote.c:1509 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1485 +#: builtin/remote.c:1455 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1492 +#: builtin/remote.c:1462 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1514 +#: builtin/remote.c:1484 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1516 +#: builtin/remote.c:1486 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1518 +#: builtin/remote.c:1488 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1525 +#: builtin/remote.c:1495 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1565 +#: builtin/remote.c:1535 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1573 +#: builtin/remote.c:1543 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1575 +#: builtin/remote.c:1545 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/remote.c:1589 +#: builtin/remote.c:1559 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" @@ -9073,7 +9666,7 @@ msgstr "maximal storlek på varje paketfil" msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:377 +#: builtin/repack.c:378 #, c-format msgid "removing '%s' failed" msgstr "misslyckades ta bort \"%s\"" @@ -9258,11 +9851,6 @@ msgstr "registrera endast att borttagna sökvägar kommer läggas till senare" msgid "Failed to resolve '%s' as a valid revision." msgstr "Kunde inte slå upp \"%s\" som en giltig revision." -#: builtin/reset.c:308 builtin/reset.c:316 -#, c-format -msgid "Could not parse object '%s'." -msgstr "Kan inte tolka objektet \"%s\"" - #: builtin/reset.c:313 #, c-format msgid "Failed to resolve '%s' as a valid tree." @@ -9304,6 +9892,10 @@ 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:354 +msgid "rev-list does not support display of notes" +msgstr "rev-list stöder inte visning av anteckningar" + #: builtin/rev-parse.c:361 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]" @@ -9320,7 +9912,7 @@ msgstr "sluta tolka efter första argument som inte är flagga" msgid "output in stuck long form" msgstr "utdata fast i lång form" -#: builtin/rev-parse.c:499 +#: builtin/rev-parse.c:502 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -9396,10 +9988,6 @@ msgstr "alternativ för sammanslagningsstrategi" msgid "append commit name" msgstr "lägg till incheckningsnamn" -#: builtin/revert.c:105 -msgid "allow fast-forward" -msgstr "tillåt snabbspolning" - #: builtin/revert.c:106 msgid "preserve initially empty commits" msgstr "behåll incheckningar som börjar som tomma" @@ -9525,6 +10113,34 @@ msgstr "tar inte bort \"%s\" rekursivt utan -r" msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" +#: builtin/send-pack.c:18 +msgid "" +"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" +"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " +"[<ref>...]\n" +" --all and explicit <ref> specification are mutually exclusive." +msgstr "" +"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" +"receive-pack>] [--verbose] [--thin] [--atomic] [<värd>:]<katalog> " +"[<ref>...]\n" +" --all och explicit angiven <ref> är ömsesidigt uteslutande." + +#: builtin/send-pack.c:160 +msgid "remote name" +msgstr "fjärrnamn" + +#: builtin/send-pack.c:171 +msgid "use stateless RPC protocol" +msgstr "använd tillståndslöst RPC-protokoll" + +#: builtin/send-pack.c:172 +msgid "read refs from stdin" +msgstr "läs referenser från standard in" + +#: builtin/send-pack.c:173 +msgid "print status from remote helper" +msgstr "visa status från fjärrhjälpare" + #: builtin/shortlog.c:13 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" @@ -9699,11 +10315,11 @@ msgstr "ta bort symbolisk referens" msgid "shorten ref output" msgstr "förkorta ref-utdata" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "skäl" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "skäl till uppdateringen" @@ -9828,110 +10444,114 @@ msgstr "flaggan \"points-at\" behöver ett objekt" msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: builtin/tag.c:589 +#: builtin/tag.c:590 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:591 +#: builtin/tag.c:592 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:593 +#: builtin/tag.c:594 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:594 +#: builtin/tag.c:595 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:596 +#: builtin/tag.c:597 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:598 +#: builtin/tag.c:599 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:600 +#: builtin/tag.c:601 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:602 +#: builtin/tag.c:603 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:606 +#: builtin/tag.c:607 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:607 +#: builtin/tag.c:608 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:609 +#: builtin/tag.c:609 builtin/update-ref.c:368 +msgid "create_reflog" +msgstr "create_reflog" + +#: builtin/tag.c:611 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:610 +#: builtin/tag.c:612 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:612 +#: builtin/tag.c:614 msgid "sort tags" msgstr "sortera taggar" -#: builtin/tag.c:617 builtin/tag.c:623 +#: builtin/tag.c:619 builtin/tag.c:625 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:629 +#: builtin/tag.c:631 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:655 +#: builtin/tag.c:657 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:667 +#: builtin/tag.c:669 msgid "--sort and -n are incompatible" msgstr "--sort och -n är inkompatibla" -#: builtin/tag.c:674 +#: builtin/tag.c:676 msgid "-n option is only allowed with -l." msgstr "Flaggan -n är endast tillåten tillsammans med -l." -#: builtin/tag.c:676 +#: builtin/tag.c:678 msgid "--contains option is only allowed with -l." msgstr "Flaggan --contains är endast tillåten tillsammans med -l" -#: builtin/tag.c:678 +#: builtin/tag.c:680 msgid "--points-at option is only allowed with -l." msgstr "Flaggan --points-at är endast tillåten tillsammans med -l." -#: builtin/tag.c:686 +#: builtin/tag.c:688 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:706 +#: builtin/tag.c:708 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:712 +#: builtin/tag.c:714 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:717 +#: builtin/tag.c:719 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:741 +#: builtin/tag.c:744 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" -#: builtin/unpack-objects.c:489 +#: builtin/unpack-objects.c:490 msgid "Unpacking objects" msgstr "Packar upp objekt" @@ -10132,19 +10752,19 @@ msgstr "git update-ref [<flaggor>] <refnamn> <gammaltvärde> [<nyttvärde>]" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<flaggor>] --stdin [-z]" -#: builtin/update-ref.c:359 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "ta bort referensen" -#: builtin/update-ref.c:361 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "uppdatera <refnamn> inte det den pekar på" -#: builtin/update-ref.c:362 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "standard in har NUL-terminerade argument" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "läs uppdateringar från standard in" @@ -10160,10 +10780,14 @@ msgstr "uppdatera informationsfilerna från grunden" msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <incheckning>..." -#: builtin/verify-commit.c:75 +#: builtin/verify-commit.c:72 msgid "print commit contents" msgstr "visa innehåll för incheckning" +#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +msgid "print raw gpg status output" +msgstr "visa råa gpg-statusdata" + #: builtin/verify-pack.c:54 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..." @@ -10180,87 +10804,83 @@ msgstr "visa endast statistik" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <tagg>..." -#: builtin/verify-tag.c:73 +#: builtin/verify-tag.c:83 msgid "print tag contents" msgstr "visa innehåll för tag" -#: builtin/worktree.c:11 +#: builtin/worktree.c:13 msgid "git worktree add [<options>] <path> <branch>" msgstr "git worktree add [<flaggor>] <sökväg> <gren>" -#: builtin/worktree.c:12 +#: builtin/worktree.c:14 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<flaggor>]" -#: builtin/worktree.c:27 +#: builtin/worktree.c:36 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Tar bort worktrees/%s: inte en giltig katalog" -#: builtin/worktree.c:33 +#: builtin/worktree.c:42 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" -#: builtin/worktree.c:38 +#: builtin/worktree.c:47 #, 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:49 +#: builtin/worktree.c:58 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" -#: builtin/worktree.c:65 +#: builtin/worktree.c:74 #, 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:100 +#: builtin/worktree.c:109 #, c-format msgid "failed to remove: %s" msgstr "misslyckades ta bort: %s" -#: builtin/worktree.c:186 +#: builtin/worktree.c:198 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:207 +#: builtin/worktree.c:232 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:241 -msgid "unable to resolve HEAD" -msgstr "kan inte bestämma HEAD" - -#: builtin/worktree.c:249 +#: builtin/worktree.c:268 #, c-format -msgid "Enter %s (identifier %s)" -msgstr "Går in i %s (identifieraren %s)" +msgid "Preparing %s (identifier %s)" +msgstr "Förbereder %s (identifieraren %s)" -#: builtin/worktree.c:281 +#: builtin/worktree.c:316 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:283 +#: builtin/worktree.c:318 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:285 +#: builtin/worktree.c:320 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:286 +#: builtin/worktree.c:321 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/worktree.c:292 -msgid "-b and -B are mutually exclusive" -msgstr "-b och -B kan inte användas samtidigt" +#: builtin/worktree.c:328 +msgid "-b, -B, and --detach are mutually exclusive" +msgstr "-b, -B och --detach är ömsesidigt uteslutande" #: builtin/write-tree.c:13 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" @@ -10278,7 +10898,7 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" -#: credential-cache--daemon.c:267 +#: credential-cache--daemon.c:255 msgid "print debugging messages to stderr" msgstr "skriv felsökningsmeddelanden på standard fel" @@ -10292,338 +10912,160 @@ 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." -#: common-cmds.h:10 +#: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "starta arbetskatalog (se också: git help tutorial)" -#: common-cmds.h:11 +#: common-cmds.h:10 msgid "work on the current change (see also: git help everyday)" msgstr "jobba med aktuell förändring (se också: git help everyday)" -#: common-cmds.h:12 +#: common-cmds.h:11 msgid "examine the history and state (see also: git help revisions)" msgstr "utforska historiken och tillståndet (se också: git help revisions)" -#: common-cmds.h:13 +#: common-cmds.h:12 msgid "grow, mark and tweak your common history" msgstr "utöka, markera och justera din gemensamma historik" -#: common-cmds.h:14 +#: common-cmds.h:13 msgid "collaborate (see also: git help workflows)" msgstr "samarbeta (se också: git help workflows)" -#: common-cmds.h:18 +#: common-cmds.h:17 msgid "Add file contents to the index" msgstr "Lägg filinnehåll till indexet" -#: common-cmds.h:19 -msgid "Find by binary search the change that introduced a bug" -msgstr "Binärsök för att hitta ändringen som introducerade ett fel" +#: common-cmds.h:18 +msgid "Use binary search to find the commit that introduced a bug" +msgstr "Använd binärsökning för att hitta ändringen som introducerade ett fel" -#: common-cmds.h:20 +#: common-cmds.h:19 msgid "List, create, or delete branches" msgstr "Visa, skapa eller ta bort grenar" -#: common-cmds.h:21 +#: common-cmds.h:20 msgid "Switch branches or restore working tree files" msgstr "Byt till en ny gren eller återställ filer i arbetskatalogen" -#: common-cmds.h:22 +#: common-cmds.h:21 msgid "Clone a repository into a new directory" msgstr "Klona ett arkiv till en ny katalog" -#: common-cmds.h:23 +#: common-cmds.h:22 msgid "Record changes to the repository" msgstr "Protokollför ändringar i arkivet" -#: common-cmds.h:24 +#: common-cmds.h:23 msgid "Show changes between commits, commit and working tree, etc" msgstr "Visa ändringar mellan incheckningar, med arbetskatalogen, osv" -#: common-cmds.h:25 +#: common-cmds.h:24 msgid "Download objects and refs from another repository" msgstr "Hämta objekt och referenser från annat arkiv" -#: common-cmds.h:26 +#: common-cmds.h:25 msgid "Print lines matching a pattern" msgstr "Visa rader som motsvarar mönster" -#: common-cmds.h:27 +#: common-cmds.h:26 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt" -#: common-cmds.h:28 +#: common-cmds.h:27 msgid "Show commit logs" msgstr "Visa incheckningsloggar" -#: common-cmds.h:29 +#: common-cmds.h:28 msgid "Join two or more development histories together" msgstr "Slå ihop två eller flera utvecklingshistorier" -#: common-cmds.h:30 +#: common-cmds.h:29 msgid "Move or rename a file, a directory, or a symlink" msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk" -#: common-cmds.h:31 +#: common-cmds.h:30 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Hämta från och integrera med annat arkiv eller en lokal gren" -#: common-cmds.h:32 +#: common-cmds.h:31 msgid "Update remote refs along with associated objects" msgstr "Uppdatera fjärr-referenser och tillhörande objekt" -#: common-cmds.h:33 +#: common-cmds.h:32 msgid "Forward-port local commits to the updated upstream head" msgstr "Framåtanpassa lokala kommandon på uppdaterat uppströmshuvud" -#: common-cmds.h:34 +#: common-cmds.h:33 msgid "Reset current HEAD to the specified state" msgstr "Återställ aktuell HEAD till angivet tillstånd" -#: common-cmds.h:35 +#: common-cmds.h:34 msgid "Remove files from the working tree and from the index" msgstr "Ta bort filer från arbetskatalogen och från indexet" -#: common-cmds.h:36 +#: common-cmds.h:35 msgid "Show various types of objects" msgstr "Visa olika sorters objekt" -#: common-cmds.h:37 +#: common-cmds.h:36 msgid "Show the working tree status" msgstr "Visa status för arbetskatalogen" -#: common-cmds.h:38 +#: common-cmds.h:37 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt" -#: parse-options.h:142 +#: parse-options.h:145 msgid "expiry-date" msgstr "giltig-till" -#: parse-options.h:157 +#: parse-options.h:160 msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:231 +#: parse-options.h:236 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:233 +#: parse-options.h:238 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:239 +#: parse-options.h:244 msgid "use <n> digits to display SHA-1s" msgstr "använd <n> siffror för att visa SHA-1:or" -#: rerere.h:27 +#: rerere.h:28 msgid "update the index with reused conflict resolution if possible" msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt" -#: git-am.sh:53 -msgid "You need to set your committer info first" -msgstr "Du måste ställa in din incheckarinformation först" - -#: git-am.sh:100 -msgid "" -"You seem to have moved HEAD since the last 'am' failure.\n" -"Not rewinding to ORIG_HEAD" -msgstr "" -"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" -"Återställer inte till ORIG_HEAD" - -#: git-am.sh:110 -#, sh-format -msgid "" -"When you have resolved this problem, run \"$cmdline --continue\".\n" -"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" -"To restore the original branch and stop patching, run \"$cmdline --abort\"." -msgstr "" -"När du har löst problemet kör du \"$cmdline --continue\".\n" -"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n" -"För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"." - -#: git-am.sh:126 -msgid "Cannot fall back to three-way merge." -msgstr "Kan inte falla tillbaka på trevägssammanslagning." - -#: git-am.sh:142 -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." - -#: git-am.sh:144 -msgid "Using index info to reconstruct a base tree..." -msgstr "Använder indexinfo för att återskapa ett basträd..." - -#: git-am.sh:159 -msgid "" -"Did you hand edit your patch?\n" -"It does not apply to blobs recorded in its index." -msgstr "" -"Har du handredigerat din patch?\n" -"Den kan inte tillämpas på blobbar som antecknats i dess index." - -#: git-am.sh:168 -msgid "Falling back to patching base and 3-way merge..." -msgstr "" -"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." - -#: git-am.sh:185 -msgid "Failed to merge in the changes." -msgstr "Misslyckades slå ihop ändringarna." - -#: git-am.sh:280 -msgid "Only one StGIT patch series can be applied at once" -msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" - -#: git-am.sh:367 -#, sh-format -msgid "Patch format $patch_format is not supported." -msgstr "Patchformatet $patch_format stöds inte." - -#: git-am.sh:369 -msgid "Patch format detection failed." -msgstr "Misslyckades detektera patchformat." - -#: git-am.sh:407 -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." -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." - -#: git-am.sh:507 -#, sh-format -msgid "previous rebase directory $dotest still exists but mbox given." -msgstr "tidigare rebase-katalog $dotest finns fortfarande, men mbox angavs." - -#: git-am.sh:512 -msgid "Please make up your mind. --skip or --abort?" -msgstr "Bestäm dig. --skip eller --abort?" - -#: git-am.sh:560 -#, sh-format -msgid "" -"Stray $dotest directory found.\n" -"Use \"git am --abort\" to remove it." -msgstr "" -"Kvarbliven katalog $dotest hittades.\n" -"Använd \"git am --abort\" för att ta bort den." - -#: git-am.sh:568 -msgid "Resolve operation not in progress, we are not resuming." -msgstr "Lösningsoperation pågår inte, vi återupptar inte." - -#: git-am.sh:635 -#, sh-format -msgid "Dirty index: cannot apply patches (dirty: $files)" -msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: $files)" - -#: git-am.sh:747 -#, sh-format -msgid "" -"Patch is empty. Was it split wrong?\n" -"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" -"To restore the original branch and stop patching run \"$cmdline --abort\"." -msgstr "" -"Patchen är tom. Delades den upp felaktigt?\n" -"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n" -"För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"." - -#: git-am.sh:774 -msgid "Patch does not have a valid e-mail address." -msgstr "Patchen har inte någon giltig e-postadress." - -#: git-am.sh:821 -msgid "cannot be interactive without stdin connected to a terminal." -msgstr "" -"kan inte vara interaktiv om standard in inte är ansluten till en terminal." - -#: git-am.sh:825 -msgid "Commit Body is:" -msgstr "Incheckningskroppen är:" - -#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] -#. in your translation. The program will only accept English -#. input at this point. -#: git-am.sh:832 -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 " - -#: git-am.sh:868 -#, sh-format -msgid "Applying: $FIRSTLINE" -msgstr "Tillämpar: $FIRSTLINE" - -#: git-am.sh:889 -msgid "" -"No changes - did you forget to use 'git add'?\n" -"If there is nothing left to stage, chances are that something else\n" -"already introduced the same changes; you might want to skip this patch." -msgstr "" -"Inga ändringar - glömde du använda \"git add\"?\n" -"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." - -#: git-am.sh:897 -msgid "" -"You still have unmerged paths in your index\n" -"did you forget to use 'git add'?" -msgstr "" -"Du har fortfarande sökvägar som inte slagits samman i ditt index\n" -"glömde du använda \"git add\"?" - -#: git-am.sh:913 -msgid "No changes -- Patch already applied." -msgstr "Inga ändringar -- Patchen har redan tillämpats." - -#: git-am.sh:923 -#, sh-format -msgid "Patch failed at $msgnum $FIRSTLINE" -msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE" - -#: git-am.sh:926 -#, sh-format -msgid "" -"The copy of the patch that failed is found in:\n" -" $dotest/patch" -msgstr "" -"En kopia av patchen som misslyckades finns i:\n" -" $dotest/patch" - -#: git-am.sh:945 -msgid "applying to an empty history" -msgstr "tillämpar på en tom historik" - -#: git-bisect.sh:48 +#: git-bisect.sh:50 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:54 +#: git-bisect.sh:56 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:95 +#: git-bisect.sh:99 #, sh-format msgid "unrecognised option: '$arg'" msgstr "flaggan känns inte igen: \"$arg\"" -#: git-bisect.sh:99 +#: git-bisect.sh:103 #, sh-format msgid "'$arg' does not appear to be a valid revision" msgstr "\"$arg\" verkar inte vara en giltig revision" -#: git-bisect.sh:117 +#: git-bisect.sh:132 msgid "Bad HEAD - I need a HEAD" msgstr "Felaktigt HEAD - Jag behöver ett HEAD" -#: git-bisect.sh:130 +#: git-bisect.sh:145 #, sh-format msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." @@ -10632,76 +11074,85 @@ msgstr "" "<giltig_gren>\"" # cogito-relaterat -#: git-bisect.sh:140 +#: git-bisect.sh:155 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:144 +#: git-bisect.sh:159 msgid "Bad HEAD - strange symbolic ref" msgstr "Felaktigt HEAD - konstig symbolisk referens" -#: git-bisect.sh:189 +#: git-bisect.sh:211 #, sh-format msgid "Bad bisect_write argument: $state" msgstr "Felaktigt argument till bisect_write: $state" -#: git-bisect.sh:218 +#: git-bisect.sh:240 #, sh-format msgid "Bad rev input: $arg" msgstr "Felaktig rev-indata: $arg" -#: git-bisect.sh:232 +#: git-bisect.sh:255 msgid "Please call 'bisect_state' with at least one argument." msgstr "Anropa \"bisect_state\" med minst ett argument." -#: git-bisect.sh:244 +#: git-bisect.sh:267 #, sh-format msgid "Bad rev input: $rev" msgstr "Felaktig rev-indata: $rev" -#: git-bisect.sh:253 -msgid "'git bisect bad' can take only one argument." -msgstr "\"git bisect bad\" kan bara ta ett argument." - #: git-bisect.sh:276 -msgid "Warning: bisecting only with a bad commit." -msgstr "Varning: utför \"bisect\" med endast en dålig incheckning" +#, sh-format +msgid "'git bisect $TERM_BAD' can take only one argument." +msgstr "\"git bisect $TERM_BAD\" kan bara ta ett argument." + +#: git-bisect.sh:299 +#, sh-format +msgid "Warning: bisecting only with a $TERM_BAD commit." +msgstr "" +"Varning: utför \"bisect\" med endast en dålig (\"$TERM_BAD\") incheckning" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:282 +#: git-bisect.sh:305 msgid "Are you sure [Y/n]? " msgstr "Är du säker [Y=ja/N=nej]? " -#: git-bisect.sh:292 +#: git-bisect.sh:317 +#, sh-format msgid "" -"You need to give me at least one good and one bad revision.\n" -"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +"You need to give me at least one $bad_syn and one $good_syn revision.\n" +"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" msgstr "" -"Du måste ange åtminstone en bra och en dålig version.\n" -"(Du kan använda \"git bisect bad\" och \"git bisect good\" för detta.)" +"Du måste ange åtminstone en dålig (\"$bad_syn\") och en bra (\"$good_syn\") " +"version.\n" +"(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för " +"detta.)" -#: git-bisect.sh:295 +#: git-bisect.sh:320 +#, sh-format msgid "" "You need to start by \"git bisect start\".\n" -"You then need to give me at least one good and one bad revision.\n" -"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +"You then need to give me at least one $good_syn and one $bad_syn revision.\n" +"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" msgstr "" "Du måste starta med \"git bisect start\".\n" -"Du måste sedan ange åtminstone en bra och en dålig version.\n" -"(Du kan använda \"git bisect bad\" och \"git bisect good\" för detta.)" +"Du måste sedan ange åtminstone en bra (\"$good_syn\") och en dålig " +"(\"$bad_syn\") version.\n" +"(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för " +"detta.)" -#: git-bisect.sh:366 git-bisect.sh:493 +#: git-bisect.sh:391 git-bisect.sh:521 msgid "We are not bisecting." msgstr "Vi utför ingen bisect för tillfället." -#: git-bisect.sh:373 +#: git-bisect.sh:398 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "\"$invalid\" är inte en giltig incheckning" -#: git-bisect.sh:382 +#: git-bisect.sh:407 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" @@ -10710,25 +11161,25 @@ msgstr "" "Kunde inte checka ut original-HEAD \"$branch\".\n" "Försök \"git bisect reset <incheckning>\"." -#: git-bisect.sh:409 +#: git-bisect.sh:435 msgid "No logfile given" msgstr "Ingen loggfil angiven" -#: git-bisect.sh:410 +#: git-bisect.sh:436 #, sh-format msgid "cannot read $file for replaying" msgstr "kan inte läsa $file för uppspelning" -#: git-bisect.sh:427 +#: git-bisect.sh:455 msgid "?? what are you talking about?" msgstr "?? vad menar du?" -#: git-bisect.sh:439 +#: git-bisect.sh:467 #, sh-format msgid "running $command" msgstr "kör $command" -#: git-bisect.sh:446 +#: git-bisect.sh:474 #, sh-format msgid "" "bisect run failed:\n" @@ -10737,11 +11188,11 @@ msgstr "" "\"bisect\"-körningen misslyckades:\n" "felkod $res från \"$command\" är < 0 eller >= 128" -#: git-bisect.sh:472 +#: git-bisect.sh:500 msgid "bisect run cannot continue any more" msgstr "\"bisect\"-körningen kan inte fortsätta längre" -#: git-bisect.sh:478 +#: git-bisect.sh:506 #, sh-format msgid "" "bisect run failed:\n" @@ -10750,54 +11201,15 @@ msgstr "" "\"bisect\"-körningen misslyckades:\n" "\"bisect_state $state\" avslutades med felkoden $res" -#: git-bisect.sh:485 +#: git-bisect.sh:513 msgid "bisect run success" msgstr "\"bisect\"-körningen lyckades" -#: git-pull.sh:61 -msgid "" -"Pull is not possible because you have unmerged files.\n" -"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" -"as appropriate to mark resolution and make a commit." -msgstr "" -"Du kan inte göra en \"pull\" då du har ändringar som inte checkats in.\n" -"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." - -#: git-pull.sh:65 -msgid "Pull is not possible because you have unmerged files." -msgstr "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in." - -#: git-pull.sh:71 -msgid "" -"You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you can merge." -msgstr "" -"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" -"Checka in dina ändringar innan du kan slå ihop." - -#: git-pull.sh:285 -msgid "updating an unborn branch with changes added to the index" -msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet" - -#: git-pull.sh:311 +#: git-bisect.sh:548 #, sh-format -msgid "" -"Warning: fetch updated the current branch head.\n" -"Warning: fast-forwarding your working tree from\n" -"Warning: commit $orig_head." +msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "" -"Varning: fetch uppdaterade huvudet för aktuell gren.\n" -"Varning: snabbspolar din arbetskatalog från\n" -"Varning: incheckningen $orig_head." - -#: git-pull.sh:336 -msgid "Cannot merge multiple branches into empty head" -msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." - -#: git-pull.sh:340 -msgid "Cannot rebase onto multiple branches" -msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar" +"Ogiltigt kommando: du utför just nu en \"bisect\" med $TERM_BAD/$TERM_GOOD." #: git-rebase.sh:57 msgid "" @@ -10978,7 +11390,7 @@ msgstr "Kan inte ta bort temporärt index (kan inte inträffa)" msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: git-stash.sh:191 +#: git-stash.sh:189 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Kan inte uppdatera $ref_stash med $w_commit" @@ -10993,7 +11405,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:241 +#: git-stash.sh:239 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -11002,90 +11414,90 @@ 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:262 +#: git-stash.sh:260 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: git-stash.sh:266 +#: git-stash.sh:264 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: git-stash.sh:270 +#: git-stash.sh:268 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: git-stash.sh:288 +#: git-stash.sh:286 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: git-stash.sh:389 +#: git-stash.sh:387 #, sh-format msgid "unknown option: $opt" msgstr "okänd flagga: $opt" -#: git-stash.sh:399 +#: git-stash.sh:397 msgid "No stash found." msgstr "Ingen \"stash\" hittades." -#: git-stash.sh:406 +#: git-stash.sh:404 #, sh-format msgid "Too many revisions specified: $REV" msgstr "För många revisioner angivna: $REV" -#: git-stash.sh:412 +#: git-stash.sh:410 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference är inte en giltig referens" -#: git-stash.sh:440 +#: git-stash.sh:438 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" -#: git-stash.sh:451 +#: git-stash.sh:449 #, sh-format msgid "'$args' is not a stash reference" msgstr "\"$args\" är inte en \"stash\"-referens" -#: git-stash.sh:459 +#: git-stash.sh:457 msgid "unable to refresh index" msgstr "kan inte uppdatera indexet" -#: git-stash.sh:463 +#: git-stash.sh:461 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:471 +#: git-stash.sh:469 msgid "Conflicts in index. Try without --index." msgstr "Konflikter i indexet. Testa utan --index." -#: git-stash.sh:473 +#: git-stash.sh:471 msgid "Could not save index tree" msgstr "Kunde inte spara indexträd" -#: git-stash.sh:507 +#: git-stash.sh:505 msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-stash.sh:522 +#: git-stash.sh:520 msgid "Index was not unstashed." msgstr "Indexet har inte tagits ur kön." -#: git-stash.sh:545 +#: git-stash.sh:543 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-stash.sh:546 +#: git-stash.sh:544 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:554 +#: git-stash.sh:552 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: git-stash.sh:626 +#: git-stash.sh:624 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" @@ -11335,7 +11747,7 @@ msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" #: git-submodule.sh:907 #, sh-format msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" msgstr "" "Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$prefix$sm_path\"" @@ -11389,6 +11801,81 @@ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" +#~ msgid "BUG: reopen a lockfile that is still open" +#~ msgstr "FEL: återöppna en låsfil som fortfarande är öppen" + +#~ msgid "BUG: reopen a lockfile that has been committed" +#~ msgstr "FEL: återöppna en låsfil som har överlämnats" + +#~ msgid "option %s does not accept negative form" +#~ msgstr "flaggan %s godtar inte negativ form" + +#~ msgid "unable to parse value '%s' for option %s" +#~ msgstr "kunde inte tolka värdet \"%s\" för flaggan %s" + +#~ msgid "unable to resolve HEAD" +#~ msgstr "kan inte bestämma HEAD" + +#~ 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" +#~ "To restore the original branch and stop patching, run \"$cmdline --abort" +#~ "\"." +#~ msgstr "" +#~ "När du har löst problemet kör du \"$cmdline --continue\".\n" +#~ "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n" +#~ "För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"." + +#~ msgid "Patch format $patch_format is not supported." +#~ msgstr "Patchformatet $patch_format stöds inte." + +#~ msgid "Please make up your mind. --skip or --abort?" +#~ msgstr "Bestäm dig. --skip eller --abort?" + +#~ msgid "" +#~ "Patch is empty. Was it split wrong?\n" +#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +#~ "To restore the original branch and stop patching run \"$cmdline --abort\"." +#~ msgstr "" +#~ "Patchen är tom. Delades den upp felaktigt?\n" +#~ "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n" +#~ "För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"." + +#~ msgid "Patch does not have a valid e-mail address." +#~ msgstr "Patchen har inte någon giltig e-postadress." + +#~ msgid "Applying: $FIRSTLINE" +#~ msgstr "Tillämpar: $FIRSTLINE" + +#~ msgid "Patch failed at $msgnum $FIRSTLINE" +#~ msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE" + +#~ msgid "" +#~ "Pull is not possible because you have unmerged files.\n" +#~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" +#~ "as appropriate to mark resolution and make a commit." +#~ msgstr "" +#~ "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in.\n" +#~ "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 "" +#~ "You have not concluded your merge (MERGE_HEAD exists).\n" +#~ "Please, commit your changes before you can merge." +#~ msgstr "" +#~ "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" +#~ "Checka in dina ändringar innan du kan slå ihop." + #~ msgid "no branch specified" #~ msgstr "inget grennamn angavs" @@ -11413,9 +11900,6 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\"" #~ msgid "Invalid gc.pruneexpire: '%s'" #~ msgstr "Ogiltig gc.pruneexpire: '%s'" -#~ msgid "server does not support --atomic push" -#~ msgstr "servern stöder inte push med --atomic" - #~ msgid "(detached from %s)" #~ msgstr "(frånkopplad från %s)" @@ -11771,9 +12255,6 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\"" #~ msgid "cherry-pick" #~ msgstr "cherry-pick" -#~ msgid "Please enter the commit message for your changes." -#~ msgstr "Ange ett incheckningsmeddelande för dina ändringar." - #~ msgid "Could not extract email from committer identity." #~ msgstr "Kunde inte extrahera e-postadress från incheckarens identitet." |