diff options
Diffstat (limited to 'po/sv.po')
| -rw-r--r-- | po/sv.po | 402 |
1 files changed, 216 insertions, 186 deletions
@@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: git 2.5.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-06-27 19:17+0800\n" -"PO-Revision-Date: 2015-06-28 18:49+0100\n" +"POT-Creation-Date: 2015-07-14 07:19+0800\n" +"PO-Revision-Date: 2015-07-15 12:51+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -652,8 +652,8 @@ msgstr "FEL: återöppna en låsfil som har överlämnats" msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594 -#: builtin/clone.c:654 +#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587 +#: builtin/clone.c:647 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -700,7 +700,7 @@ msgstr "kan inte läsa objektet %s: \"%s\"" msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:788 builtin/clone.c:313 +#: merge-recursive.c:788 builtin/clone.c:306 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" @@ -2021,7 +2021,7 @@ msgstr "försvunnen" msgid "behind " msgstr "efter " -#: compat/precompose_utf8.c:55 builtin/clone.c:352 +#: compat/precompose_utf8.c:55 builtin/clone.c:345 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -2099,7 +2099,7 @@ msgstr "var pratsam" msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286 msgid "select hunks interactively" msgstr "välj stycken interaktivt" @@ -2438,7 +2438,7 @@ msgstr "%s: patchen kan inte tillämpas" msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135 +#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" @@ -3132,7 +3132,7 @@ msgstr "visa grenar i spalter" msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:878 builtin/clone.c:629 +#: builtin/branch.c:878 builtin/clone.c:622 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" @@ -3334,7 +3334,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:1345 builtin/gc.c:279 +#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -3431,113 +3431,113 @@ msgstr "när filer skapas, lägg till <sträng> först" msgid "copy out the files from named stage" msgstr "kopiera ut filer från namngiven etapp" -#: builtin/checkout.c:26 +#: builtin/checkout.c:24 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<flaggor>] <gren>" -#: builtin/checkout.c:27 +#: builtin/checkout.c:25 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..." -#: builtin/checkout.c:138 builtin/checkout.c:171 +#: builtin/checkout.c:134 builtin/checkout.c:167 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:140 builtin/checkout.c:173 +#: builtin/checkout.c:136 builtin/checkout.c:169 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:156 +#: builtin/checkout.c:152 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner" -#: builtin/checkout.c:200 +#: builtin/checkout.c:196 #, c-format msgid "path '%s' does not have necessary versions" msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" -#: builtin/checkout.c:217 +#: builtin/checkout.c:213 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:234 +#: builtin/checkout.c:230 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 -#: builtin/checkout.c:264 builtin/checkout.c:277 +#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 +#: builtin/checkout.c:260 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar" -#: builtin/checkout.c:267 builtin/checkout.c:270 +#: builtin/checkout.c:263 builtin/checkout.c:266 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:273 +#: builtin/checkout.c:269 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." -#: builtin/checkout.c:287 builtin/checkout.c:481 +#: builtin/checkout.c:280 builtin/checkout.c:474 msgid "corrupt index file" msgstr "indexfilen är trasig" -#: builtin/checkout.c:347 builtin/checkout.c:354 +#: builtin/checkout.c:340 builtin/checkout.c:347 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:503 +#: builtin/checkout.c:496 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:634 +#: builtin/checkout.c:627 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Kan inte skapa referenslog för \"%s\"\n" -#: builtin/checkout.c:670 +#: builtin/checkout.c:663 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:677 +#: builtin/checkout.c:670 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:680 +#: builtin/checkout.c:673 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:684 +#: builtin/checkout.c:677 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:686 builtin/checkout.c:1285 +#: builtin/checkout.c:679 builtin/checkout.c:1134 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:681 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:740 +#: builtin/checkout.c:733 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:746 +#: builtin/checkout.c:739 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3560,7 +3560,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:765 +#: builtin/checkout.c:758 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -3587,178 +3587,150 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:801 +#: builtin/checkout.c:794 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:805 +#: builtin/checkout.c:798 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:832 builtin/checkout.c:1280 +#: builtin/checkout.c:825 builtin/checkout.c:1129 msgid "You are on a branch yet to be born" msgstr "Du är på en gren som ännu inte är född" -#: builtin/checkout.c:893 -msgid "no branch specified" -msgstr "inget grennamn angavs" - -#: builtin/checkout.c:895 -#, c-format -msgid "'%s' already exists" -msgstr "\"%s\" finns redan" - -#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842 -#: builtin/clone.c:853 -#, c-format -msgid "could not create leading directories of '%s'" -msgstr "kunde inte skapa inledande kataloger för \"%s\"" - -#: builtin/checkout.c:924 -#, c-format -msgid "could not create directory of '%s'" -msgstr "kunde inte skapa katalogen \"%s\"" - -#: builtin/checkout.c:960 -#, c-format -msgid "Enter %s (identifier %s)" -msgstr "Går in i %s (identifieraren %s)" - -#: builtin/checkout.c:1070 +#: builtin/checkout.c:931 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad på \"%s\"" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1036 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1075 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1255 +#: builtin/checkout.c:1104 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1294 +#: builtin/checkout.c:1143 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1297 builtin/checkout.c:1301 +#: builtin/checkout.c:1146 builtin/checkout.c:1150 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313 -#: builtin/checkout.c:1316 +#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162 +#: builtin/checkout.c:1165 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1321 +#: builtin/checkout.c:1170 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83 -#: builtin/remote.c:159 builtin/remote.c:161 +#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83 +#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282 +#: builtin/worktree.c:284 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1347 +#: builtin/checkout.c:1204 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1349 +#: builtin/checkout.c:1206 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1350 +#: builtin/checkout.c:1207 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1351 +#: builtin/checkout.c:1208 msgid "detach the HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1209 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1354 +#: builtin/checkout.c:1211 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1354 +#: builtin/checkout.c:1211 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1355 +#: builtin/checkout.c:1212 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1357 +#: builtin/checkout.c:1214 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1359 +#: builtin/checkout.c:1216 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1360 +#: builtin/checkout.c:1217 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:1361 builtin/merge.c:227 +#: builtin/checkout.c:1218 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244 +#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244 msgid "style" msgstr "stil" -#: builtin/checkout.c:1363 +#: builtin/checkout.c:1220 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1366 +#: builtin/checkout.c:1223 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1368 +#: builtin/checkout.c:1225 msgid "second guess 'git checkout <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1370 -msgid "check a branch out in a separate working directory" -msgstr "checka ut en gren i separat arbetskatalog" - -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1227 msgid "do not check if another worktree is holding the given ref" msgstr "" "kontrollera inte om en annan arbetskatalog håller den angivna referensen" -#: builtin/checkout.c:1406 +#: builtin/checkout.c:1252 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1423 +#: builtin/checkout.c:1269 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1428 +#: builtin/checkout.c:1274 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1464 +#: builtin/checkout.c:1310 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1471 +#: builtin/checkout.c:1317 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3767,12 +3739,12 @@ msgstr "" "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n" "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?" -#: builtin/checkout.c:1476 +#: builtin/checkout.c:1322 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\"" -#: builtin/checkout.c:1480 +#: builtin/checkout.c:1326 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4059,57 +4031,57 @@ msgstr "nyckel=värde" msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:247 +#: builtin/clone.c:240 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: builtin/clone.c:251 +#: builtin/clone.c:244 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: builtin/clone.c:254 +#: builtin/clone.c:247 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: builtin/clone.c:317 +#: builtin/clone.c:310 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/clone.c:319 builtin/diff.c:84 +#: builtin/clone.c:312 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: builtin/clone.c:321 +#: builtin/clone.c:314 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:335 +#: builtin/clone.c:328 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:357 +#: builtin/clone.c:350 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:361 +#: builtin/clone.c:354 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:384 builtin/clone.c:558 +#: builtin/clone.c:377 builtin/clone.c:551 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:396 +#: builtin/clone.c:389 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4119,118 +4091,124 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och försöka checka ut igen med \"git checkout -f HEAD\"\n" -#: builtin/clone.c:473 +#: builtin/clone.c:466 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." # Vague original, not networking-related, but rather related to the actual -# objects in the database. -#: builtin/clone.c:553 +# objects downloaded. +#: builtin/clone.c:546 #, c-format msgid "Checking connectivity... " -msgstr "Kontrollerar konnektivitet..." +msgstr "Kontrollerar om vi fick alla objekt..." -#: builtin/clone.c:556 +#: builtin/clone.c:549 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:613 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:644 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:738 +#: builtin/clone.c:731 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:740 +#: builtin/clone.c:733 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:770 +#: builtin/clone.c:763 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:774 +#: builtin/clone.c:767 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:785 +#: builtin/clone.c:778 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:788 +#: builtin/clone.c:781 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:801 +#: builtin/clone.c:794 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:807 builtin/fetch.c:1160 +#: builtin/clone.c:800 builtin/fetch.c:1160 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:817 +#: builtin/clone.c:810 #, 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:827 +#: builtin/clone.c:820 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:845 +#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193 +#: builtin/worktree.c:220 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "kunde inte skapa inledande kataloger för \"%s\"" + +#: builtin/clone.c:838 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:863 +#: builtin/clone.c:856 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:865 +#: builtin/clone.c:858 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:890 +#: builtin/clone.c:883 msgid "--dissociate given, but there is no --reference" msgstr "--dissociate angavs, men --reference har inte angivits" -#: builtin/clone.c:907 +#: builtin/clone.c:900 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:910 +#: builtin/clone.c:903 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:915 +#: builtin/clone.c:908 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:919 +#: builtin/clone.c:912 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:968 builtin/clone.c:976 +#: builtin/clone.c:961 builtin/clone.c:969 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:979 +#: builtin/clone.c:972 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -5607,7 +5585,7 @@ msgstr "fältnamn att sortera på" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:147 builtin/prune.c:236 +#: builtin/fsck.c:147 builtin/prune.c:137 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" @@ -5655,7 +5633,7 @@ msgstr "aktivera striktare kontroll" msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:627 builtin/prune.c:198 +#: builtin/fsck.c:627 builtin/prune.c:107 msgid "show progress" msgstr "visa förlopp" @@ -8108,60 +8086,22 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" msgid "Removing duplicate objects" msgstr "Tar bort duplicerade objekt" -#: builtin/prune.c:12 +#: builtin/prune.c:11 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]" -#: builtin/prune.c:86 -#, c-format -msgid "Removing worktrees/%s: not a valid directory" -msgstr "Tar bort worktrees/%s: inte en giltig katalog" - -#: builtin/prune.c:92 -#, c-format -msgid "Removing worktrees/%s: gitdir file does not exist" -msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" - -#: builtin/prune.c:97 -#, c-format -msgid "Removing worktrees/%s: unable to read gitdir file (%s)" -msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)" - -#: builtin/prune.c:108 -#, c-format -msgid "Removing worktrees/%s: invalid gitdir file" -msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" - -#: builtin/prune.c:124 -#, c-format -msgid "Removing worktrees/%s: gitdir file points to non-existent location" -msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats" - -#: builtin/prune.c:159 -#, c-format -msgid "failed to remove: %s" -msgstr "misslyckades ta bort: %s" - -#: builtin/prune.c:196 +#: builtin/prune.c:105 builtin/worktree.c:112 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" -#: builtin/prune.c:197 +#: builtin/prune.c:106 builtin/worktree.c:113 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:199 -msgid "prune .git/worktrees" -msgstr "rensa .git/worktrees" - -#: builtin/prune.c:201 +#: builtin/prune.c:109 builtin/worktree.c:115 msgid "expire objects older than <time>" msgstr "låt tid gå ut för objekt äldre än <tid>" -#: builtin/prune.c:216 -msgid "--worktrees does not take extra arguments" -msgstr "--worktrees tar inte ytterligare argument" - #: builtin/push.c:14 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]" @@ -10244,6 +10184,84 @@ msgstr "git verify-tag [-v | --verbose] <tagg>..." msgid "print tag contents" msgstr "visa innehåll för tag" +#: builtin/worktree.c:11 +msgid "git worktree add [<options>] <path> <branch>" +msgstr "git worktree add [<flaggor>] <sökväg> <gren>" + +#: builtin/worktree.c:12 +msgid "git worktree prune [<options>]" +msgstr "git worktree prune [<flaggor>]" + +#: builtin/worktree.c:27 +#, c-format +msgid "Removing worktrees/%s: not a valid directory" +msgstr "Tar bort worktrees/%s: inte en giltig katalog" + +#: builtin/worktree.c:33 +#, c-format +msgid "Removing worktrees/%s: gitdir file does not exist" +msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" + +#: builtin/worktree.c:38 +#, c-format +msgid "Removing worktrees/%s: unable to read gitdir file (%s)" +msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)" + +#: builtin/worktree.c:49 +#, c-format +msgid "Removing worktrees/%s: invalid gitdir file" +msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" + +#: builtin/worktree.c:65 +#, c-format +msgid "Removing worktrees/%s: gitdir file points to non-existent location" +msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats" + +#: builtin/worktree.c:100 +#, c-format +msgid "failed to remove: %s" +msgstr "misslyckades ta bort: %s" + +#: builtin/worktree.c:186 +#, c-format +msgid "'%s' already exists" +msgstr "\"%s\" finns redan" + +#: builtin/worktree.c:207 +#, c-format +msgid "could not create directory of '%s'" +msgstr "kunde inte skapa katalogen \"%s\"" + +#: builtin/worktree.c:241 +msgid "unable to resolve HEAD" +msgstr "kan inte bestämma HEAD" + +#: builtin/worktree.c:249 +#, c-format +msgid "Enter %s (identifier %s)" +msgstr "Går in i %s (identifieraren %s)" + +#: builtin/worktree.c:281 +msgid "checkout <branch> even if already checked out in other worktree" +msgstr "" +"checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog" + +#: builtin/worktree.c:283 +msgid "create a new branch" +msgstr "skapa en ny gren" + +#: builtin/worktree.c:285 +msgid "create or reset a branch" +msgstr "skapa eller återställ en gren" + +#: builtin/worktree.c:286 +msgid "detach HEAD at named commit" +msgstr "koppla från HEAD vid namngiven incheckning" + +#: builtin/worktree.c:292 +msgid "-b and -B are mutually exclusive" +msgstr "-b och -B kan inte användas samtidigt" + #: builtin/write-tree.c:13 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]" @@ -10307,8 +10325,8 @@ msgid "List, create, or delete branches" msgstr "Visa, skapa eller ta bort grenar" #: common-cmds.h:21 -msgid "Checkout a branch or paths to the working tree" -msgstr "Checka ut en gren eller filer i arbetskatalogen" +msgid "Switch branches or restore working tree files" +msgstr "Byt till en ny gren eller återställ filer i arbetskatalogen" #: common-cmds.h:22 msgid "Clone a repository into a new directory" @@ -11371,6 +11389,18 @@ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" +#~ msgid "no branch specified" +#~ msgstr "inget grennamn angavs" + +#~ msgid "check a branch out in a separate working directory" +#~ msgstr "checka ut en gren i separat arbetskatalog" + +#~ msgid "prune .git/worktrees" +#~ msgstr "rensa .git/worktrees" + +#~ msgid "--worktrees does not take extra arguments" +#~ msgstr "--worktrees tar inte ytterligare argument" + #~ msgid "The most commonly used git commands are:" #~ msgstr "De mest använda git-kommandona är:" |