e557179a63 · matheusbsbs/matheus-bagliano

@@ -7,8 +7,8 @@ msgid ""

7 msgstr ""

8 "Project-Id-Version: git 2.5.0\n"

9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

10 -"POT-Creation-Date: 2015-06-27 19:17+0800\n"

11 -"PO-Revision-Date: 2015-06-28 18:49+0100\n"

10 +"POT-Creation-Date: 2015-07-14 07:19+0800\n"

11 +"PO-Revision-Date: 2015-07-15 12:51+0100\n"

12 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"

13 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"

14 "Language: sv\n"

@@ -652,8 +652,8 @@ msgstr "FEL: återöppna en låsfil som har överlämnats"

652 msgid "failed to read the cache"

653 msgstr "misslyckades läsa cachen"

654

655 -#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594

656 -#: builtin/clone.c:654

655 +#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587

656 +#: builtin/clone.c:647

657 msgid "unable to write new index file"

658 msgstr "kunde inte skriva ny indexfil"

659

@@ -700,7 +700,7 @@ msgstr "kan inte läsa objektet %s: \"%s\""

700 msgid "blob expected for %s '%s'"

701 msgstr "blob förväntades för %s \"%s\""

702

703 -#: merge-recursive.c:788 builtin/clone.c:313

703 +#: merge-recursive.c:788 builtin/clone.c:306

704 #, c-format

705 msgid "failed to open '%s'"

706 msgstr "misslyckades öppna \"%s\""

@@ -2021,7 +2021,7 @@ msgstr "försvunnen"

2021 msgid "behind "

2022 msgstr "efter "

2023

2024 -#: compat/precompose_utf8.c:55 builtin/clone.c:352

2024 +#: compat/precompose_utf8.c:55 builtin/clone.c:345

2025 #, c-format

2026 msgid "failed to unlink '%s'"

2027 msgstr "misslyckades ta bort länken \"%s\""

@@ -2099,7 +2099,7 @@ msgstr "var pratsam"

2099 msgid "interactive picking"

2100 msgstr "plocka interaktivt"

2101

2102 -#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286

2102 +#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286

2103 msgid "select hunks interactively"

2104 msgstr "välj stycken interaktivt"

2105

@@ -2438,7 +2438,7 @@ msgstr "%s: patchen kan inte tillämpas"

2438 msgid "Checking patch %s..."

2439 msgstr "Kontrollerar patchen %s..."

2440

2441 -#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135

2441 +#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135

2442 #, c-format

2443 msgid "make_cache_entry failed for path '%s'"

2444 msgstr "make_cache_entry misslyckades för sökvägen \"%s\""

@@ -3132,7 +3132,7 @@ msgstr "visa grenar i spalter"

3132 msgid "Failed to resolve HEAD as a valid ref."

3133 msgstr "Misslyckades slå upp HEAD som giltig referens"

3134

3135 -#: builtin/branch.c:878 builtin/clone.c:629

3135 +#: builtin/branch.c:878 builtin/clone.c:622

3136 msgid "HEAD not found below refs/heads!"

3137 msgstr "HEAD hittades inte under refs/heads!"

3138

@@ -3334,7 +3334,7 @@ msgstr "läs filnamn från standard in"

3334 msgid "terminate input and output records by a NUL character"

3335 msgstr "avsluta in- och utdataposter med NUL-tecken"

3336

3337 -#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279

3337 +#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279

3338 msgid "suppress progress reporting"

3339 msgstr "undertryck förloppsrapportering"

3340

@@ -3431,113 +3431,113 @@ msgstr "när filer skapas, lägg till <sträng> först"

3431 msgid "copy out the files from named stage"

3432 msgstr "kopiera ut filer från namngiven etapp"

3433

3434 -#: builtin/checkout.c:26

3434 +#: builtin/checkout.c:24

3435 msgid "git checkout [<options>] <branch>"

3436 msgstr "git checkout [<flaggor>] <gren>"

3437

3438 -#: builtin/checkout.c:27

3438 +#: builtin/checkout.c:25

3439 msgid "git checkout [<options>] [<branch>] -- <file>..."

3440 msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..."

3441

3442 -#: builtin/checkout.c:138 builtin/checkout.c:171

3442 +#: builtin/checkout.c:134 builtin/checkout.c:167

3443 #, c-format

3444 msgid "path '%s' does not have our version"

3445 msgstr "sökvägen \"%s\" har inte vår version"

3446

3447 -#: builtin/checkout.c:140 builtin/checkout.c:173

3447 +#: builtin/checkout.c:136 builtin/checkout.c:169

3448 #, c-format

3449 msgid "path '%s' does not have their version"

3450 msgstr "sökvägen \"%s\" har inte deras version"

3451

3452 -#: builtin/checkout.c:156

3452 +#: builtin/checkout.c:152

3453 #, c-format

3454 msgid "path '%s' does not have all necessary versions"

3455 msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"

3456

3457 -#: builtin/checkout.c:200

3457 +#: builtin/checkout.c:196

3458 #, c-format

3459 msgid "path '%s' does not have necessary versions"

3460 msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"

3461

3462 -#: builtin/checkout.c:217

3462 +#: builtin/checkout.c:213

3463 #, c-format

3464 msgid "path '%s': cannot merge"

3465 msgstr "sökväg \"%s\": kan inte slå ihop"

3466

3467 -#: builtin/checkout.c:234

3467 +#: builtin/checkout.c:230

3468 #, c-format

3469 msgid "Unable to add merge result for '%s'"

3470 msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""

3471

3472 -#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261

3473 -#: builtin/checkout.c:264 builtin/checkout.c:277

3472 +#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257

3473 +#: builtin/checkout.c:260

3474 #, c-format

3475 msgid "'%s' cannot be used with updating paths"

3476 msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"

3477

3478 -#: builtin/checkout.c:267 builtin/checkout.c:270

3478 +#: builtin/checkout.c:263 builtin/checkout.c:266

3479 #, c-format

3480 msgid "'%s' cannot be used with %s"

3481 msgstr "\"%s\" kan inte användas med %s"

3482

3483 -#: builtin/checkout.c:273

3483 +#: builtin/checkout.c:269

3484 #, c-format

3485 msgid "Cannot update paths and switch to branch '%s' at the same time."

3486 msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."

3487

3488 -#: builtin/checkout.c:287 builtin/checkout.c:481

3488 +#: builtin/checkout.c:280 builtin/checkout.c:474

3489 msgid "corrupt index file"

3490 msgstr "indexfilen är trasig"

3491

3492 -#: builtin/checkout.c:347 builtin/checkout.c:354

3492 +#: builtin/checkout.c:340 builtin/checkout.c:347

3493 #, c-format

3494 msgid "path '%s' is unmerged"

3495 msgstr "sökvägen \"%s\" har inte slagits ihop"

3496

3497 -#: builtin/checkout.c:503

3497 +#: builtin/checkout.c:496

3498 msgid "you need to resolve your current index first"

3499 msgstr "du måste lösa ditt befintliga index först"

3500

3501 -#: builtin/checkout.c:634

3501 +#: builtin/checkout.c:627

3502 #, c-format

3503 msgid "Can not do reflog for '%s'\n"

3504 msgstr "Kan inte skapa referenslog för \"%s\"\n"

3505

3506 -#: builtin/checkout.c:670

3506 +#: builtin/checkout.c:663

3507 msgid "HEAD is now at"

3508 msgstr "HEAD är nu på"

3509

3510 -#: builtin/checkout.c:677

3510 +#: builtin/checkout.c:670

3511 #, c-format

3512 msgid "Reset branch '%s'\n"

3513 msgstr "Återställ gren \"%s\"\n"

3514

3515 -#: builtin/checkout.c:680

3515 +#: builtin/checkout.c:673

3516 #, c-format

3517 msgid "Already on '%s'\n"

3518 msgstr "Redan på \"%s\"\n"

3519

3520 -#: builtin/checkout.c:684

3520 +#: builtin/checkout.c:677

3521 #, c-format

3522 msgid "Switched to and reset branch '%s'\n"

3523 msgstr "Växlade till och nollställde grenen \"%s\"\n"

3524

3525 -#: builtin/checkout.c:686 builtin/checkout.c:1285

3525 +#: builtin/checkout.c:679 builtin/checkout.c:1134

3526 #, c-format

3527 msgid "Switched to a new branch '%s'\n"

3528 msgstr "Växlade till en ny gren \"%s\"\n"

3529

3530 -#: builtin/checkout.c:688

3530 +#: builtin/checkout.c:681

3531 #, c-format

3532 msgid "Switched to branch '%s'\n"

3533 msgstr "Växlade till grenen \"%s\"\n"

3534

3535 -#: builtin/checkout.c:740

3535 +#: builtin/checkout.c:733

3536 #, c-format

3537 msgid " ... and %d more.\n"

3538 msgstr " ... och %d till.\n"

3539

3540 -#: builtin/checkout.c:746

3540 +#: builtin/checkout.c:739

3541 #, c-format

3542 msgid ""

3543 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3560,7 +3560,7 @@ msgstr[1] ""

3560 "\n"

3561 "%s\n"

3562

3563 -#: builtin/checkout.c:765

3563 +#: builtin/checkout.c:758

3564 #, c-format

3565 msgid ""

3566 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -3587,178 +3587,150 @@ msgstr[1] ""

3587 " git branch <nytt_grennamn> %s\n"

3588 "\n"

3589

3590 -#: builtin/checkout.c:801

3590 +#: builtin/checkout.c:794

3591 msgid "internal error in revision walk"

3592 msgstr "internt fel vid genomgång av revisioner (revision walk)"

3593

3594 -#: builtin/checkout.c:805

3594 +#: builtin/checkout.c:798

3595 msgid "Previous HEAD position was"

3596 msgstr "Tidigare position för HEAD var"

3597

3598 -#: builtin/checkout.c:832 builtin/checkout.c:1280

3598 +#: builtin/checkout.c:825 builtin/checkout.c:1129

3599 msgid "You are on a branch yet to be born"

3600 msgstr "Du är på en gren som ännu inte är född"

3601

3602 -#: builtin/checkout.c:893

3603 -msgid "no branch specified"

3604 -msgstr "inget grennamn angavs"

3605 -

3606 -#: builtin/checkout.c:895

3607 -#, c-format

3608 -msgid "'%s' already exists"

3609 -msgstr "\"%s\" finns redan"

3610 -

3611 -#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842

3612 -#: builtin/clone.c:853

3613 -#, c-format

3614 -msgid "could not create leading directories of '%s'"

3615 -msgstr "kunde inte skapa inledande kataloger för \"%s\""

3616 -

3617 -#: builtin/checkout.c:924

3618 -#, c-format

3619 -msgid "could not create directory of '%s'"

3620 -msgstr "kunde inte skapa katalogen \"%s\""

3621 -

3622 -#: builtin/checkout.c:960

3623 -#, c-format

3624 -msgid "Enter %s (identifier %s)"

3625 -msgstr "Går in i %s (identifieraren %s)"

3626 -

3627 -#: builtin/checkout.c:1070

3602 +#: builtin/checkout.c:931

3603 #, c-format

3604 msgid "'%s' is already checked out at '%s'"

3605 msgstr "\"%s\" är redan utcheckad på \"%s\""

3606

3632 -#: builtin/checkout.c:1176

3607 +#: builtin/checkout.c:1036

3608 #, c-format

3609 msgid "only one reference expected, %d given."

3610 msgstr "endast en referens förväntades, %d gavs."

3611

3637 -#: builtin/checkout.c:1215

3612 +#: builtin/checkout.c:1075

3613 #, c-format

3614 msgid "invalid reference: %s"

3615 msgstr "felaktig referens: %s"

3616

3642 -#: builtin/checkout.c:1255

3617 +#: builtin/checkout.c:1104

3618 #, c-format

3619 msgid "reference is not a tree: %s"

3620 msgstr "referensen är inte ett träd: %s"

3621

3647 -#: builtin/checkout.c:1294

3622 +#: builtin/checkout.c:1143

3623 msgid "paths cannot be used with switching branches"

3624 msgstr "sökvägar kan inte användas vid byte av gren"

3625

3651 -#: builtin/checkout.c:1297 builtin/checkout.c:1301

3626 +#: builtin/checkout.c:1146 builtin/checkout.c:1150

3627 #, c-format

3628 msgid "'%s' cannot be used with switching branches"

3629 msgstr "\"%s\" kan inte användas vid byte av gren"

3630

3656 -#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313

3657 -#: builtin/checkout.c:1316

3631 +#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162

3632 +#: builtin/checkout.c:1165

3633 #, c-format

3634 msgid "'%s' cannot be used with '%s'"

3635 msgstr "\"%s\" kan inte användas med \"%s\""

3636

3662 -#: builtin/checkout.c:1321

3637 +#: builtin/checkout.c:1170

3638 #, c-format

3639 msgid "Cannot switch branch to a non-commit '%s'"

3640 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""

3641

3667 -#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83

3668 -#: builtin/remote.c:159 builtin/remote.c:161

3642 +#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83

3643 +#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282

3644 +#: builtin/worktree.c:284

3645 msgid "branch"

3646 msgstr "gren"

3647

3672 -#: builtin/checkout.c:1347

3648 +#: builtin/checkout.c:1204

3649 msgid "create and checkout a new branch"

3650 msgstr "skapa och checka ut en ny gren"

3651

3676 -#: builtin/checkout.c:1349

3652 +#: builtin/checkout.c:1206

3653 msgid "create/reset and checkout a branch"

3654 msgstr "skapa/nollställ och checka ut en gren"

3655

3680 -#: builtin/checkout.c:1350

3656 +#: builtin/checkout.c:1207

3657 msgid "create reflog for new branch"

3658 msgstr "skapa reflogg för ny gren"

3659

3684 -#: builtin/checkout.c:1351

3660 +#: builtin/checkout.c:1208

3661 msgid "detach the HEAD at named commit"

3662 msgstr "koppla från HEAD vid namngiven incheckning"

3663

3688 -#: builtin/checkout.c:1352

3664 +#: builtin/checkout.c:1209

3665 msgid "set upstream info for new branch"

3666 msgstr "sätt uppströmsinformation för ny gren"

3667

3692 -#: builtin/checkout.c:1354

3668 +#: builtin/checkout.c:1211

3669 msgid "new-branch"

3670 msgstr "ny-gren"

3671

3696 -#: builtin/checkout.c:1354

3672 +#: builtin/checkout.c:1211

3673 msgid "new unparented branch"

3674 msgstr "ny gren utan förälder"

3675

3700 -#: builtin/checkout.c:1355

3676 +#: builtin/checkout.c:1212

3677 msgid "checkout our version for unmerged files"

3678 msgstr "checka ut vår version för ej sammanslagna filer"

3679

3704 -#: builtin/checkout.c:1357

3680 +#: builtin/checkout.c:1214

3681 msgid "checkout their version for unmerged files"

3682 msgstr "checka ut deras version för ej sammanslagna filer"

3683

3708 -#: builtin/checkout.c:1359

3684 +#: builtin/checkout.c:1216

3685 msgid "force checkout (throw away local modifications)"

3686 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"

3687

3712 -#: builtin/checkout.c:1360

3688 +#: builtin/checkout.c:1217

3689 msgid "perform a 3-way merge with the new branch"

3690 msgstr "utför en 3-vägssammanslagning för den nya grenen"

3691

3716 -#: builtin/checkout.c:1361 builtin/merge.c:227

3692 +#: builtin/checkout.c:1218 builtin/merge.c:227

3693 msgid "update ignored files (default)"

3694 msgstr "uppdatera ignorerade filer (standard)"

3695

3720 -#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244

3696 +#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244

3697 msgid "style"

3698 msgstr "stil"

3699

3724 -#: builtin/checkout.c:1363

3700 +#: builtin/checkout.c:1220

3701 msgid "conflict style (merge or diff3)"

3702 msgstr "konfliktstil (merge eller diff3)"

3703

3728 -#: builtin/checkout.c:1366

3704 +#: builtin/checkout.c:1223

3705 msgid "do not limit pathspecs to sparse entries only"

3706 msgstr "begränsa inte sökvägar till endast glesa poster"

3707

3732 -#: builtin/checkout.c:1368

3708 +#: builtin/checkout.c:1225

3709 msgid "second guess 'git checkout <no-such-branch>'"

3710 msgstr "förutspå \"git checkout <gren-saknas>\""

3711

3736 -#: builtin/checkout.c:1370

3737 -msgid "check a branch out in a separate working directory"

3738 -msgstr "checka ut en gren i separat arbetskatalog"

3739 -

3740 -#: builtin/checkout.c:1372

3712 +#: builtin/checkout.c:1227

3713 msgid "do not check if another worktree is holding the given ref"

3714 msgstr ""

3715 "kontrollera inte om en annan arbetskatalog håller den angivna referensen"

3716

3745 -#: builtin/checkout.c:1406

3717 +#: builtin/checkout.c:1252

3718 msgid "-b, -B and --orphan are mutually exclusive"

3719 msgstr "-b, -B och --orphan är ömsesidigt uteslutande"

3720

3749 -#: builtin/checkout.c:1423

3721 +#: builtin/checkout.c:1269

3722 msgid "--track needs a branch name"

3723 msgstr "--track behöver ett namn på en gren"

3724

3753 -#: builtin/checkout.c:1428

3725 +#: builtin/checkout.c:1274

3726 msgid "Missing branch name; try -b"

3727 msgstr "Grennamn saknas; försök med -b"

3728

3757 -#: builtin/checkout.c:1464

3729 +#: builtin/checkout.c:1310

3730 msgid "invalid path specification"

3731 msgstr "felaktig sökvägsangivelse"

3732

3761 -#: builtin/checkout.c:1471

3733 +#: builtin/checkout.c:1317

3734 #, c-format

3735 msgid ""

3736 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3767,12 +3739,12 @@ msgstr ""

3739 "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"

3740 "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"

3741

3770 -#: builtin/checkout.c:1476

3742 +#: builtin/checkout.c:1322

3743 #, c-format

3744 msgid "git checkout: --detach does not take a path argument '%s'"

3745 msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""

3746

3775 -#: builtin/checkout.c:1480

3747 +#: builtin/checkout.c:1326

3748 msgid ""

3749 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3750 "checking out of the index."

@@ -4059,57 +4031,57 @@ msgstr "nyckel=värde"

4031 msgid "set config inside the new repository"

4032 msgstr "ställ in konfiguration i det nya arkivet"

4033

4062 -#: builtin/clone.c:247

4034 +#: builtin/clone.c:240

4035 #, c-format

4036 msgid "reference repository '%s' is not a local repository."

4037 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."

4038

4067 -#: builtin/clone.c:251

4039 +#: builtin/clone.c:244

4040 #, c-format

4041 msgid "reference repository '%s' is shallow"

4042 msgstr "referensarkivet \"%s\" är grunt"

4043

4072 -#: builtin/clone.c:254

4044 +#: builtin/clone.c:247

4045 #, c-format

4046 msgid "reference repository '%s' is grafted"

4047 msgstr "referensarkivet \"%s\" är ympat"

4048

4077 -#: builtin/clone.c:317

4049 +#: builtin/clone.c:310

4050 #, c-format

4051 msgid "failed to create directory '%s'"

4052 msgstr "misslyckades skapa katalogen \"%s\""

4053

4082 -#: builtin/clone.c:319 builtin/diff.c:84

4054 +#: builtin/clone.c:312 builtin/diff.c:84

4055 #, c-format

4056 msgid "failed to stat '%s'"

4057 msgstr "misslyckades ta status på \"%s\""

4058

4087 -#: builtin/clone.c:321

4059 +#: builtin/clone.c:314

4060 #, c-format

4061 msgid "%s exists and is not a directory"

4062 msgstr "%s finns och är ingen katalog"

4063

4092 -#: builtin/clone.c:335

4064 +#: builtin/clone.c:328

4065 #, c-format

4066 msgid "failed to stat %s\n"

4067 msgstr "misslyckades ta status på %s\n"

4068

4097 -#: builtin/clone.c:357

4069 +#: builtin/clone.c:350

4070 #, c-format

4071 msgid "failed to create link '%s'"

4072 msgstr "misslyckades skapa länken \"%s\""

4073

4102 -#: builtin/clone.c:361

4074 +#: builtin/clone.c:354

4075 #, c-format

4076 msgid "failed to copy file to '%s'"

4077 msgstr "misslyckades kopiera filen till \"%s\""

4078

4107 -#: builtin/clone.c:384 builtin/clone.c:558

4079 +#: builtin/clone.c:377 builtin/clone.c:551

4080 #, c-format

4081 msgid "done.\n"

4082 msgstr "klart.\n"

4083

4112 -#: builtin/clone.c:396

4084 +#: builtin/clone.c:389

4085 msgid ""

4086 "Clone succeeded, but checkout failed.\n"

4087 "You can inspect what was checked out with 'git status'\n"

@@ -4119,118 +4091,124 @@ msgstr ""

4091 "Du kan inspektera det som checkades ut med \"git status\"\n"

4092 "och försöka checka ut igen med \"git checkout -f HEAD\"\n"

4093

4122 -#: builtin/clone.c:473

4094 +#: builtin/clone.c:466

4095 #, c-format

4096 msgid "Could not find remote branch %s to clone."

4097 msgstr "Kunde inte hitta fjärrgrenen %s för att klona."

4098

4099 # Vague original, not networking-related, but rather related to the actual

4128 -# objects in the database.

4129 -#: builtin/clone.c:553

4100 +# objects downloaded.

4101 +#: builtin/clone.c:546

4102 #, c-format

4103 msgid "Checking connectivity... "

4132 -msgstr "Kontrollerar konnektivitet..."

4104 +msgstr "Kontrollerar om vi fick alla objekt..."

4105

4134 -#: builtin/clone.c:556

4106 +#: builtin/clone.c:549

4107 msgid "remote did not send all necessary objects"

4108 msgstr "fjärren sände inte alla nödvändiga objekt"

4109

4138 -#: builtin/clone.c:620

4110 +#: builtin/clone.c:613

4111 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4112 msgstr ""

4113 "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"

4114

4143 -#: builtin/clone.c:651

4115 +#: builtin/clone.c:644

4116 msgid "unable to checkout working tree"

4117 msgstr "kunde inte checka ut arbetskatalogen"

4118

4147 -#: builtin/clone.c:738

4119 +#: builtin/clone.c:731

4120 msgid "cannot repack to clean up"

4121 msgstr "kan inte packa om för att städa upp"

4122

4151 -#: builtin/clone.c:740

4123 +#: builtin/clone.c:733

4124 msgid "cannot unlink temporary alternates file"

4125 msgstr "kunde inte ta bort temporär \"alternates\"-fil"

4126

4155 -#: builtin/clone.c:770

4127 +#: builtin/clone.c:763

4128 msgid "Too many arguments."

4129 msgstr "För många argument."

4130

4159 -#: builtin/clone.c:774

4131 +#: builtin/clone.c:767

4132 msgid "You must specify a repository to clone."

4133 msgstr "Du måste ange ett arkiv att klona."

4134

4163 -#: builtin/clone.c:785

4135 +#: builtin/clone.c:778

4136 #, c-format

4137 msgid "--bare and --origin %s options are incompatible."

4138 msgstr "flaggorna --bare och --origin %s är inkompatibla."

4139

4168 -#: builtin/clone.c:788

4140 +#: builtin/clone.c:781

4141 msgid "--bare and --separate-git-dir are incompatible."

4142 msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."

4143

4172 -#: builtin/clone.c:801

4144 +#: builtin/clone.c:794

4145 #, c-format

4146 msgid "repository '%s' does not exist"

4147 msgstr "arkivet \"%s\" finns inte"

4148

4177 -#: builtin/clone.c:807 builtin/fetch.c:1160

4149 +#: builtin/clone.c:800 builtin/fetch.c:1160

4150 #, c-format

4151 msgid "depth %s is not a positive number"

4152 msgstr "djupet %s är inte ett positivt tal"

4153

4182 -#: builtin/clone.c:817

4154 +#: builtin/clone.c:810

4155 #, c-format

4156 msgid "destination path '%s' already exists and is not an empty directory."

4157 msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."

4158

4187 -#: builtin/clone.c:827

4159 +#: builtin/clone.c:820

4160 #, c-format

4161 msgid "working tree '%s' already exists."

4162 msgstr "arbetsträdet \"%s\" finns redan."

4163

4192 -#: builtin/clone.c:845

4164 +#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193

4165 +#: builtin/worktree.c:220

4166 +#, c-format

4167 +msgid "could not create leading directories of '%s'"

4168 +msgstr "kunde inte skapa inledande kataloger för \"%s\""

4169 +

4170 +#: builtin/clone.c:838

4171 #, c-format

4172 msgid "could not create work tree dir '%s'"

4173 msgstr "kunde inte skapa arbetskatalogen \"%s\""

4174

4197 -#: builtin/clone.c:863

4175 +#: builtin/clone.c:856

4176 #, c-format

4177 msgid "Cloning into bare repository '%s'...\n"

4178 msgstr "Klonar till ett naket arkiv \"%s\"...\n"

4179

4202 -#: builtin/clone.c:865

4180 +#: builtin/clone.c:858

4181 #, c-format

4182 msgid "Cloning into '%s'...\n"

4183 msgstr "Klonar till \"%s\"...\n"

4184

4207 -#: builtin/clone.c:890

4185 +#: builtin/clone.c:883

4186 msgid "--dissociate given, but there is no --reference"

4187 msgstr "--dissociate angavs, men --reference har inte angivits"

4188

4211 -#: builtin/clone.c:907

4189 +#: builtin/clone.c:900

4190 msgid "--depth is ignored in local clones; use file:// instead."

4191 msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"

4192

4215 -#: builtin/clone.c:910

4193 +#: builtin/clone.c:903

4194 msgid "source repository is shallow, ignoring --local"

4195 msgstr "källarkivet är grunt, ignorerar --local"

4196

4219 -#: builtin/clone.c:915

4197 +#: builtin/clone.c:908

4198 msgid "--local is ignored"

4199 msgstr "--local ignoreras"

4200

4223 -#: builtin/clone.c:919

4201 +#: builtin/clone.c:912

4202 #, c-format

4203 msgid "Don't know how to clone %s"

4204 msgstr "Vet inte hur man klonar %s"

4205

4228 -#: builtin/clone.c:968 builtin/clone.c:976

4206 +#: builtin/clone.c:961 builtin/clone.c:969

4207 #, c-format

4208 msgid "Remote branch %s not found in upstream %s"

4209 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"

4210

4233 -#: builtin/clone.c:979

4211 +#: builtin/clone.c:972

4212 msgid "You appear to have cloned an empty repository."

4213 msgstr "Du verkar ha klonat ett tomt arkiv."

4214

@@ -5607,7 +5585,7 @@ msgstr "fältnamn att sortera på"

5585

5586 # Vague original, not networking-related, but rather related to the actual

5587 # objects in the database.

5610 -#: builtin/fsck.c:147 builtin/prune.c:236

5588 +#: builtin/fsck.c:147 builtin/prune.c:137

5589 msgid "Checking connectivity"

5590 msgstr "Kontrollerar konnektivitet"

5591

@@ -5655,7 +5633,7 @@ msgstr "aktivera striktare kontroll"

5633 msgid "write dangling objects in .git/lost-found"

5634 msgstr "skriv dinglande objekt i .git/lost-found"

5635

5658 -#: builtin/fsck.c:627 builtin/prune.c:198

5636 +#: builtin/fsck.c:627 builtin/prune.c:107

5637 msgid "show progress"

5638 msgstr "visa förlopp"

5639

@@ -8108,60 +8086,22 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"

8086 msgid "Removing duplicate objects"

8087 msgstr "Tar bort duplicerade objekt"

8088

8111 -#: builtin/prune.c:12

8089 +#: builtin/prune.c:11

8090 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"

8091 msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]"

8092

8115 -#: builtin/prune.c:86

8116 -#, c-format

8117 -msgid "Removing worktrees/%s: not a valid directory"

8118 -msgstr "Tar bort worktrees/%s: inte en giltig katalog"

8119 -

8120 -#: builtin/prune.c:92

8121 -#, c-format

8122 -msgid "Removing worktrees/%s: gitdir file does not exist"

8123 -msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"

8124 -

8125 -#: builtin/prune.c:97

8126 -#, c-format

8127 -msgid "Removing worktrees/%s: unable to read gitdir file (%s)"

8128 -msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"

8129 -

8130 -#: builtin/prune.c:108

8131 -#, c-format

8132 -msgid "Removing worktrees/%s: invalid gitdir file"

8133 -msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"

8134 -

8135 -#: builtin/prune.c:124

8136 -#, c-format

8137 -msgid "Removing worktrees/%s: gitdir file points to non-existent location"

8138 -msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"

8139 -

8140 -#: builtin/prune.c:159

8141 -#, c-format

8142 -msgid "failed to remove: %s"

8143 -msgstr "misslyckades ta bort: %s"

8144 -

8145 -#: builtin/prune.c:196

8093 +#: builtin/prune.c:105 builtin/worktree.c:112

8094 msgid "do not remove, show only"

8095 msgstr "ta inte bort, bara visa"

8096

8149 -#: builtin/prune.c:197

8097 +#: builtin/prune.c:106 builtin/worktree.c:113

8098 msgid "report pruned objects"

8099 msgstr "rapportera borttagna objekt"

8100

8153 -#: builtin/prune.c:199

8154 -msgid "prune .git/worktrees"

8155 -msgstr "rensa .git/worktrees"

8156 -

8157 -#: builtin/prune.c:201

8101 +#: builtin/prune.c:109 builtin/worktree.c:115

8102 msgid "expire objects older than <time>"

8103 msgstr "låt tid gå ut för objekt äldre än <tid>"

8104

8161 -#: builtin/prune.c:216

8162 -msgid "--worktrees does not take extra arguments"

8163 -msgstr "--worktrees tar inte ytterligare argument"

8164 -

8105 #: builtin/push.c:14

8106 msgid "git push [<options>] [<repository> [<refspec>...]]"

8107 msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]"

@@ -10244,6 +10184,84 @@ msgstr "git verify-tag [-v | --verbose] <tagg>..."

10184 msgid "print tag contents"

10185 msgstr "visa innehåll för tag"

10186

10187 +#: builtin/worktree.c:11

10188 +msgid "git worktree add [<options>] <path> <branch>"

10189 +msgstr "git worktree add [<flaggor>] <sökväg> <gren>"

10190 +

10191 +#: builtin/worktree.c:12

10192 +msgid "git worktree prune [<options>]"

10193 +msgstr "git worktree prune [<flaggor>]"

10194 +

10195 +#: builtin/worktree.c:27

10196 +#, c-format

10197 +msgid "Removing worktrees/%s: not a valid directory"

10198 +msgstr "Tar bort worktrees/%s: inte en giltig katalog"

10199 +

10200 +#: builtin/worktree.c:33

10201 +#, c-format

10202 +msgid "Removing worktrees/%s: gitdir file does not exist"

10203 +msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"

10204 +

10205 +#: builtin/worktree.c:38

10206 +#, c-format

10207 +msgid "Removing worktrees/%s: unable to read gitdir file (%s)"

10208 +msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"

10209 +

10210 +#: builtin/worktree.c:49

10211 +#, c-format

10212 +msgid "Removing worktrees/%s: invalid gitdir file"

10213 +msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"

10214 +

10215 +#: builtin/worktree.c:65

10216 +#, c-format

10217 +msgid "Removing worktrees/%s: gitdir file points to non-existent location"

10218 +msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"

10219 +

10220 +#: builtin/worktree.c:100

10221 +#, c-format

10222 +msgid "failed to remove: %s"

10223 +msgstr "misslyckades ta bort: %s"

10224 +

10225 +#: builtin/worktree.c:186

10226 +#, c-format

10227 +msgid "'%s' already exists"

10228 +msgstr "\"%s\" finns redan"

10229 +

10230 +#: builtin/worktree.c:207

10231 +#, c-format

10232 +msgid "could not create directory of '%s'"

10233 +msgstr "kunde inte skapa katalogen \"%s\""

10234 +

10235 +#: builtin/worktree.c:241

10236 +msgid "unable to resolve HEAD"

10237 +msgstr "kan inte bestämma HEAD"

10238 +

10239 +#: builtin/worktree.c:249

10240 +#, c-format

10241 +msgid "Enter %s (identifier %s)"

10242 +msgstr "Går in i %s (identifieraren %s)"

10243 +

10244 +#: builtin/worktree.c:281

10245 +msgid "checkout <branch> even if already checked out in other worktree"

10246 +msgstr ""

10247 +"checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"

10248 +

10249 +#: builtin/worktree.c:283

10250 +msgid "create a new branch"

10251 +msgstr "skapa en ny gren"

10252 +

10253 +#: builtin/worktree.c:285

10254 +msgid "create or reset a branch"

10255 +msgstr "skapa eller återställ en gren"

10256 +

10257 +#: builtin/worktree.c:286

10258 +msgid "detach HEAD at named commit"

10259 +msgstr "koppla från HEAD vid namngiven incheckning"

10260 +

10261 +#: builtin/worktree.c:292

10262 +msgid "-b and -B are mutually exclusive"

10263 +msgstr "-b och -B kan inte användas samtidigt"

10264 +

10265 #: builtin/write-tree.c:13

10266 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"

10267 msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"

@@ -10307,8 +10325,8 @@ msgid "List, create, or delete branches"

10325 msgstr "Visa, skapa eller ta bort grenar"

10326

10327 #: common-cmds.h:21

10310 -msgid "Checkout a branch or paths to the working tree"

10311 -msgstr "Checka ut en gren eller filer i arbetskatalogen"

10328 +msgid "Switch branches or restore working tree files"

10329 +msgstr "Byt till en ny gren eller återställ filer i arbetskatalogen"

10330

10331 #: common-cmds.h:22

10332 msgid "Clone a repository into a new directory"

@@ -11371,6 +11389,18 @@ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""

11389 msgid "Synchronizing submodule url for '$displaypath'"

11390 msgstr "Synkroniserar undermodul-url för \"$displaypath\""

11391

11392 +#~ msgid "no branch specified"

11393 +#~ msgstr "inget grennamn angavs"

11394 +

11395 +#~ msgid "check a branch out in a separate working directory"

11396 +#~ msgstr "checka ut en gren i separat arbetskatalog"

11397 +

11398 +#~ msgid "prune .git/worktrees"

11399 +#~ msgstr "rensa .git/worktrees"

11400 +

11401 +#~ msgid "--worktrees does not take extra arguments"

11402 +#~ msgstr "--worktrees tar inte ytterligare argument"

11403 +

11404 #~ msgid "The most commonly used git commands are:"

11405 #~ msgstr "De mest använda git-kommandona är:"

11406

l10n: sv.po: Update Swedish translation (2359t0f0u)