diff options
| author | Peter Krefting <peter@softwolves.pp.se> | 2014-01-21 09:26:56 +0100 |
|---|---|---|
| committer | Peter Krefting <peter@softwolves.pp.se> | 2014-01-21 09:26:56 +0100 |
| commit | d74d01808a230847dd501f38f7076765868e9fc6 (patch) | |
| tree | f545db2889a293a712c189b66e4c2e637911102e /po | |
| parent | 812b5e1c1107ff68e5992654bcd849dce93962d4 (diff) | |
| download | git-d74d01808a230847dd501f38f7076765868e9fc6.tar.gz | |
l10n: Update Swedish translation (2210t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Diffstat (limited to 'po')
| -rw-r--r-- | po/sv.po | 1759 |
1 files changed, 933 insertions, 826 deletions
@@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2013 Peter krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2014 Peter krefting <peter@softwolves.pp.se> # This file is distributed under the same license as the Git package. -# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013. +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014. # msgid "" msgstr "" "Project-Id-Version: git 1.8.4\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2013-11-02 08:06+0800\n" -"PO-Revision-Date: 2013-11-09 19:02+0100\n" +"POT-Creation-Date: 2014-01-18 07:42+0800\n" +"PO-Revision-Date: 2014-01-21 09:24+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -57,7 +57,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328 +#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -78,8 +78,8 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264 -#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680 +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265 +#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680 #: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77 #: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408 #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154 @@ -262,64 +262,64 @@ msgstr "Misslyckades låsa referens för uppdatering" msgid "Failed to write ref" msgstr "Misslyckades skriva referens" -#: bundle.c:36 +#: bundle.c:37 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ser inte ut som en v2-bundle-fil" -#: bundle.c:63 +#: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:89 builtin/commit.c:706 +#: bundle.c:90 builtin/commit.c:706 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" -#: bundle.c:140 +#: bundle.c:141 msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 -#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364 +#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" -#: bundle.c:186 +#: bundle.c:187 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Paketet (bundlen) denna referens:" msgstr[1] "Paketet (bundlen) dessa %d referenser:" -#: bundle.c:193 +#: bundle.c:194 msgid "The bundle records a complete history." msgstr "Paketet (bundlen) beskriver en komplett historik." -#: bundle.c:195 +#: bundle.c:196 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Paketet (bundlen) kräver denna referens:" msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:" -#: bundle.c:294 +#: bundle.c:296 msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261 +#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:335 +#: bundle.c:337 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:380 +#: bundle.c:382 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." @@ -354,16 +354,16 @@ msgstr "%s %s är inte en incheckning!" msgid "memory exhausted" msgstr "minnet slut" -#: connected.c:60 +#: connected.c:70 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:80 +#: connected.c:90 #, c-format msgid "failed write to rev-list: %s" msgstr "kunde inte skriva till rev-list: %s" -#: connected.c:88 +#: connected.c:98 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "kunde inte stänga rev-list:s standard in: %s" @@ -435,22 +435,27 @@ msgid_plural "%lu years ago" msgstr[0] "%lu år sedan" msgstr[1] "%lu år sedan" -#: diff.c:112 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "kunde inte läsa orderfilen \"%s\"" + +#: diff.c:113 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:117 +#: diff.c:118 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:210 +#: diff.c:213 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:260 +#: diff.c:263 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -459,7 +464,7 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:3490 +#: diff.c:3509 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -468,7 +473,7 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3504 +#: diff.c:3523 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" @@ -579,7 +584,7 @@ msgid "failed to read the cache" msgstr "misslyckads läsa cachen" #: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559 -#: builtin/clone.c:655 +#: builtin/clone.c:661 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -628,7 +633,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:774 builtin/clone.c:311 +#: merge-recursive.c:774 builtin/clone.c:317 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" @@ -678,7 +683,7 @@ msgstr "" msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1082 +#: merge-recursive.c:1082 wt-status.c:283 msgid "renamed" msgstr "namnbytt" @@ -740,7 +745,7 @@ msgstr "objektet %s är inte en blob" msgid "modify" msgstr "ändra" -#: merge-recursive.c:1565 +#: merge-recursive.c:1565 wt-status.c:281 msgid "modified" msgstr "ändrad" @@ -762,7 +767,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)" msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1634 git-submodule.sh:1125 +#: merge-recursive.c:1634 git-submodule.sh:1148 msgid "submodule" msgstr "undermodul" @@ -833,7 +838,7 @@ msgstr "sammanslagningen returnerade ingen incheckning" msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2010 builtin/merge.c:672 +#: merge-recursive.c:2010 builtin/merge.c:665 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -888,12 +893,12 @@ msgstr " %s" msgid "-NUM" msgstr "-TAL" -#: pathspec.c:118 +#: pathspec.c:133 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla" -#: pathspec.c:128 +#: pathspec.c:143 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -901,36 +906,36 @@ msgstr "" "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra " "globala sökvägsinställningar" -#: pathspec.c:158 +#: pathspec.c:177 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\"" -#: pathspec.c:164 +#: pathspec.c:183 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "felaktigt sökvägsuttryck \"%.*s\" i \"%s\"" -#: pathspec.c:168 +#: pathspec.c:187 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\"" -#: pathspec.c:186 +#: pathspec.c:205 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Tecknet \"%c\" i sökvägsuttrycket i \"%s\" har inte implementerats" -#: pathspec.c:211 +#: pathspec.c:230 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: \"literal\" och \"glob\" är inkompatibla" -#: pathspec.c:222 +#: pathspec.c:241 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: \"%s\" är utanför arkivet" -#: pathspec.c:278 +#: pathspec.c:291 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" @@ -940,42 +945,74 @@ msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" #. * name. E.g. when add--interactive dies when running #. * "checkout -p" #. -#: pathspec.c:340 +#: pathspec.c:353 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s" -#: pathspec.c:415 +#: pathspec.c:433 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" -#: remote.c:1833 +#: pathspec.c:442 +msgid "" +"There is nothing to exclude from by :(exclude) patterns.\n" +"Perhaps you forgot to add either ':/' or '.' ?" +msgstr "" +"Ingenting att exkludera från med :(exkludera)-mönster.\n" +"Glömde du kanske att antingen lägga till \":/\" eller \".\"?" + +#: remote.c:753 +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "Kan inte hämta både %s och %s till %s" + +#: remote.c:757 +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "%s spårar vanligtvis %s, inte %s" + +#: remote.c:761 +#, c-format +msgid "%s tracks both %s and %s" +msgstr "%s spårar både %s och %s" + +#. +#. * This last possibility doesn't occur because +#. * FETCH_HEAD_IGNORE entries always appear at +#. * the end of the list. +#. +#: remote.c:769 +msgid "Internal error" +msgstr "Internt fel" + +#: remote.c:1871 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n" -#: remote.c:1837 +#: remote.c:1875 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:1840 +#: remote.c:1878 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:1844 +#: remote.c:1882 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n" msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n" -#: remote.c:1850 +#: remote.c:1888 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n" -#: remote.c:1853 +#: remote.c:1891 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -985,11 +1022,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:1861 +#: remote.c:1899 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n" -#: remote.c:1864 +#: remote.c:1902 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1004,7 +1041,7 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:1874 +#: remote.c:1912 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" @@ -1017,14 +1054,14 @@ msgstr "misslyckades öppna /dev/null" msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) misslyckades" -#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903 -#: builtin/merge.c:1013 builtin/merge.c:1023 +#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896 +#: builtin/merge.c:1006 builtin/merge.c:1016 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793 -#: builtin/merge.c:1015 builtin/merge.c:1028 +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786 +#: builtin/merge.c:1008 builtin/merge.c:1021 #, c-format msgid "Could not write to '%s'" msgstr "Kunde inte skriva till \"%s\"" @@ -1264,7 +1301,7 @@ msgstr "Kan inte ångra som första incheckning" msgid "Can't cherry-pick into empty head" msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" -#: sha1_name.c:440 +#: sha1_name.c:439 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -1286,21 +1323,21 @@ msgstr "" "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" "genom att köra \"git config advice.objectNameWarning false\"" -#: sha1_name.c:1112 +#: sha1_name.c:1109 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: sha1_name.c:1115 +#: sha1_name.c:1112 #, c-format msgid "No such branch: '%s'" msgstr "Okänd gren: \"%s\"" -#: sha1_name.c:1117 +#: sha1_name.c:1114 #, c-format msgid "No upstream configured for branch '%s'" msgstr "Ingen standarduppström angiven för grenen \"%s\"" -#: sha1_name.c:1121 +#: sha1_name.c:1118 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "Uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren" @@ -1410,226 +1447,218 @@ msgstr "kan inte slå upp aktuell användare i passwd-filen: %s" msgid "no such user" msgstr "okänd användare" -#: wt-status.c:146 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "Ej sammanslagna sökvägar:" -#: wt-status.c:173 wt-status.c:200 +#: wt-status.c:177 wt-status.c:204 #, 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:175 wt-status.c:202 +#: wt-status.c:179 wt-status.c:206 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:179 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (använd \"git add <fil>...\" för att ange lösning)" -#: wt-status.c:181 wt-status.c:185 +#: wt-status.c:185 wt-status.c:189 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:183 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:194 +#: wt-status.c:198 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:212 +#: wt-status.c:216 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" -#: wt-status.c:216 +#: wt-status.c:220 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:218 +#: wt-status.c:222 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:219 +#: wt-status.c:223 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:221 +#: wt-status.c:225 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:233 +#: wt-status.c:237 #, 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:250 +#: wt-status.c:254 msgid "bug" msgstr "programfel" -#: wt-status.c:255 +#: wt-status.c:259 msgid "both deleted:" msgstr "borttaget av bägge:" -#: wt-status.c:256 +#: wt-status.c:260 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:257 +#: wt-status.c:261 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:258 +#: wt-status.c:262 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:259 +#: wt-status.c:263 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:260 +#: wt-status.c:264 msgid "both added:" msgstr "tillagt av bägge:" -#: wt-status.c:261 +#: wt-status.c:265 msgid "both modified:" msgstr "ändrat av bägge:" -#: wt-status.c:291 -msgid "new commits, " -msgstr "nya incheckningar, " - -#: wt-status.c:293 -msgid "modified content, " -msgstr "ändrat innehåll, " +#: wt-status.c:275 +msgid "new file" +msgstr "ny fil" -#: wt-status.c:295 -msgid "untracked content, " -msgstr "ospårat innehåll, " - -#: wt-status.c:312 -#, c-format -msgid "new file: %s" -msgstr "ny fil: %s" +#: wt-status.c:277 +msgid "copied" +msgstr "kopierad" -#: wt-status.c:315 -#, c-format -msgid "copied: %s -> %s" -msgstr "kopierad: %s -> %s" +#: wt-status.c:279 +msgid "deleted" +msgstr "borttagen" -#: wt-status.c:318 -#, c-format -msgid "deleted: %s" -msgstr "borttagen: %s" +#: wt-status.c:285 +msgid "typechange" +msgstr "typbyte" -#: wt-status.c:321 -#, c-format -msgid "modified: %s" -msgstr "ändrad: %s" +#: wt-status.c:287 +msgid "unknown" +msgstr "okänd" -#: wt-status.c:324 -#, c-format -msgid "renamed: %s -> %s" -msgstr "namnbyte: %s -> %s" +#: wt-status.c:289 +msgid "unmerged" +msgstr "osammanslagen" -#: wt-status.c:327 -#, c-format -msgid "typechange: %s" -msgstr "typbyte: %s" +#: wt-status.c:336 +msgid "new commits, " +msgstr "nya incheckningar, " -#: wt-status.c:330 -#, c-format -msgid "unknown: %s" -msgstr "okänd: %s" +#: wt-status.c:338 +msgid "modified content, " +msgstr "ändrat innehåll, " -#: wt-status.c:333 -#, c-format -msgid "unmerged: %s" -msgstr "osammansl.: %s" +#: wt-status.c:340 +msgid "untracked content, " +msgstr "ospårat innehåll, " -#: wt-status.c:336 +#: wt-status.c:357 #, c-format msgid "bug: unhandled diff status %c" msgstr "programfel: diff-status %c ej hanterad" -#: wt-status.c:703 +#: wt-status.c:732 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:705 +#: wt-status.c:734 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:848 +#: wt-status.c:836 +msgid "" +"Do not touch the line above.\n" +"Everything below will be removed." +msgstr "" +"Rör inte raden ovan.\n" +"Allt nedan kommer tas bort." + +#: wt-status.c:899 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:851 +#: wt-status.c:902 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:854 +#: wt-status.c:905 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:857 +#: wt-status.c:908 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:867 +#: wt-status.c:918 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:870 +#: wt-status.c:921 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:874 +#: wt-status.c:925 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:876 +#: wt-status.c:927 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:878 +#: wt-status.c:929 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:938 wt-status.c:955 +#: wt-status.c:989 wt-status.c:1006 #, 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:943 wt-status.c:960 +#: wt-status.c:994 wt-status.c:1011 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:946 +#: wt-status.c:997 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:948 +#: wt-status.c:999 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:950 +#: wt-status.c:1001 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:963 +#: wt-status.c:1014 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:967 +#: wt-status.c:1018 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1637,118 +1666,118 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:972 +#: wt-status.c:1023 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:975 +#: wt-status.c:1026 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:979 +#: wt-status.c:1030 #, 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:984 +#: wt-status.c:1035 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:987 +#: wt-status.c:1038 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:989 +#: wt-status.c:1040 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:999 +#: wt-status.c:1050 #, 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:1004 +#: wt-status.c:1055 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1007 +#: wt-status.c:1058 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1009 +#: wt-status.c:1060 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:1018 +#: wt-status.c:1069 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1023 +#: wt-status.c:1074 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1026 +#: wt-status.c:1077 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1028 +#: wt-status.c:1079 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1039 +#: wt-status.c:1090 #, 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:1043 +#: wt-status.c:1094 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1046 +#: wt-status.c:1097 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:1221 +#: wt-status.c:1272 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1228 +#: wt-status.c:1279 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå" -#: wt-status.c:1235 +#: wt-status.c:1286 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1237 +#: wt-status.c:1288 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1240 +#: wt-status.c:1291 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1257 +#: wt-status.c:1308 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1271 +#: wt-status.c:1322 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1273 +#: wt-status.c:1324 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1277 +#: wt-status.c:1328 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1760,32 +1789,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1283 +#: wt-status.c:1334 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1285 +#: wt-status.c:1336 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1291 +#: wt-status.c:1342 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1296 +#: wt-status.c:1347 #, 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:1299 +#: wt-status.c:1350 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1302 +#: wt-status.c:1353 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1794,56 +1823,56 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1305 +#: wt-status.c:1356 #, 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:1308 +#: wt-status.c:1359 #, 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:1311 wt-status.c:1316 +#: wt-status.c:1362 wt-status.c:1367 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1314 +#: wt-status.c:1365 #, 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:1318 +#: wt-status.c:1369 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1427 +#: wt-status.c:1478 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1433 +#: wt-status.c:1484 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1463 +#: wt-status.c:1514 msgid "gone" msgstr "försvunnen" -#: wt-status.c:1465 +#: wt-status.c:1516 msgid "behind " msgstr "efter " -#: wt-status.c:1468 wt-status.c:1471 +#: wt-status.c:1519 wt-status.c:1522 msgid "ahead " msgstr "före " -#: wt-status.c:1473 +#: wt-status.c:1524 msgid ", behind " msgstr ", efter " -#: compat/precompose_utf8.c:55 builtin/clone.c:350 +#: compat/precompose_utf8.c:55 builtin/clone.c:356 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -1973,15 +2002,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:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66 -#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253 +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70 +#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344 #: builtin/rm.c:269 msgid "dry run" msgstr "testkörning" #: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19 #: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612 -#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113 +#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113 msgid "be verbose" msgstr "var pratsam" @@ -2062,11 +2091,11 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" #: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919 -#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432 +#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" @@ -2400,7 +2429,7 @@ msgid "unable to read index file" msgstr "kan inte läsa indexfilen" #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90 -#: builtin/fetch.c:77 +#: builtin/fetch.c:78 msgid "path" msgstr "sökväg" @@ -2598,95 +2627,95 @@ msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil" msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)" -#: builtin/blame.c:2248 +#: builtin/blame.c:2249 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:2249 +#: builtin/blame.c:2250 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:2250 +#: builtin/blame.c:2251 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:2251 +#: builtin/blame.c:2252 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:2252 +#: builtin/blame.c:2253 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:2253 +#: builtin/blame.c:2254 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:2254 +#: builtin/blame.c:2255 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:2255 +#: builtin/blame.c:2256 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:2256 +#: builtin/blame.c:2257 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:2257 +#: builtin/blame.c:2258 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Använd samma utdataläge som git-annotate (Standard: av)" -#: builtin/blame.c:2258 +#: builtin/blame.c:2259 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:2259 +#: builtin/blame.c:2260 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:2260 +#: builtin/blame.c:2261 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:2261 +#: builtin/blame.c:2262 msgid "Show author email instead of name (Default: off)" msgstr "Visa författarens e-post istället för namn (Standard: av)" -#: builtin/blame.c:2262 +#: builtin/blame.c:2263 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:2263 +#: builtin/blame.c:2264 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:2264 +#: builtin/blame.c:2265 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list" -#: builtin/blame.c:2265 +#: builtin/blame.c:2266 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:2266 builtin/blame.c:2267 +#: builtin/blame.c:2267 builtin/blame.c:2268 msgid "score" msgstr "poäng" -#: builtin/blame.c:2266 +#: builtin/blame.c:2267 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:2267 +#: builtin/blame.c:2268 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:2268 +#: builtin/blame.c:2269 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2268 +#: builtin/blame.c:2269 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" @@ -2790,290 +2819,290 @@ msgstr "Tog bort grenen %s (var %s).\n" msgid "branch '%s' does not point at a commit" msgstr "grenen \"%s\" pekar inte på en incheckning" -#: builtin/branch.c:453 +#: builtin/branch.c:454 #, c-format msgid "[%s: gone]" msgstr "[%s: försvunnen]" -#: builtin/branch.c:456 +#: builtin/branch.c:459 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:459 +#: builtin/branch.c:464 #, c-format msgid "[%s: behind %d]" msgstr "[%s: bakom %d] " -#: builtin/branch.c:461 +#: builtin/branch.c:466 #, c-format msgid "[behind %d]" msgstr "[bakom %d] " -#: builtin/branch.c:465 +#: builtin/branch.c:470 #, c-format msgid "[%s: ahead %d]" msgstr "[%s: före %d] " -#: builtin/branch.c:467 +#: builtin/branch.c:472 #, c-format msgid "[ahead %d]" msgstr "[före %d] " -#: builtin/branch.c:470 +#: builtin/branch.c:475 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s: före %d, bakom %d] " -#: builtin/branch.c:473 +#: builtin/branch.c:478 #, c-format msgid "[ahead %d, behind %d]" msgstr "[före %d, bakom %d] " -#: builtin/branch.c:496 +#: builtin/branch.c:502 msgid " **** invalid ref ****" msgstr " **** ogiltig ref ****" -#: builtin/branch.c:588 +#: builtin/branch.c:594 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: builtin/branch.c:591 +#: builtin/branch.c:597 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" -#: builtin/branch.c:594 +#: builtin/branch.c:600 #, c-format msgid "(detached from %s)" msgstr "(frånkopplad från %s)" -#: builtin/branch.c:597 +#: builtin/branch.c:603 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:643 +#: builtin/branch.c:649 #, c-format msgid "object '%s' does not point to a commit" msgstr "objektet \"%s\" pekar på en incheckning" -#: builtin/branch.c:675 +#: builtin/branch.c:681 msgid "some refs could not be read" msgstr "vissa referenser kunde inte läsas" -#: builtin/branch.c:688 +#: builtin/branch.c:694 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:698 +#: builtin/branch.c:704 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:713 +#: builtin/branch.c:719 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:717 +#: builtin/branch.c:723 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:721 +#: builtin/branch.c:727 #, 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:728 +#: builtin/branch.c:734 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:743 +#: builtin/branch.c:749 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: builtin/branch.c:767 +#: builtin/branch.c:773 #, c-format msgid "could not write branch description template: %s" msgstr "kunde inte skriva grenbeskrivningsmall: %s" -#: builtin/branch.c:797 +#: builtin/branch.c:803 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:799 +#: builtin/branch.c:805 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:800 +#: builtin/branch.c:806 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:801 +#: builtin/branch.c:807 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:803 +#: builtin/branch.c:809 msgid "change upstream info" msgstr "ändra uppströmsinformation" -#: builtin/branch.c:807 +#: builtin/branch.c:813 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:808 +#: builtin/branch.c:814 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838 -#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461 +#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844 +#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461 #: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468 msgid "commit" msgstr "incheckning" -#: builtin/branch.c:812 builtin/branch.c:818 +#: builtin/branch.c:818 builtin/branch.c:824 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:824 +#: builtin/branch.c:830 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:825 +#: builtin/branch.c:831 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:827 +#: builtin/branch.c:833 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:828 +#: builtin/branch.c:834 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:829 +#: builtin/branch.c:835 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:830 +#: builtin/branch.c:836 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:831 +#: builtin/branch.c:837 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:832 +#: builtin/branch.c:838 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:834 +#: builtin/branch.c:840 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:835 +#: builtin/branch.c:841 msgid "force creation (when already exists)" msgstr "tvinga skapande (när den redan finns)" -#: builtin/branch.c:838 +#: builtin/branch.c:844 msgid "print only not merged branches" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:844 +#: builtin/branch.c:850 msgid "print only merged branches" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:848 +#: builtin/branch.c:854 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:861 +#: builtin/branch.c:867 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:866 builtin/clone.c:629 +#: builtin/branch.c:872 builtin/clone.c:635 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:890 +#: builtin/branch.c:896 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:896 builtin/branch.c:935 +#: builtin/branch.c:902 builtin/branch.c:941 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:911 +#: builtin/branch.c:917 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:916 +#: builtin/branch.c:922 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:923 +#: builtin/branch.c:929 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu" -#: builtin/branch.c:926 +#: builtin/branch.c:932 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:941 +#: builtin/branch.c:947 msgid "too many branches for a rename operation" msgstr "för många grenar för namnbyte" -#: builtin/branch.c:946 +#: builtin/branch.c:952 msgid "too many branches to set new upstream" msgstr "för många grenar för att byta uppström" -#: builtin/branch.c:950 +#: builtin/branch.c:956 #, 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:953 builtin/branch.c:975 builtin/branch.c:997 +#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:957 +#: builtin/branch.c:963 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:969 +#: builtin/branch.c:975 msgid "too many branches to unset upstream" msgstr "för många grenar för att ta bort uppström" -#: builtin/branch.c:973 +#: builtin/branch.c:979 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:979 +#: builtin/branch.c:985 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:994 +#: builtin/branch.c:999 msgid "it does not make sense to create 'HEAD' manually" msgstr "kan inte skapa \"HEAD\" manuellt" -#: builtin/branch.c:1000 +#: builtin/branch.c:1005 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:1003 +#: builtin/branch.c:1008 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3082,7 +3111,7 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to\n" -#: builtin/branch.c:1020 +#: builtin/branch.c:1025 #, c-format msgid "" "\n" @@ -3093,12 +3122,12 @@ msgstr "" "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" "\n" -#: builtin/branch.c:1021 +#: builtin/branch.c:1026 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:1022 +#: builtin/branch.c:1027 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -3116,43 +3145,43 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/cat-file.c:312 +#: builtin/cat-file.c:328 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "git cat-file (-t|-s|-e|-p|<typ>|--textconv) <objekt>" -#: builtin/cat-file.c:313 +#: builtin/cat-file.c:329 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <objektlista>" -#: builtin/cat-file.c:350 +#: builtin/cat-file.c:366 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:351 +#: builtin/cat-file.c:367 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:352 +#: builtin/cat-file.c:368 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:354 +#: builtin/cat-file.c:370 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:355 +#: builtin/cat-file.c:371 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:357 +#: builtin/cat-file.c:373 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:359 +#: builtin/cat-file.c:375 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:362 +#: builtin/cat-file.c:378 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" @@ -3180,7 +3209,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:1090 builtin/gc.c:259 +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -3471,7 +3500,7 @@ msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" #: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88 -#: builtin/remote.c:169 builtin/remote.c:171 +#: builtin/remote.c:159 builtin/remote.c:161 msgid "branch" msgstr "gren" @@ -3519,11 +3548,11 @@ msgstr "tvinga utcheckning (kasta bort lokala ändringar)" 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:1106 builtin/merge.c:232 +#: builtin/checkout.c:1106 builtin/merge.c:225 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251 +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248 msgid "style" msgstr "stil" @@ -3722,7 +3751,7 @@ msgid "remove whole directories" msgstr "ta bort hela kataloger" #: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718 -#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185 +#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185 msgid "pattern" msgstr "mönster" @@ -3762,8 +3791,8 @@ msgstr "" msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [flaggor] [--] <arkiv> [<kat>]" -#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229 -#: builtin/push.c:474 +#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222 +#: builtin/push.c:521 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" @@ -3823,7 +3852,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD" msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663 +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663 msgid "depth" msgstr "djup" @@ -3856,42 +3885,52 @@ msgstr "ställ in konfiguration i det nya arkivet" msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: builtin/clone.c:315 +#: builtin/clone.c:256 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "referensarkivet \"%s\" är grunt" + +#: builtin/clone.c:259 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "referensarkivet \"%s\" är ympat" + +#: builtin/clone.c:321 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/clone.c:317 builtin/diff.c:77 +#: builtin/clone.c:323 builtin/diff.c:83 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: builtin/clone.c:319 +#: builtin/clone.c:325 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:333 +#: builtin/clone.c:339 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:355 +#: builtin/clone.c:361 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:359 +#: builtin/clone.c:365 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:382 builtin/clone.c:559 +#: builtin/clone.c:388 builtin/clone.c:565 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:395 +#: builtin/clone.c:401 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -3901,100 +3940,109 @@ 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:474 +#: builtin/clone.c:480 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." -#: builtin/clone.c:554 +#: builtin/clone.c:560 #, c-format msgid "Checking connectivity... " msgstr "Kontrollerar anslutning..." -#: builtin/clone.c:557 +#: builtin/clone.c:563 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: builtin/clone.c:620 +#: builtin/clone.c:626 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:651 +#: builtin/clone.c:657 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:759 +#: builtin/clone.c:765 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:763 +#: builtin/clone.c:769 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:774 +#: builtin/clone.c:780 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:777 +#: builtin/clone.c:783 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:790 +#: builtin/clone.c:796 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:795 +#: builtin/clone.c:802 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:797 +#: builtin/clone.c:805 +msgid "source repository is shallow, ignoring --local" +msgstr "källarkivet är grunt, ignorerar --local" + +#: builtin/clone.c:810 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:807 +#: builtin/clone.c:814 builtin/fetch.c:1119 +#, c-format +msgid "depth %s is not a positive number" +msgstr "djupet %s är inte ett positivt tal" + +#: builtin/clone.c:824 #, 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:817 +#: builtin/clone.c:834 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:830 builtin/clone.c:842 +#: builtin/clone.c:847 builtin/clone.c:859 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:833 +#: builtin/clone.c:850 #, c-format msgid "could not create work tree dir '%s'." msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:852 +#: builtin/clone.c:869 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:854 +#: builtin/clone.c:871 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:888 +#: builtin/clone.c:906 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:939 builtin/clone.c:947 +#: builtin/clone.c:957 builtin/clone.c:965 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:950 +#: builtin/clone.c:968 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -4347,7 +4395,7 @@ msgstr "visa koncis status" msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460 +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507 msgid "machine-readable output" msgstr "maskinläsbar utdata" @@ -4428,7 +4476,7 @@ msgstr "författare" msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1458 builtin/gc.c:260 +#: builtin/commit.c:1458 builtin/gc.c:261 msgid "date" msgstr "datum" @@ -4436,7 +4484,7 @@ msgstr "datum" msgid "override date for commit" msgstr "överstyr datum för inchecknignen" -#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405 +#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405 #: builtin/notes.c:562 builtin/tag.c:455 msgid "message" msgstr "meddelande" @@ -4492,11 +4540,11 @@ msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461 +#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461 msgid "key id" msgstr "nyckel-id" -#: builtin/commit.c:1471 builtin/merge.c:231 +#: builtin/commit.c:1471 builtin/merge.c:224 msgid "GPG sign commit" msgstr "GPG-signera incheckning" @@ -4553,7 +4601,7 @@ msgstr "ok att registrera en ändring med tomt meddelande" msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1567 builtin/merge.c:525 +#: builtin/commit.c:1567 builtin/merge.c:518 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" @@ -4572,29 +4620,29 @@ msgstr "kunde inte läsa MERGE_MODE" msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1614 +#: builtin/commit.c:1611 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1619 +#: builtin/commit.c:1616 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886 +#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/commit.c:1655 +#: builtin/commit.c:1652 msgid "cannot lock HEAD ref" msgstr "kunde inte låsa HEAD-referens" -#: builtin/commit.c:1659 +#: builtin/commit.c:1656 msgid "cannot update HEAD ref" msgstr "kunde inte uppdatera HEAD-referens" -#: builtin/commit.c:1670 +#: builtin/commit.c:1667 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -4857,7 +4905,7 @@ msgstr "överväg de <n> nyaste taggarna (standard: 10)" msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: builtin/describe.c:423 builtin/name-rev.c:322 +#: builtin/describe.c:423 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" @@ -4881,31 +4929,31 @@ msgstr "Inga namn hittades, kan inte beskriva något." msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" -#: builtin/diff.c:79 +#: builtin/diff.c:85 #, c-format msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" -#: builtin/diff.c:230 +#: builtin/diff.c:236 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:307 +#: builtin/diff.c:357 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:350 +#: builtin/diff.c:400 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:359 +#: builtin/diff.c:409 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:366 +#: builtin/diff.c:416 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." @@ -4966,144 +5014,153 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:74 +#: builtin/fetch.c:75 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:76 +#: builtin/fetch.c:77 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:78 +#: builtin/fetch.c:79 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:79 +#: builtin/fetch.c:80 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/fetch.c:81 +#: builtin/fetch.c:82 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:83 +#: builtin/fetch.c:84 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:85 +#: builtin/fetch.c:86 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:87 +#: builtin/fetch.c:88 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:88 +#: builtin/fetch.c:89 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:89 +#: builtin/fetch.c:90 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:93 +#: builtin/fetch.c:94 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:95 +#: builtin/fetch.c:96 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:98 +#: builtin/fetch.c:99 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:100 +#: builtin/fetch.c:101 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:102 builtin/log.c:1197 +#: builtin/fetch.c:103 builtin/log.c:1197 msgid "dir" msgstr "kat" -#: builtin/fetch.c:103 +#: builtin/fetch.c:104 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:106 +#: builtin/fetch.c:107 msgid "default mode for recursion" msgstr "standardläge för rekursion" -#: builtin/fetch.c:236 +#: builtin/fetch.c:109 +msgid "accept refs that update .git/shallow" +msgstr "tar emot referenser som uppdaterar .git/shallow" + +#: builtin/fetch.c:347 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:290 +#: builtin/fetch.c:411 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:295 +#: builtin/fetch.c:416 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:309 +#: builtin/fetch.c:430 #, 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:310 builtin/fetch.c:396 +#: builtin/fetch.c:431 builtin/fetch.c:517 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:321 +#: builtin/fetch.c:442 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376 +#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497 msgid " (unable to update local ref)" msgstr " (kunde inte uppdatera lokal ref)" -#: builtin/fetch.c:341 +#: builtin/fetch.c:462 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:344 +#: builtin/fetch.c:465 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:347 +#: builtin/fetch.c:468 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:392 +#: builtin/fetch.c:513 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:392 +#: builtin/fetch.c:513 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:398 +#: builtin/fetch.c:519 msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:429 builtin/fetch.c:735 +#: builtin/fetch.c:552 builtin/fetch.c:785 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: builtin/fetch.c:438 +#: builtin/fetch.c:561 #, 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:537 +#: builtin/fetch.c:579 +#, 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:667 builtin/fetch.c:750 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:548 +#: builtin/fetch.c:678 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5112,55 +5169,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:598 +#: builtin/fetch.c:730 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:599 +#: builtin/fetch.c:731 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:606 +#: builtin/fetch.c:755 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:607 builtin/remote.c:1055 +#: builtin/fetch.c:756 builtin/remote.c:1050 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:725 +#: builtin/fetch.c:775 #, 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:744 +#: builtin/fetch.c:794 #, 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:747 +#: builtin/fetch.c:797 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:801 +#: builtin/fetch.c:853 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:976 +#: builtin/fetch.c:1015 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:978 builtin/remote.c:100 +#: builtin/fetch.c:1017 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1036 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5168,32 +5225,32 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar skall hämtas från." -#: builtin/fetch.c:1020 +#: builtin/fetch.c:1059 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1068 +#: builtin/fetch.c:1107 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1070 +#: builtin/fetch.c:1109 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1089 +#: builtin/fetch.c:1132 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1091 +#: builtin/fetch.c:1134 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1145 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1110 +#: builtin/fetch.c:1153 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -5203,8 +5260,8 @@ msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702 -#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178 -#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245 +#: builtin/merge.c:196 builtin/show-branch.c:654 builtin/show-ref.c:178 +#: builtin/tag.c:446 parse-options.h:135 parse-options.h:242 msgid "n" msgstr "n" @@ -5228,43 +5285,43 @@ msgstr "inled meddelande med <text>" msgid "file to read from" msgstr "fil att läsa från" -#: builtin/for-each-ref.c:995 +#: builtin/for-each-ref.c:1063 msgid "git for-each-ref [options] [<pattern>]" msgstr "git for-each-ref [flaggor] [<mönster>]" -#: builtin/for-each-ref.c:1010 +#: builtin/for-each-ref.c:1078 msgid "quote placeholders suitably for shells" msgstr "citera platshållare passande för skal" -#: builtin/for-each-ref.c:1012 +#: builtin/for-each-ref.c:1080 msgid "quote placeholders suitably for perl" msgstr "citera platshållare passande för perl" -#: builtin/for-each-ref.c:1014 +#: builtin/for-each-ref.c:1082 msgid "quote placeholders suitably for python" msgstr "citera platshållare passande för python" -#: builtin/for-each-ref.c:1016 +#: builtin/for-each-ref.c:1084 msgid "quote placeholders suitably for tcl" msgstr "citera platshållare passande för tcl" -#: builtin/for-each-ref.c:1019 +#: builtin/for-each-ref.c:1087 msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:1020 +#: builtin/for-each-ref.c:1088 builtin/replace.c:177 msgid "format" msgstr "format" -#: builtin/for-each-ref.c:1020 +#: builtin/for-each-ref.c:1088 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/for-each-ref.c:1021 +#: builtin/for-each-ref.c:1089 msgid "key" msgstr "nyckel" -#: builtin/for-each-ref.c:1022 +#: builtin/for-each-ref.c:1090 msgid "field name to sort on" msgstr "fältnamn att sortera på" @@ -5308,41 +5365,41 @@ msgstr "aktivera striktare kontroll" msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:623 builtin/prune.c:134 +#: builtin/fsck.c:623 builtin/prune.c:144 msgid "show progress" msgstr "visa förlopp" -#: builtin/gc.c:23 +#: builtin/gc.c:24 msgid "git gc [options]" msgstr "git gc [flaggor]" -#: builtin/gc.c:79 +#: builtin/gc.c:80 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: builtin/gc.c:106 +#: builtin/gc.c:107 #, c-format msgid "insanely long object directory %.*s" msgstr "tokigt lång objektkatalog %.*s" -#: builtin/gc.c:261 +#: builtin/gc.c:262 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:263 +#: builtin/gc.c:264 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:264 +#: builtin/gc.c:265 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:265 +#: builtin/gc.c:266 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:305 +#: builtin/gc.c:306 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" @@ -5352,7 +5409,7 @@ msgstr "" "köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n" #. be quiet on --auto -#: builtin/gc.c:315 +#: builtin/gc.c:316 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5360,7 +5417,7 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:340 +#: builtin/gc.c:341 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5698,57 +5755,57 @@ msgstr "" "\"%s\": kommando för man-visare som stöds.\n" "Använd \"man.<verktyg>.path\" istället." -#: builtin/help.c:349 +#: builtin/help.c:353 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:366 +#: builtin/help.c:370 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:374 +#: builtin/help.c:378 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:420 +#: builtin/help.c:424 msgid "Defining attributes per path" msgstr "Definierar attribut per sökväg" -#: builtin/help.c:421 +#: builtin/help.c:425 msgid "A Git glossary" msgstr "En Git-ordlista" -#: builtin/help.c:422 +#: builtin/help.c:426 msgid "Specifies intentionally untracked files to ignore" msgstr "Ange avsiktligen ospårade filer att ignorera" -#: builtin/help.c:423 +#: builtin/help.c:427 msgid "Defining submodule properties" msgstr "Ange egenskaper för undermoduler" -#: builtin/help.c:424 +#: builtin/help.c:428 msgid "Specifying revisions and ranges for Git" msgstr "Ange versioner och intervall i Git" -#: builtin/help.c:425 +#: builtin/help.c:429 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Introduktion till Git (för version 1.5.1 och senare)" -#: builtin/help.c:426 +#: builtin/help.c:430 msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" -#: builtin/help.c:438 +#: builtin/help.c:442 msgid "The common Git guides are:\n" msgstr "De vanliga Git-vägledningarna är:\n" -#: builtin/help.c:460 builtin/help.c:476 +#: builtin/help.c:463 builtin/help.c:480 #, c-format msgid "usage: %s%s" msgstr "användning: %s%s" -#: builtin/help.c:492 +#: builtin/help.c:496 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "\"git %s\" är ett alias för \"%s\"" @@ -6157,7 +6214,7 @@ msgstr "behörigheter" 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:493 builtin/prune-packed.c:75 builtin/repack.c:155 +#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155 msgid "be quiet" msgstr "var tyst" @@ -6606,151 +6663,151 @@ msgstr "Tillgängliga strategier är:" msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:198 +#: builtin/merge.c:191 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:201 +#: builtin/merge.c:194 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:202 +#: builtin/merge.c:195 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:204 +#: builtin/merge.c:197 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:207 +#: builtin/merge.c:200 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:209 +#: builtin/merge.c:202 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:211 +#: builtin/merge.c:204 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:212 +#: builtin/merge.c:205 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:214 +#: builtin/merge.c:207 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:218 +#: builtin/merge.c:211 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:219 builtin/notes.c:738 builtin/revert.c:89 +#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:220 +#: builtin/merge.c:213 msgid "merge strategy to use" msgstr "sammanslagninsstrategi att använda" -#: builtin/merge.c:221 +#: builtin/merge.c:214 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:222 +#: builtin/merge.c:215 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:224 +#: builtin/merge.c:217 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:228 +#: builtin/merge.c:221 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:257 +#: builtin/merge.c:250 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:262 +#: builtin/merge.c:255 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:267 +#: builtin/merge.c:260 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:286 builtin/merge.c:303 +#: builtin/merge.c:279 builtin/merge.c:296 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:333 +#: builtin/merge.c:326 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:346 +#: builtin/merge.c:339 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:378 +#: builtin/merge.c:371 msgid "Writing SQUASH_MSG" msgstr "Skriver SQUASH_MSG" -#: builtin/merge.c:380 +#: builtin/merge.c:373 msgid "Finishing SQUASH_MSG" msgstr "Avslutar SQUASH_MSG" -#: builtin/merge.c:403 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:453 +#: builtin/merge.c:446 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:565 +#: builtin/merge.c:558 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:657 +#: builtin/merge.c:650 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/merge.c:685 +#: builtin/merge.c:678 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:699 +#: builtin/merge.c:692 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:713 +#: builtin/merge.c:706 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:802 +#: builtin/merge.c:795 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:811 +#: builtin/merge.c:804 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra " "den.\n" -#: builtin/merge.c:817 +#: builtin/merge.c:810 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6766,48 +6823,48 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:841 +#: builtin/merge.c:834 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:853 +#: builtin/merge.c:846 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:918 +#: builtin/merge.c:911 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: builtin/merge.c:934 +#: builtin/merge.c:927 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" -#: builtin/merge.c:975 +#: builtin/merge.c:968 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:977 +#: builtin/merge.c:970 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:979 +#: builtin/merge.c:972 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:984 +#: builtin/merge.c:977 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Ingen fjärrspårande gren för %s från %s" -#: builtin/merge.c:1140 +#: builtin/merge.c:1133 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1156 git-pull.sh:31 +#: builtin/merge.c:1149 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6815,11 +6872,11 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du kan slå ihop." -#: builtin/merge.c:1159 git-pull.sh:34 +#: builtin/merge.c:1152 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: builtin/merge.c:1163 +#: builtin/merge.c:1156 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6827,140 +6884,148 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du kan slå ihop." -#: builtin/merge.c:1166 +#: builtin/merge.c:1159 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)." -#: builtin/merge.c:1175 +#: builtin/merge.c:1168 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1184 +#: builtin/merge.c:1177 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1216 +#: builtin/merge.c:1209 msgid "Can merge only exactly one commit into empty head" msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud." -#: builtin/merge.c:1219 +#: builtin/merge.c:1212 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1221 +#: builtin/merge.c:1214 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud" -#: builtin/merge.c:1226 +#: builtin/merge.c:1219 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1277 +#: builtin/merge.c:1270 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s." -#: builtin/merge.c:1280 +#: builtin/merge.c:1273 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s." #. 'N' -#: builtin/merge.c:1283 +#: builtin/merge.c:1276 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: builtin/merge.c:1286 +#: builtin/merge.c:1279 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" -#: builtin/merge.c:1370 +#: builtin/merge.c:1363 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1409 +#: builtin/merge.c:1402 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1416 +#: builtin/merge.c:1409 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1448 +#: builtin/merge.c:1441 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1471 builtin/merge.c:1550 +#: builtin/merge.c:1464 builtin/merge.c:1543 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1475 +#: builtin/merge.c:1468 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagninsstrategin %s...\n" -#: builtin/merge.c:1541 +#: builtin/merge.c:1534 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1543 +#: builtin/merge.c:1536 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1552 +#: builtin/merge.c:1545 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Använder %s för att förbereda lösning för hand.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1557 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n" -#: builtin/merge-base.c:26 +#: builtin/merge-base.c:29 msgid "git merge-base [-a|--all] <commit> <commit>..." msgstr "git merge-base [-a|--all] <incheckning> <incheckning>..." -#: builtin/merge-base.c:27 +#: builtin/merge-base.c:30 msgid "git merge-base [-a|--all] --octopus <commit>..." msgstr "git merge-base [-a|--all] --octopus <incheckning>..." -#: builtin/merge-base.c:28 +#: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <incheckning>..." -#: builtin/merge-base.c:29 +#: builtin/merge-base.c:32 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <incheckning> <incheckning>" -#: builtin/merge-base.c:98 +#: builtin/merge-base.c:33 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <ref> <incheckning>" + +#: builtin/merge-base.c:214 msgid "output all common ancestors" msgstr "skriv ut alla gemensamma anfäder" -#: builtin/merge-base.c:99 +#: builtin/merge-base.c:216 msgid "find ancestors for a single n-way merge" msgstr "hitta anfader för enkel n-vägssammanslagning" -#: builtin/merge-base.c:100 +#: builtin/merge-base.c:218 msgid "list revs not reachable from others" msgstr "visa revisioner som inte kan nås från andra" -#: builtin/merge-base.c:102 +#: builtin/merge-base.c:220 msgid "is the first one ancestor of the other?" msgstr "är den första anfader till den andra?" +#: builtin/merge-base.c:222 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "se var <incheckning> grenades av från referensloggen från <ref>" + #: builtin/merge-file.c:8 msgid "" "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " @@ -7020,123 +7085,127 @@ msgstr "tillåt skapa mer än ett träd" msgid "git mv [options] <source>... <destination>" msgstr "git mv [flaggor] <källa>... <mål>" -#: builtin/mv.c:67 +#: builtin/mv.c:71 msgid "force move/rename even if target exists" msgstr "tvinga flytta/ändra namn även om målet finns" -#: builtin/mv.c:68 +#: builtin/mv.c:72 msgid "skip move/rename errors" msgstr "hoppa över fel vid flytt/namnändring" -#: builtin/mv.c:113 +#: builtin/mv.c:122 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n" -#: builtin/mv.c:117 +#: builtin/mv.c:126 msgid "bad source" msgstr "felaktig källa" -#: builtin/mv.c:120 +#: builtin/mv.c:129 msgid "can not move directory into itself" msgstr "kan inte flytta katalog till sig själv" -#: builtin/mv.c:123 +#: builtin/mv.c:132 msgid "cannot move directory over file" msgstr "kan inte flytta katalog över fil" -#: builtin/mv.c:129 +#: builtin/mv.c:138 #, c-format msgid "Huh? Directory %s is in index and no submodule?" msgstr "Vad? Katalogen %s är i indexet och inte en undermodul?" -#: builtin/mv.c:131 builtin/rm.c:318 +#: builtin/mv.c:140 builtin/rm.c:318 msgid "Please, stage your changes to .gitmodules or stash them to proceed" msgstr "" "Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" -#: builtin/mv.c:147 +#: builtin/mv.c:156 #, c-format msgid "Huh? %.*s is in index?" msgstr "Vad? %.*s är i indexet?" -#: builtin/mv.c:159 +#: builtin/mv.c:168 msgid "source directory is empty" msgstr "källkatalogen är tom" -#: builtin/mv.c:191 +#: builtin/mv.c:200 msgid "not under version control" msgstr "inte versionshanterad" -#: builtin/mv.c:193 +#: builtin/mv.c:202 msgid "destination exists" msgstr "destinationen finns" -#: builtin/mv.c:201 +#: builtin/mv.c:210 #, c-format msgid "overwriting '%s'" msgstr "skriver över \"%s\"" -#: builtin/mv.c:204 +#: builtin/mv.c:213 msgid "Cannot overwrite" msgstr "Kan inte skriva över" -#: builtin/mv.c:207 +#: builtin/mv.c:216 msgid "multiple sources for the same target" msgstr "flera källor för samma mål" -#: builtin/mv.c:222 +#: builtin/mv.c:218 +msgid "destination directory does not exist" +msgstr "destinationskatalogen finns inte" + +#: builtin/mv.c:233 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, källa=%s, mål=%s" -#: builtin/mv.c:232 +#: builtin/mv.c:243 #, c-format msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330 +#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [options] <commit>..." msgstr "git name-rev [flaggor] <incheckning>..." -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [options] --all" msgstr "git name-rev [flaggor] --all" -#: builtin/name-rev.c:261 +#: builtin/name-rev.c:260 msgid "git name-rev [options] --stdin" msgstr "git name-rev [flaggor] --stdin" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "skriv endast namn (ingen SHA-1)" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "använd endast taggar för att namnge incheckningar" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "använd endast referenser som motsvarar <mönster>" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "läs från standard in" -#: builtin/name-rev.c:320 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "tillåt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:326 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" @@ -7462,7 +7531,7 @@ msgstr "anteckningar-ref" msgid "use notes from <notes_ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:974 builtin/remote.c:1598 +#: builtin/notes.c:974 builtin/remote.c:1593 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" @@ -7480,143 +7549,143 @@ msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]" msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:2398 +#: builtin/pack-objects.c:2396 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2402 +#: builtin/pack-objects.c:2400 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2423 #, c-format msgid "option %s does not accept negative form" msgstr "flaggan %s godtar inte negativ form" -#: builtin/pack-objects.c:2429 +#: builtin/pack-objects.c:2427 #, 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:2448 +#: builtin/pack-objects.c:2446 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2448 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2452 +#: builtin/pack-objects.c:2450 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2455 +#: builtin/pack-objects.c:2453 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsmätaren visas" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2454 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2457 +#: builtin/pack-objects.c:2455 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2460 +#: builtin/pack-objects.c:2458 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2462 +#: builtin/pack-objects.c:2460 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2464 +#: builtin/pack-objects.c:2462 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2466 +#: builtin/pack-objects.c:2464 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2468 +#: builtin/pack-objects.c:2466 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:2470 +#: builtin/pack-objects.c:2468 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:2472 +#: builtin/pack-objects.c:2470 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2474 +#: builtin/pack-objects.c:2472 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2476 +#: builtin/pack-objects.c:2474 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2478 +#: builtin/pack-objects.c:2476 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:2480 +#: builtin/pack-objects.c:2478 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2482 +#: builtin/pack-objects.c:2480 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2484 +#: builtin/pack-objects.c:2482 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:2487 +#: builtin/pack-objects.c:2485 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2490 +#: builtin/pack-objects.c:2488 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2493 +#: builtin/pack-objects.c:2491 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2495 +#: builtin/pack-objects.c:2493 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2497 +#: builtin/pack-objects.c:2495 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2498 parse-options.h:143 +#: builtin/pack-objects.c:2496 parse-options.h:143 msgid "time" msgstr "tid" -#: builtin/pack-objects.c:2499 +#: builtin/pack-objects.c:2497 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2502 +#: builtin/pack-objects.c:2500 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2504 +#: builtin/pack-objects.c:2502 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2506 +#: builtin/pack-objects.c:2504 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2508 +#: builtin/pack-objects.c:2506 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" @@ -7640,15 +7709,15 @@ msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]" -#: builtin/prune.c:132 +#: builtin/prune.c:142 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" -#: builtin/prune.c:133 +#: builtin/prune.c:143 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:136 +#: builtin/prune.c:146 msgid "expire objects older than <time>" msgstr "låt tid gå ut för objekt äldre än <tid>" @@ -7656,15 +7725,15 @@ msgstr "låt tid gå ut för objekt äldre än <tid>" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/push.c:47 +#: builtin/push.c:86 msgid "tag shorthand without <tag>" msgstr "taggförkortning utan <tagg>" -#: builtin/push.c:66 +#: builtin/push.c:96 msgid "--delete only accepts plain target ref names" msgstr "--delete godtar endast enkla målreferensnamn" -#: builtin/push.c:101 +#: builtin/push.c:141 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -7673,7 +7742,7 @@ msgstr "" "För att välja ett av alternativen permanent, se push.default i \"git help " "config\"." -#: builtin/push.c:104 +#: builtin/push.c:144 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -7698,7 +7767,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:119 +#: builtin/push.c:159 #, c-format msgid "" "You are not currently on a branch.\n" @@ -7713,7 +7782,7 @@ msgstr "" "\n" " git push %s HEAD:<namn-på-fjärrgren>\n" -#: builtin/push.c:133 +#: builtin/push.c:173 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -7726,12 +7795,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:141 +#: builtin/push.c:181 #, 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:144 +#: builtin/push.c:184 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -7742,7 +7811,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:167 +#: builtin/push.c:207 msgid "" "push.default is unset; its implicit value is changing in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -7754,6 +7823,13 @@ msgid "" "\n" " git config --global push.default simple\n" "\n" +"When push.default is set to 'matching', git will push local branches\n" +"to the remote branches that already exist with the same name.\n" +"\n" +"In Git 2.0, Git will default to the more conservative 'simple'\n" +"behavior, which only pushes the current branch to the corresponding\n" +"remote branch that 'git pull' uses to update the current branch.\n" +"\n" "See 'git help config' and search for 'push.default' for further " "information.\n" "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" @@ -7771,19 +7847,27 @@ msgstr "" "\n" " git config --global push.default simple\n" "\n" +"Nör push.default är satt till \"matching\" kommer git att sända lokala " +"grenar\n" +"till fjärrgrenar som redan finns och som har samma namn.\n" +"\n" +"Git 2.0 kommer som standard välja den mer konservativa inställningen\n" +"\"simple\", vilket bara sänder in den aktuella grenen till den motsvarande\n" +"fjärrgren \"git pull\" använder för att uppdatera den aktuella grenen.\n" +"\n" "Se \"git help config\" och sök efter \"push.default\" för ytterligare \n" "information. (Läget \"simple\" introducerades i Git 1.7.11. Använd det\n" "liknande läget \"current\" istället för \"simple\" om du ibland använder\n" "äldre versioner av Git.)" -#: builtin/push.c:227 +#: builtin/push.c:274 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:234 +#: builtin/push.c:281 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -7795,7 +7879,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:240 +#: builtin/push.c:287 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" @@ -7809,7 +7893,7 @@ msgstr "" "endast\n" "sända aktuell gren." -#: builtin/push.c:246 +#: builtin/push.c:293 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" @@ -7821,7 +7905,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:252 +#: builtin/push.c:299 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" @@ -7835,11 +7919,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:259 +#: builtin/push.c:306 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:262 +#: builtin/push.c:309 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" @@ -7850,22 +7934,22 @@ msgstr "" "pekar på något som inte är en incheckning, utan att använda flaggan\n" "\"--force\".\n" -#: builtin/push.c:328 +#: builtin/push.c:375 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:332 +#: builtin/push.c:379 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:365 +#: builtin/push.c:412 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:366 +#: builtin/push.c:413 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7886,95 +7970,95 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:381 +#: builtin/push.c:428 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:382 +#: builtin/push.c:429 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:387 +#: builtin/push.c:434 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:388 +#: builtin/push.c:435 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:393 +#: builtin/push.c:440 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:453 +#: builtin/push.c:500 msgid "repository" msgstr "arkiv" -#: builtin/push.c:454 +#: builtin/push.c:501 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:455 +#: builtin/push.c:502 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:457 +#: builtin/push.c:504 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:458 +#: builtin/push.c:505 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:461 +#: builtin/push.c:508 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:463 +#: builtin/push.c:510 msgid "refname>:<expect" msgstr "refnamn>:<förvänta" -#: builtin/push.c:464 +#: builtin/push.c:511 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:466 +#: builtin/push.c:513 msgid "check" msgstr "kontrollera" -#: builtin/push.c:467 +#: builtin/push.c:514 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:469 +#: builtin/push.c:516 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:470 builtin/push.c:471 +#: builtin/push.c:517 builtin/push.c:518 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:472 +#: builtin/push.c:519 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:475 +#: builtin/push.c:522 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:477 +#: builtin/push.c:524 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:478 +#: builtin/push.c:525 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:488 +#: builtin/push.c:535 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är imkompatibel med --all, --mirror och --tags" -#: builtin/push.c:490 +#: builtin/push.c:537 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" @@ -8062,11 +8146,11 @@ msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" msgid "'%s' is not a valid timestamp" msgstr "\"%s\" är inte en giltig tidsstämpel" -#: builtin/remote.c:11 +#: builtin/remote.c:12 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:12 +#: builtin/remote.c:13 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -8074,82 +8158,82 @@ msgstr "" "git remote add [-t <gren>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <namn> <url>" -#: builtin/remote.c:13 builtin/remote.c:32 +#: builtin/remote.c:14 builtin/remote.c:33 msgid "git remote rename <old> <new>" msgstr "git remote rename <gammal> <ny>" -#: builtin/remote.c:14 builtin/remote.c:37 +#: builtin/remote.c:15 builtin/remote.c:38 msgid "git remote remove <name>" msgstr "git remote remove <namn>" -#: builtin/remote.c:15 +#: builtin/remote.c:16 msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)" msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <namn>" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <namn>" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjärr>)...]" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <namn> <gren>..." -#: builtin/remote.c:20 builtin/remote.c:68 +#: builtin/remote.c:21 builtin/remote.c:69 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]" -#: builtin/remote.c:21 builtin/remote.c:69 +#: builtin/remote.c:22 builtin/remote.c:70 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <namn> <nyurl>" -#: builtin/remote.c:22 builtin/remote.c:70 +#: builtin/remote.c:23 builtin/remote.c:71 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <namn> <url>" -#: builtin/remote.c:27 +#: builtin/remote.c:28 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<flaggor>] <namn> <url>" -#: builtin/remote.c:42 +#: builtin/remote.c:43 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)" -#: builtin/remote.c:47 +#: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <namn> <gren>..." -#: builtin/remote.c:48 +#: builtin/remote.c:49 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <namn> <gren>..." -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote show [<options>] <name>" msgstr "git remote show [<flaggor>] <namn>" -#: builtin/remote.c:58 +#: builtin/remote.c:59 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<flaggor>] <namn>" -#: builtin/remote.c:63 +#: builtin/remote.c:64 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:88 #, c-format msgid "Updating %s" msgstr "Uppdaterar %s" -#: builtin/remote.c:130 +#: builtin/remote.c:120 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -8157,101 +8241,101 @@ msgstr "" "--mirror är farlig och föråldrad; använd\n" "\t --mirror=fetch eller --mirror=push istället" -#: builtin/remote.c:147 +#: builtin/remote.c:137 #, c-format msgid "unknown mirror argument: %s" msgstr "okänt argument till mirror: %s" -#: builtin/remote.c:163 +#: builtin/remote.c:153 msgid "fetch the remote branches" msgstr "hämta fjärrgrenarna" -#: builtin/remote.c:165 +#: builtin/remote.c:155 msgid "import all tags and associated objects when fetching" msgstr "importera alla taggar och associerade objekt vid hämtning" -#: builtin/remote.c:168 +#: builtin/remote.c:158 msgid "or do not fetch any tag at all (--no-tags)" msgstr "eller hämta inte några taggar alls (--no-tags)" -#: builtin/remote.c:170 +#: builtin/remote.c:160 msgid "branch(es) to track" msgstr "gren(ar) att spåra" -#: builtin/remote.c:171 +#: builtin/remote.c:161 msgid "master branch" msgstr "huvudgren" -#: builtin/remote.c:172 +#: builtin/remote.c:162 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:173 +#: builtin/remote.c:163 msgid "set up remote as a mirror to push to or fetch from" msgstr "ställ in arkiv som spegel att sända eller ta emot från" -#: builtin/remote.c:185 +#: builtin/remote.c:175 msgid "specifying a master branch makes no sense with --mirror" msgstr "att ange en master-gren ger ingen mening med --mirror" -#: builtin/remote.c:187 +#: builtin/remote.c:177 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:195 builtin/remote.c:646 +#: builtin/remote.c:185 builtin/remote.c:641 #, c-format msgid "remote %s already exists." msgstr "fjärrarkivet %s finns redan." -#: builtin/remote.c:199 builtin/remote.c:650 +#: builtin/remote.c:189 builtin/remote.c:645 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" -#: builtin/remote.c:243 +#: builtin/remote.c:233 #, c-format msgid "Could not setup master '%s'" msgstr "Kunde inte skapa master \"%s\"" -#: builtin/remote.c:299 +#: builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "mer än en %s" -#: builtin/remote.c:339 +#: builtin/remote.c:334 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Kunde inte hämta mappning för referensspecifikation %s" -#: builtin/remote.c:440 builtin/remote.c:448 +#: builtin/remote.c:435 builtin/remote.c:443 msgid "(matching)" msgstr "(matchande)" -#: builtin/remote.c:452 +#: builtin/remote.c:447 msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Kunde inte tillämpa \"%s\" på \"%s\"" -#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885 #, c-format msgid "No such remote: %s" msgstr "Inget sådant fjärrarkiv: %s" -#: builtin/remote.c:656 +#: builtin/remote.c:651 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:662 builtin/remote.c:799 +#: builtin/remote.c:657 builtin/remote.c:794 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:677 +#: builtin/remote.c:672 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8262,32 +8346,32 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:683 +#: builtin/remote.c:678 #, c-format msgid "Could not append '%s'" msgstr "Kunde inte lägga till på \"%s\"" -#: builtin/remote.c:694 +#: builtin/remote.c:689 #, c-format msgid "Could not set '%s'" msgstr "Kunde inte sätta \"%s\"" -#: builtin/remote.c:716 +#: builtin/remote.c:711 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:750 +#: builtin/remote.c:745 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:764 +#: builtin/remote.c:759 #, c-format msgid "Could not remove branch %s" msgstr "Kunde inte ta bort grenen %s" -#: builtin/remote.c:834 +#: builtin/remote.c:829 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8301,262 +8385,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:943 +#: builtin/remote.c:938 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:946 +#: builtin/remote.c:941 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:948 +#: builtin/remote.c:943 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:950 +#: builtin/remote.c:945 msgid " ???" msgstr " ???" -#: builtin/remote.c:991 +#: builtin/remote.c:986 #, 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:998 +#: builtin/remote.c:993 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:1001 +#: builtin/remote.c:996 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:1002 +#: builtin/remote.c:997 msgid " and with remote" msgstr " och med fjärren" -#: builtin/remote.c:1004 +#: builtin/remote.c:999 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:1005 +#: builtin/remote.c:1000 msgid " and with remote" msgstr " och med fjärren" -#: builtin/remote.c:1051 +#: builtin/remote.c:1046 msgid "create" msgstr "skapa" -#: builtin/remote.c:1054 +#: builtin/remote.c:1049 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1058 +#: builtin/remote.c:1053 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1061 +#: builtin/remote.c:1056 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1064 +#: builtin/remote.c:1059 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1071 +#: builtin/remote.c:1066 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1074 +#: builtin/remote.c:1069 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1078 +#: builtin/remote.c:1073 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1081 +#: builtin/remote.c:1076 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1091 +#: builtin/remote.c:1144 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1118 +#: builtin/remote.c:1171 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1119 +#: builtin/remote.c:1172 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1120 builtin/remote.c:1285 +#: builtin/remote.c:1173 builtin/remote.c:1318 msgid "(no URL)" msgstr "(ingen URL)" -#: builtin/remote.c:1129 builtin/remote.c:1131 +#: builtin/remote.c:1182 builtin/remote.c:1184 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 +#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1139 +#: builtin/remote.c:1192 #, 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:1151 +#: builtin/remote.c:1204 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1154 builtin/remote.c:1181 +#: builtin/remote.c:1207 builtin/remote.c:1234 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1163 +#: builtin/remote.c:1216 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:1171 +#: builtin/remote.c:1224 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1178 +#: builtin/remote.c:1231 #, 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:1199 +#: builtin/remote.c:1252 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1201 +#: builtin/remote.c:1254 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1216 +#: builtin/remote.c:1269 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1218 +#: builtin/remote.c:1271 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:1228 +#: builtin/remote.c:1281 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1236 +#: builtin/remote.c:1289 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1238 +#: builtin/remote.c:1291 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1274 +#: builtin/remote.c:1307 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1275 +#: builtin/remote.c:1308 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1281 +#: builtin/remote.c:1314 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1282 +#: builtin/remote.c:1315 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1295 +#: builtin/remote.c:1328 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1331 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1321 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1387 builtin/remote.c:1461 +#: builtin/remote.c:1440 builtin/remote.c:1514 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1407 +#: builtin/remote.c:1460 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1414 +#: builtin/remote.c:1467 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1436 +#: builtin/remote.c:1489 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1438 +#: builtin/remote.c:1491 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1440 +#: builtin/remote.c:1493 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1447 +#: builtin/remote.c:1500 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1487 +#: builtin/remote.c:1540 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1495 +#: builtin/remote.c:1548 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1497 +#: builtin/remote.c:1550 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/remote.c:1569 +#: builtin/remote.c:1564 msgid "be verbose; must be placed before a subcommand" msgstr "var pratsam; måste skrivas före ett underkommando" @@ -8616,7 +8700,7 @@ msgstr "begränsa maximalt deltadjup" msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:345 +#: builtin/repack.c:343 #, c-format msgid "removing '%s' failed" msgstr "misslyckades ta bort \"%s\"" @@ -8630,21 +8714,25 @@ msgid "git replace -d <object>..." msgstr "git replace -d <objekt>..." #: builtin/replace.c:19 -msgid "git replace -l [<pattern>]" -msgstr "git replace -l [<mönster>]" +msgid "git replace [--format=<format>] [-l [<pattern>]]" +msgstr "git replace [--format=<format>] [-l [<mönster>]]" -#: builtin/replace.c:131 +#: builtin/replace.c:174 msgid "list replace refs" msgstr "visa ersättningsreferenser" -#: builtin/replace.c:132 +#: builtin/replace.c:175 msgid "delete replace refs" msgstr "ta bort ersättningsreferenser" -#: builtin/replace.c:133 +#: builtin/replace.c:176 msgid "replace the ref if it exists" msgstr "ersätt referensen om den finns" +#: builtin/replace.c:177 +msgid "use this format" +msgstr "använd detta format" + #: builtin/rerere.c:12 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" @@ -8777,19 +8865,23 @@ msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-parse.c:345 +#: builtin/rev-parse.c:359 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [options] -- [<argument>...]" -#: builtin/rev-parse.c:350 +#: builtin/rev-parse.c:364 msgid "keep the `--` passed as an arg" msgstr "behåll \"--\" sänt som argument" -#: builtin/rev-parse.c:352 +#: builtin/rev-parse.c:366 msgid "stop parsing after the first non-option argument" msgstr "sluta tolka efter första argument som inte är flagga" -#: builtin/rev-parse.c:470 +#: builtin/rev-parse.c:369 +msgid "output in stuck long form" +msgstr "utdata fast i lång form" + +#: builtin/rev-parse.c:486 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -9034,67 +9126,67 @@ msgstr "" msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g|--reflog)[=<n>[,<bas>]] [--list] [<ref>]" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:649 msgid "show remote-tracking and local branches" msgstr "visa fjärrspårande och lokala grenar" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:651 msgid "show remote-tracking branches" msgstr "visa fjärrspårande grenar" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:653 msgid "color '*!+-' corresponding to the branch" msgstr "färga \"*!+-\" enligt grenen" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:655 msgid "show <n> more commits after the common ancestor" msgstr "visa <n> ytterligare incheckningar efter gemensam anfader" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c:657 msgid "synonym to more=-1" msgstr "synonym till more=-1" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "suppress naming strings" msgstr "undertyck namnsträngar" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:660 msgid "include the current branch" msgstr "inkludera aktuell gren" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:662 msgid "name commits with their object names" msgstr "namnge incheckningar med deras objektnamn" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:664 msgid "show possible merge bases" msgstr "visa möjliga sammanslaningsbaser" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:666 msgid "show refs unreachable from any other ref" msgstr "visa referenser som inte kan nås från någon annan referens" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:668 msgid "show commits in topological order" msgstr "visa incheckningar i topologisk ordning" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:671 msgid "show only commits not on the first branch" msgstr "visa endast incheckningar inte på den första grenen" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:673 msgid "show merges reachable from only one tip" msgstr "visa sammanslagningar som endast kan nås från en spets" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:675 msgid "topologically sort, maintaining date order where possible" msgstr "sortera topologiskt, behåll datumordning när möjligt" -#: builtin/show-branch.c:679 +#: builtin/show-branch.c:678 msgid "<n>[,<base>]" msgstr "<n>[,<bas>]" -#: builtin/show-branch.c:680 +#: builtin/show-branch.c:679 msgid "show <n> most recent ref-log entries starting at base" msgstr "visa <n> nyaste refloggposter med början på bas" @@ -9583,15 +9675,15 @@ msgstr "giltig till" msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:238 +#: parse-options.h:235 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:240 +#: parse-options.h:237 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:246 +#: parse-options.h:243 msgid "use <n> digits to display SHA-1s" msgstr "använd <n> siffror för att visa SHA-1:or" @@ -9892,8 +9984,8 @@ msgstr "" # cogito-relaterat #: git-bisect.sh:140 -msgid "won't bisect on seeked tree" -msgstr "kör inte \"bisect\" på ett \"seeked\"-träd" +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 msgid "Bad HEAD - strange symbolic ref" @@ -10037,7 +10129,7 @@ msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:255 +#: git-pull.sh:247 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -10048,15 +10140,15 @@ msgstr "" "Varning: snabbspolar din arbetskatalog från\n" "Varning: incheckningen $orig_head." -#: git-pull.sh:280 +#: git-pull.sh:272 msgid "Cannot merge multiple branches into empty head" msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: git-pull.sh:284 +#: git-pull.sh:276 msgid "Cannot rebase onto multiple branches" msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar" -#: git-rebase.sh:54 +#: git-rebase.sh:55 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -10067,16 +10159,16 @@ msgstr "" "Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n" "För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"." -#: git-rebase.sh:156 +#: git-rebase.sh:158 msgid "Applied autostash." msgstr "Tillämpade autostash." -#: git-rebase.sh:159 +#: git-rebase.sh:161 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kan inte spara $stash_sha1" -#: git-rebase.sh:160 +#: git-rebase.sh:162 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -10086,31 +10178,31 @@ msgstr "" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" -#: git-rebase.sh:199 +#: git-rebase.sh:201 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: git-rebase.sh:204 +#: git-rebase.sh:206 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Det verkar som en git-am körs. Kan inte ombasera." -#: git-rebase.sh:338 +#: git-rebase.sh:346 msgid "The --exec option must be used with the --interactive option" msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive" -#: git-rebase.sh:343 +#: git-rebase.sh:351 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: git-rebase.sh:354 +#: git-rebase.sh:362 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." -#: git-rebase.sh:361 +#: git-rebase.sh:369 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: git-rebase.sh:364 +#: git-rebase.sh:372 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -10118,12 +10210,12 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: git-rebase.sh:382 +#: git-rebase.sh:390 #, sh-format msgid "Could not move back to $head_name" msgstr "Kunde inte flytta tillbaka till $head_name" -#: git-rebase.sh:401 +#: git-rebase.sh:409 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -10144,66 +10236,66 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där." -#: git-rebase.sh:446 +#: git-rebase.sh:456 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ogiltig uppström $upstream_name" -#: git-rebase.sh:470 +#: git-rebase.sh:480 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: mer än en sammanslagningsbas finns" -#: git-rebase.sh:473 git-rebase.sh:477 +#: git-rebase.sh:483 git-rebase.sh:487 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ingen sammanslagningsbas finns" -#: git-rebase.sh:482 +#: git-rebase.sh:492 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Peka på en giltig incheckning: $onto_name" -#: git-rebase.sh:505 +#: git-rebase.sh:515 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ödesdigert: ingen sådan gren: $branch_name" -#: git-rebase.sh:528 +#: git-rebase.sh:548 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: git-rebase.sh:533 +#: git-rebase.sh:553 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Skapade autostash: $stash_abbrev" -#: git-rebase.sh:537 +#: git-rebase.sh:557 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: git-rebase.sh:557 +#: git-rebase.sh:577 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name är à jour." -#: git-rebase.sh:561 +#: git-rebase.sh:581 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad." -#: git-rebase.sh:572 +#: git-rebase.sh:592 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Ändringar från $mb till $onto:" #. Detach HEAD and reset the tree -#: git-rebase.sh:581 +#: git-rebase.sh:601 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..." -#: git-rebase.sh:591 +#: git-rebase.sh:611 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." @@ -10452,56 +10544,56 @@ msgstr "Misslyckades registrera undermodulen \"$sm_path\"" msgid "Entering '$prefix$displaypath'" msgstr "Går in i \"$prefix$displaypath\"" -#: git-submodule.sh:554 +#: git-submodule.sh:559 #, sh-format msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." msgstr "" "Stoppar på \"$prefix$displaypath\"; skriptet returnerade en status skild " "från noll." -#: git-submodule.sh:600 +#: git-submodule.sh:605 #, sh-format msgid "No url found for submodule path '$displaypath' in .gitmodules" msgstr "" "Hittade ingen url för undermodulsökvägen \"$displaypath\" i .gitmodules" -#: git-submodule.sh:609 +#: git-submodule.sh:614 #, sh-format msgid "Failed to register url for submodule path '$displaypath'" msgstr "Misslyckades registrera url för undermodulsökväg \"$displaypath\"" -#: git-submodule.sh:611 +#: git-submodule.sh:616 #, sh-format msgid "Submodule '$name' ($url) registered for path '$displaypath'" msgstr "" "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$displaypath\"" -#: git-submodule.sh:619 +#: git-submodule.sh:633 #, sh-format msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "" "Misslyckades registrera uppdateringsläge för undermodulsökväg \"$displaypath" "\"" -#: git-submodule.sh:656 +#: git-submodule.sh:671 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" msgstr "Använd \".\" om du verkligen vill avinitiera alla undermoduler" -#: git-submodule.sh:673 +#: git-submodule.sh:688 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" "Undermodulens arbetskatalog \"$displaypath\" innehåller katalogen \".git\"" -#: git-submodule.sh:674 +#: git-submodule.sh:689 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" -#: git-submodule.sh:680 +#: git-submodule.sh:695 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -10510,28 +10602,28 @@ msgstr "" "Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" " "kastar bort dem" -#: git-submodule.sh:683 +#: git-submodule.sh:698 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Rensade katalogen \"$displaypath\"" -#: git-submodule.sh:684 +#: git-submodule.sh:699 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\"" -#: git-submodule.sh:687 +#: git-submodule.sh:702 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\"" -#: git-submodule.sh:696 +#: git-submodule.sh:711 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\"" -#: git-submodule.sh:811 +#: git-submodule.sh:834 #, sh-format msgid "" "Submodule path '$displaypath' not initialized\n" @@ -10540,109 +10632,124 @@ msgstr "" "Undermodulen \"$displaypath\" har inte initierats\n" "Kanske du vill köra \"update --init\"?" -#: git-submodule.sh:824 +#: git-submodule.sh:847 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:833 +#: git-submodule.sh:856 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:857 +#: git-submodule.sh:880 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\"" -#: git-submodule.sh:871 +#: git-submodule.sh:894 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:872 +#: git-submodule.sh:895 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:877 +#: git-submodule.sh:900 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:878 +#: git-submodule.sh:901 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:883 +#: git-submodule.sh:906 #, sh-format msgid "" "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" msgstr "" "Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$prefix$sm_path\"" -#: git-submodule.sh:884 +#: git-submodule.sh:907 #, sh-format msgid "Submodule path '$prefix$sm_path': '$command $sha1'" msgstr "Undermodulsökvägen \"$prefix$sm_path\": \"$command $sha1\"" -#: git-submodule.sh:889 +#: git-submodule.sh:912 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:890 +#: git-submodule.sh:913 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:917 +#: git-submodule.sh:940 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:1025 +#: git-submodule.sh:1048 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" #. unexpected type -#: git-submodule.sh:1073 +#: git-submodule.sh:1096 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:1093 +#: git-submodule.sh:1116 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src" -#: git-submodule.sh:1096 +#: git-submodule.sh:1119 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst" -#: git-submodule.sh:1099 +#: git-submodule.sh:1122 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Varning: $display_name innehåller inte incheckningarna $sha1_src och " "$sha1_dst" -#: git-submodule.sh:1124 +#: git-submodule.sh:1147 msgid "blob" msgstr "blob" -#: git-submodule.sh:1238 +#: git-submodule.sh:1261 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:1302 +#: git-submodule.sh:1325 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" +#~ msgid "copied: %s -> %s" +#~ msgstr "kopierad: %s -> %s" + +#~ msgid "deleted: %s" +#~ msgstr "borttagen: %s" + +#~ msgid "modified: %s" +#~ msgstr "ändrad: %s" + +#~ msgid "renamed: %s -> %s" +#~ msgstr "namnbyte: %s -> %s" + +#~ msgid "unmerged: %s" +#~ msgstr "osammansl.: %s" + #~ msgid "input paths are terminated by a null character" #~ msgstr "sökvägar avdelas med null-tecken" |