e93f5ec21d · matheusbsbs/matheus-bagliano

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

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2018-05-31 23:32+0800\n"

11 -"PO-Revision-Date: 2018-06-01 14:44+0100\n"

10 +"POT-Creation-Date: 2018-06-08 09:03+0800\n"

11 +"PO-Revision-Date: 2018-06-08 22:53+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"

@@ -70,7 +70,7 @@ msgstr ""

70 msgid "Exiting because of an unresolved conflict."

71 msgstr "Avslutar på grund av olöst konflikgt."

72

73 -#: advice.c:168 builtin/merge.c:1249

73 +#: advice.c:168 builtin/merge.c:1250

74 msgid "You have not concluded your merge (MERGE_HEAD exists)."

75 msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."

76

@@ -764,23 +764,23 @@ msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"

764 msgid "pathspec '%s' did not match any files"

765 msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"

766

767 -#: archive.c:436

767 +#: archive.c:434

768 msgid "fmt"

769 msgstr "fmt"

770

771 -#: archive.c:436

771 +#: archive.c:434

772 msgid "archive format"

773 msgstr "arkivformat"

774

775 -#: archive.c:437 builtin/log.c:1462

775 +#: archive.c:435 builtin/log.c:1462

776 msgid "prefix"

777 msgstr "prefix"

778

779 -#: archive.c:438

779 +#: archive.c:436

780 msgid "prepend prefix to each pathname in the archive"

781 msgstr "lägg till prefix till varje sökväg i arkivet"

782

783 -#: archive.c:439 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127

783 +#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127

784 #: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869

785 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554

786 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119

@@ -788,69 +788,69 @@ msgstr "lägg till prefix till varje sökväg i arkivet"

788 msgid "file"

789 msgstr "fil"

790

791 -#: archive.c:440 builtin/archive.c:89

791 +#: archive.c:438 builtin/archive.c:89

792 msgid "write the archive to this file"

793 msgstr "skriv arkivet till filen"

794

795 -#: archive.c:442

795 +#: archive.c:440

796 msgid "read .gitattributes in working directory"

797 msgstr "läs .gitattributes i arbetskatalogen"

798

799 -#: archive.c:443

799 +#: archive.c:441

800 msgid "report archived files on stderr"

801 msgstr "rapportera arkiverade filer på standard fel"

802

803 -#: archive.c:444

803 +#: archive.c:442

804 msgid "store only"

805 msgstr "endast spara"

806

807 -#: archive.c:445

807 +#: archive.c:443

808 msgid "compress faster"

809 msgstr "komprimera snabbare"

810

811 -#: archive.c:453

811 +#: archive.c:451

812 msgid "compress better"

813 msgstr "komprimera bättre"

814

815 -#: archive.c:456

815 +#: archive.c:454

816 msgid "list supported archive formats"

817 msgstr "visa understödda arkivformat"

818

819 -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113

819 +#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113

820 #: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593

821 msgid "repo"

822 msgstr "arkiv"

823

824 -#: archive.c:459 builtin/archive.c:91

824 +#: archive.c:457 builtin/archive.c:91

825 msgid "retrieve the archive from remote repository <repo>"

826 msgstr "hämta arkivet från fjärrarkivet <arkiv>"

827

828 -#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489

828 +#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489

829 msgid "command"

830 msgstr "kommando"

831

832 -#: archive.c:461 builtin/archive.c:93

832 +#: archive.c:459 builtin/archive.c:93

833 msgid "path to the remote git-upload-archive command"

834 msgstr "sökväg till kommandot git-upload-archive på fjärren"

835

836 -#: archive.c:468

836 +#: archive.c:466

837 msgid "Unexpected option --remote"

838 msgstr "Oväntad flagga --remote"

839

840 -#: archive.c:470

840 +#: archive.c:468

841 msgid "Option --exec can only be used together with --remote"

842 msgstr "Flaggan --exec kan endast användas tillsammans med --remote"

843

844 -#: archive.c:472

844 +#: archive.c:470

845 msgid "Unexpected option --output"

846 msgstr "Oväntad flagga --output"

847

848 -#: archive.c:494

848 +#: archive.c:492

849 #, c-format

850 msgid "Unknown archive format '%s'"

851 msgstr "Okänt arkivformat \"%s\""

852

853 -#: archive.c:501

853 +#: archive.c:499

854 #, c-format

855 msgid "Argument not supported for format '%s': -%d"

856 msgstr "Argumentet stöd inte för formatet \"%s\": -%d"

@@ -1002,9 +1002,9 @@ msgstr ""

1002 "--reverse och --first-parent tillsammans kräver att du anger senaste "

1003 "incheckningen"

1004

1005 -#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1860

1006 -#: sequencer.c:3631 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920

1007 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:371

1005 +#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861

1006 +#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920

1007 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372

1008 #: builtin/shortlog.c:192

1009 msgid "revision walk setup failed"

1010 msgstr "misslyckades skapa revisionstraversering"

@@ -1179,7 +1179,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"

1179 msgid "unrecognized header: %s%s (%d)"

1180 msgstr "okänt huvud: %s%s (%d)"

1181

1182 -#: bundle.c:88 sequencer.c:2080 sequencer.c:2557 builtin/commit.c:755

1182 +#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755

1183 #, c-format

1184 msgid "could not open '%s'"

1185 msgstr "kunde inte öppna \"%s\""

@@ -1246,7 +1246,7 @@ msgstr "index-pack dog"

1246 msgid "invalid color value: %.*s"

1247 msgstr "felaktigt färgvärde: %.*s"

1248

1249 -#: commit.c:43 sequencer.c:2363 builtin/am.c:421 builtin/am.c:465

1249 +#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465

1250 #: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376

1251 #: builtin/replace.c:448

1252 #, c-format

@@ -1469,11 +1469,11 @@ msgstr "kunde inte ställa in \"%s\" till \"%s\""

1469 msgid "could not unset '%s'"

1470 msgstr "kunde inte ta bort inställning för \"%s\""

1471

1472 -#: connect.c:60

1472 +#: connect.c:61

1473 msgid "The remote end hung up upon initial contact"

1474 msgstr "Fjärren lade på vid inledande kontakt"

1475

1476 -#: connect.c:62

1476 +#: connect.c:63

1477 msgid ""

1478 "Could not read from remote repository.\n"

1479 "\n"

@@ -2000,20 +2000,81 @@ msgstr "misslyckades ta status på \"%s\""

2000 msgid "'%s': short read"

2001 msgstr "\"%s\": kort läsning"

2002

2003 -#: help.c:179

2003 +#: help.c:23

2004 +msgid "start a working area (see also: git help tutorial)"

2005 +msgstr "starta arbetskatalog (se också: git help tutorial)"

2006 +

2007 +#: help.c:24

2008 +msgid "work on the current change (see also: git help everyday)"

2009 +msgstr "jobba med aktuell förändring (se också: git help everyday)"

2010 +

2011 +#: help.c:25

2012 +msgid "examine the history and state (see also: git help revisions)"

2013 +msgstr "utforska historiken och tillståndet (se också: git help revisions)"

2014 +

2015 +#: help.c:26

2016 +msgid "grow, mark and tweak your common history"

2017 +msgstr "utöka, markera och justera din gemensamma historik"

2018 +

2019 +#: help.c:27

2020 +msgid "collaborate (see also: git help workflows)"

2021 +msgstr "samarbeta (se också: git help workflows)"

2022 +

2023 +#: help.c:31

2024 +msgid "Main Porcelain Commands"

2025 +msgstr "Huvudsakliga porslinskommandon"

2026 +

2027 +#: help.c:32

2028 +msgid "Ancillary Commands / Manipulators"

2029 +msgstr "Tilläggskommandon / manipulerare"

2030 +

2031 +#: help.c:33

2032 +msgid "Ancillary Commands / Interrogators"

2033 +msgstr "Tilläggskommandon / frågare"

2034 +

2035 +#: help.c:34

2036 +msgid "Interacting with Others"

2037 +msgstr "Interaktion med andra"

2038 +

2039 +#: help.c:35

2040 +msgid "Low-level Commands / Manipulators"

2041 +msgstr "Lågnivåkommandon / maniupulerare"

2042 +

2043 +#: help.c:36

2044 +msgid "Low-level Commands / Interrogators"

2045 +msgstr "Lågnivåkommandon / frågare"

2046 +

2047 +#: help.c:37

2048 +msgid "Low-level Commands / Synching Repositories"

2049 +msgstr "Lågnivåkommandon / synka arkiv"

2050 +

2051 +#: help.c:38

2052 +msgid "Low-level Commands / Internal Helpers"

2053 +msgstr "Lågnivåkommandon / interna hjälpare"

2054 +

2055 +#: help.c:293

2056 #, c-format

2057 msgid "available git commands in '%s'"

2058 msgstr "git-kommandon tillgängliga i \"%s\""

2059

2008 -#: help.c:186

2060 +#: help.c:300

2061 msgid "git commands available from elsewhere on your $PATH"

2062 msgstr "git-kommandon från andra platser i din $PATH"

2063

2012 -#: help.c:217

2064 +#: help.c:309

2065 msgid "These are common Git commands used in various situations:"

2066 msgstr "Dessa vanliga Git-kommandon används i olika situationer:"

2067

2016 -#: help.c:281

2068 +#: help.c:358 git.c:90

2069 +#, c-format

2070 +msgid "unsupported command listing type '%s'"

2071 +msgstr "okänd kommandolisttyp \"%s\""

2072 +

2073 +#: help.c:405

2074 +msgid "The common Git guides are:"

2075 +msgstr "De vanliga Git-vägledningarna är:"

2076 +

2077 +#: help.c:467

2078 #, c-format

2079 msgid ""

2080 "'%s' appears to be a git command, but we were not\n"

@@ -2022,32 +2083,32 @@ msgstr ""

2083 "\"%s\" verkar vara ett git-kommando, men vi kan inte\n"

2084 "köra det. Kanske git-%s är trasigt?"

2085

2025 -#: help.c:336

2086 +#: help.c:526

2087 msgid "Uh oh. Your system reports no Git commands at all."

2088 msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."

2089

2029 -#: help.c:358

2090 +#: help.c:548

2091 #, c-format

2092 msgid "WARNING: You called a Git command named '%s', which does not exist."

2093 msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns."

2094

2034 -#: help.c:363

2095 +#: help.c:553

2096 #, c-format

2097 msgid "Continuing under the assumption that you meant '%s'."

2098 msgstr "Fortsätter under förutsättningen att du menade ”%s”."

2099

2039 -#: help.c:368

2100 +#: help.c:558

2101 #, c-format

2102 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

2103 msgstr ""

2104 "Fortsätter om %0.1f sekunder, under förutsättningen att du menade ”%s”."

2105

2045 -#: help.c:376

2106 +#: help.c:566

2107 #, c-format

2108 msgid "git: '%s' is not a git command. See 'git --help'."

2109 msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."

2110

2050 -#: help.c:380

2111 +#: help.c:570

2112 msgid ""

2113 "\n"

2114 "The most similar command is"

@@ -2061,16 +2122,16 @@ msgstr[1] ""

2122 "\n"

2123 "Mest lika kommandon är"

2124

2064 -#: help.c:395

2125 +#: help.c:585

2126 msgid "git version [<options>]"

2127 msgstr "git version [<flaggor>]"

2128

2068 -#: help.c:462

2129 +#: help.c:652

2130 #, c-format

2131 msgid "%s: %s - %s"

2132 msgstr "%s: %s - %s"

2133

2073 -#: help.c:466

2134 +#: help.c:656

2135 msgid ""

2136 "\n"

2137 "Did you mean this?"

@@ -2584,7 +2645,7 @@ msgstr "sammanslagningen returnerade ingen incheckning"

2645 msgid "Could not parse object '%s'"

2646 msgstr "Kunde inte tolka objektet \"%s\""

2647

2587 -#: merge-recursive.c:3511 builtin/merge.c:658 builtin/merge.c:815

2648 +#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816

2649 msgid "Unable to write index."

2650 msgstr "Kunde inte skriva indexet."

2651

@@ -2784,12 +2845,12 @@ msgstr ""

2845 "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"

2846 "Använder version %i"

2847

2787 -#: read-cache.c:2404 sequencer.c:4337 wrapper.c:658 builtin/merge.c:1047

2848 +#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048

2849 #, c-format

2850 msgid "could not close '%s'"

2851 msgstr "kunde inte stänga \"%s\""

2852

2792 -#: read-cache.c:2477 sequencer.c:2101 sequencer.c:3233

2853 +#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234

2854 #, c-format

2855 msgid "could not stat '%s'"

2856 msgstr "kunde inte ta status på \"%s\""

@@ -2804,7 +2865,7 @@ msgstr "kunde inte öppna git-katalog: %s"

2865 msgid "unable to unlink: %s"

2866 msgstr "misslyckades ta bort länken: %s"

2867

2807 -#: refs.c:732 sequencer.c:4333 sequencer.c:4392 wrapper.c:225 wrapper.c:395

2868 +#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395

2869 #: builtin/am.c:779

2870 #, c-format

2871 msgid "could not open '%s' for writing"

@@ -3257,34 +3318,34 @@ msgstr "mottagarsidan stöder inte push med --atomic"

3318 msgid "the receiving end does not support push options"

3319 msgstr "mottagarsidan stöder inte push-flaggor"

3320

3260 -#: sequencer.c:174

3321 +#: sequencer.c:175

3322 #, c-format

3323 msgid "invalid commit message cleanup mode '%s'"

3324 msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""

3325

3265 -#: sequencer.c:274

3326 +#: sequencer.c:275

3327 #, c-format

3328 msgid "could not delete '%s'"

3329 msgstr "kunde inte ta bort \"%s\""

3330

3270 -#: sequencer.c:300

3331 +#: sequencer.c:301

3332 msgid "revert"

3333 msgstr "revert"

3334

3274 -#: sequencer.c:302

3335 +#: sequencer.c:303

3336 msgid "cherry-pick"

3337 msgstr "cherry-pick"

3338

3278 -#: sequencer.c:304

3339 +#: sequencer.c:305

3340 msgid "rebase -i"

3341 msgstr "rebase -i"

3342

3282 -#: sequencer.c:306

3343 +#: sequencer.c:307

3344 #, c-format

3345 msgid "Unknown action: %d"

3346 msgstr "Okänd funktion: %d"

3347

3287 -#: sequencer.c:363

3348 +#: sequencer.c:364

3349 msgid ""

3350 "after resolving the conflicts, mark the corrected paths\n"

3351 "with 'git add <paths>' or 'git rm <paths>'"

@@ -3292,7 +3353,7 @@ msgstr ""

3353 "efter att ha löst konflikterna, markera de rättade sökvägarna\n"

3354 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\""

3355

3295 -#: sequencer.c:366

3356 +#: sequencer.c:367

3357 msgid ""

3358 "after resolving the conflicts, mark the corrected paths\n"

3359 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -3302,45 +3363,45 @@ msgstr ""

3363 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"

3364 "och checka in resultatet med \"git commit\""

3365

3305 -#: sequencer.c:379 sequencer.c:2467

3366 +#: sequencer.c:380 sequencer.c:2468

3367 #, c-format

3368 msgid "could not lock '%s'"

3369 msgstr "kunde inte låsa \"%s\""

3370

3310 -#: sequencer.c:381 sequencer.c:2345 sequencer.c:2471 sequencer.c:2485

3311 -#: sequencer.c:2693 sequencer.c:4335 sequencer.c:4398 wrapper.c:656

3371 +#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486

3372 +#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656

3373 #, c-format

3374 msgid "could not write to '%s'"

3375 msgstr "kunde inte skriva till \"%s\""

3376

3316 -#: sequencer.c:386

3377 +#: sequencer.c:387

3378 #, c-format

3379 msgid "could not write eol to '%s'"

3380 msgstr "kunde inte skriva radslut till \"%s\""

3381

3321 -#: sequencer.c:391 sequencer.c:2350 sequencer.c:2473 sequencer.c:2487

3322 -#: sequencer.c:2701

3382 +#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488

3383 +#: sequencer.c:2702

3384 #, c-format

3385 msgid "failed to finalize '%s'"

3386 msgstr "misslyckades färdigställa \"%s\""

3387

3327 -#: sequencer.c:414 sequencer.c:803 sequencer.c:1492 sequencer.c:2370

3328 -#: sequencer.c:2683 sequencer.c:2787 builtin/am.c:259 builtin/commit.c:727

3329 -#: builtin/merge.c:1045

3388 +#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371

3389 +#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727

3390 +#: builtin/merge.c:1046

3391 #, c-format

3392 msgid "could not read '%s'"

3393 msgstr "kunde inte läsa \"%s\""

3394

3334 -#: sequencer.c:440

3395 +#: sequencer.c:441

3396 #, c-format

3397 msgid "your local changes would be overwritten by %s."

3398 msgstr "dina lokala ändringar skulle skrivas över av %s."

3399

3339 -#: sequencer.c:444

3400 +#: sequencer.c:445

3401 msgid "commit your changes or stash them to proceed."

3402 msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."

3403

3343 -#: sequencer.c:473

3404 +#: sequencer.c:474

3405 #, c-format

3406 msgid "%s: fast-forward"

3407 msgstr "%s: snabbspola"

@@ -3348,20 +3409,20 @@ msgstr "%s: snabbspola"

3409 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

3410 #. "rebase -i".

3411 #.

3351 -#: sequencer.c:562

3412 +#: sequencer.c:563

3413 #, c-format

3414 msgid "%s: Unable to write new index file"

3415 msgstr "%s: Kunde inte skriva ny indexfil"

3416

3356 -#: sequencer.c:578

3417 +#: sequencer.c:579

3418 msgid "unable to update cache tree"

3419 msgstr "kan inte uppdatera cacheträd"

3420

3360 -#: sequencer.c:591

3421 +#: sequencer.c:592

3422 msgid "could not resolve HEAD commit"

3423 msgstr "kunde inte bestämma HEAD:s incheckning"

3424

3364 -#: sequencer.c:748

3425 +#: sequencer.c:749

3426 #, c-format

3427 msgid ""

3428 "you have staged changes in your working tree\n"

@@ -3390,15 +3451,15 @@ msgstr ""

3451 "\n"

3452 " git rebase --continue\n"

3453

3393 -#: sequencer.c:817

3454 +#: sequencer.c:818

3455 msgid "writing root commit"

3456 msgstr "skriver rotincheckning"

3457

3397 -#: sequencer.c:1042

3458 +#: sequencer.c:1043

3459 msgid "'prepare-commit-msg' hook failed"

3460 msgstr "kroken \"prepare-commit-msg\" misslyckades"

3461

3401 -#: sequencer.c:1049

3462 +#: sequencer.c:1050

3463 msgid ""

3464 "Your name and email address were configured automatically based\n"

3465 "on your username and hostname. Please check that they are accurate.\n"

@@ -3425,7 +3486,7 @@ msgstr ""

3486 "\n"

3487 " git commit --amend --reset-author\n"

3488

3428 -#: sequencer.c:1062

3489 +#: sequencer.c:1063

3490 msgid ""

3491 "Your name and email address were configured automatically based\n"

3492 "on your username and hostname. Please check that they are accurate.\n"

@@ -3450,315 +3511,315 @@ msgstr ""

3511 "\n"

3512 " git commit --amend --reset-author\n"

3513

3453 -#: sequencer.c:1102

3514 +#: sequencer.c:1103

3515 msgid "couldn't look up newly created commit"

3516 msgstr "kunde inte slå upp en precis skapad incheckning"

3517

3457 -#: sequencer.c:1104

3518 +#: sequencer.c:1105

3519 msgid "could not parse newly created commit"

3520 msgstr "kunde inte tolka en precis skapad incheckning"

3521

3461 -#: sequencer.c:1150

3522 +#: sequencer.c:1151

3523 msgid "unable to resolve HEAD after creating commit"

3524 msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"

3525

3465 -#: sequencer.c:1152

3526 +#: sequencer.c:1153

3527 msgid "detached HEAD"

3528 msgstr "frånkopplad HEAD"

3529

3469 -#: sequencer.c:1156

3530 +#: sequencer.c:1157

3531 msgid " (root-commit)"

3532 msgstr " (rotincheckning)"

3533

3473 -#: sequencer.c:1177

3534 +#: sequencer.c:1178

3535 msgid "could not parse HEAD"

3536 msgstr "kunde inte tolka HEAD"

3537

3477 -#: sequencer.c:1179

3538 +#: sequencer.c:1180

3539 #, c-format

3540 msgid "HEAD %s is not a commit!"

3541 msgstr "HEAD %s är inte en incheckning!"

3542

3482 -#: sequencer.c:1183 builtin/commit.c:1528

3543 +#: sequencer.c:1184 builtin/commit.c:1528

3544 msgid "could not parse HEAD commit"

3545 msgstr "kunde inte tolka HEAD:s incheckning"

3546

3486 -#: sequencer.c:1234 sequencer.c:1831

3547 +#: sequencer.c:1235 sequencer.c:1832

3548 msgid "unable to parse commit author"

3549 msgstr "kunde inte tolka incheckningens författare"

3550

3490 -#: sequencer.c:1244 builtin/am.c:1630 builtin/merge.c:644

3551 +#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645

3552 msgid "git write-tree failed to write a tree"

3553 msgstr "git write-tree misslyckades skriva ett träd"

3554

3494 -#: sequencer.c:1261 sequencer.c:1316

3555 +#: sequencer.c:1262 sequencer.c:1317

3556 #, c-format

3557 msgid "unable to read commit message from '%s'"

3558 msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""

3559

3499 -#: sequencer.c:1283 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:824

3500 -#: builtin/merge.c:849

3560 +#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825

3561 +#: builtin/merge.c:850

3562 msgid "failed to write commit object"

3563 msgstr "kunde inte skriva incheckningsobjekt"

3564

3504 -#: sequencer.c:1343

3565 +#: sequencer.c:1344

3566 #, c-format

3567 msgid "could not parse commit %s"

3568 msgstr "kunde inte tolka incheckningen %s"

3569

3509 -#: sequencer.c:1348

3570 +#: sequencer.c:1349

3571 #, c-format

3572 msgid "could not parse parent commit %s"

3573 msgstr "kunde inte tolka föräldraincheckningen %s"

3574

3514 -#: sequencer.c:1499 sequencer.c:1524

3575 +#: sequencer.c:1500 sequencer.c:1525

3576 #, c-format

3577 msgid "This is a combination of %d commits."

3578 msgstr "Det här är en kombination av %d incheckningar."

3579

3519 -#: sequencer.c:1509 sequencer.c:4354

3580 +#: sequencer.c:1510 sequencer.c:4355

3581 msgid "need a HEAD to fixup"

3582 msgstr "behöver en HEAD-incheckning att rätta"

3583

3523 -#: sequencer.c:1511 sequencer.c:2728

3584 +#: sequencer.c:1512 sequencer.c:2729

3585 msgid "could not read HEAD"

3586 msgstr "kunde inte läsa HEAD"

3587

3527 -#: sequencer.c:1513

3588 +#: sequencer.c:1514

3589 msgid "could not read HEAD's commit message"

3590 msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"

3591

3531 -#: sequencer.c:1519

3592 +#: sequencer.c:1520

3593 #, c-format

3594 msgid "cannot write '%s'"

3595 msgstr "kan inte skriva \"%s\""

3596

3536 -#: sequencer.c:1526 git-rebase--interactive.sh:457

3597 +#: sequencer.c:1527 git-rebase--interactive.sh:457

3598 msgid "This is the 1st commit message:"

3599 msgstr "Det här är 1:a incheckningsmeddelandet:"

3600

3540 -#: sequencer.c:1534

3601 +#: sequencer.c:1535

3602 #, c-format

3603 msgid "could not read commit message of %s"

3604 msgstr "kunde inte läsa incheckningsmeddelande för %s"

3605

3545 -#: sequencer.c:1541

3606 +#: sequencer.c:1542

3607 #, c-format

3608 msgid "This is the commit message #%d:"

3609 msgstr "Det här är incheckningsmeddelande %d:"

3610

3550 -#: sequencer.c:1547

3611 +#: sequencer.c:1548

3612 #, c-format

3613 msgid "The commit message #%d will be skipped:"

3614 msgstr "Incheckningsmeddelande %d kommer hoppas över:"

3615

3555 -#: sequencer.c:1552

3616 +#: sequencer.c:1553

3617 #, c-format

3618 msgid "unknown command: %d"

3619 msgstr "okänt kommando: %d"

3620

3560 -#: sequencer.c:1630

3621 +#: sequencer.c:1631

3622 msgid "your index file is unmerged."

3623 msgstr "din indexfil har inte slagits ihop."

3624

3564 -#: sequencer.c:1637

3625 +#: sequencer.c:1638

3626 msgid "cannot fixup root commit"

3627 msgstr "kan inte göra \"fixup\" på rotincheckning"

3628

3568 -#: sequencer.c:1656

3629 +#: sequencer.c:1657

3630 #, c-format

3631 msgid "commit %s is a merge but no -m option was given."

3632 msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte."

3633

3573 -#: sequencer.c:1664

3634 +#: sequencer.c:1665

3635 #, c-format

3636 msgid "commit %s does not have parent %d"

3637 msgstr "incheckning %s har inte förälder %d"

3638

3578 -#: sequencer.c:1668

3639 +#: sequencer.c:1669

3640 #, c-format

3641 msgid "mainline was specified but commit %s is not a merge."

3642 msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning."

3643

3583 -#: sequencer.c:1674

3644 +#: sequencer.c:1675

3645 #, c-format

3646 msgid "cannot get commit message for %s"

3647 msgstr "kan inte hämta incheckningsmeddelande för %s"

3648

3649 #. TRANSLATORS: The first %s will be a "todo" command like

3650 #. "revert" or "pick", the second %s a SHA1.

3590 -#: sequencer.c:1693

3651 +#: sequencer.c:1694

3652 #, c-format

3653 msgid "%s: cannot parse parent commit %s"

3654 msgstr "%s: kan inte tolka föräldraincheckningen %s"

3655

3595 -#: sequencer.c:1758

3656 +#: sequencer.c:1759

3657 #, c-format

3658 msgid "could not rename '%s' to '%s'"

3659 msgstr "kunde inte byta namn på \"%s\" till \"%s\""

3660

3600 -#: sequencer.c:1812

3661 +#: sequencer.c:1813

3662 #, c-format

3663 msgid "could not revert %s... %s"

3664 msgstr "kunde inte ångra %s... %s"

3665

3605 -#: sequencer.c:1813

3666 +#: sequencer.c:1814

3667 #, c-format

3668 msgid "could not apply %s... %s"

3669 msgstr "kunde inte tillämpa %s... %s"

3670

3610 -#: sequencer.c:1863

3671 +#: sequencer.c:1864

3672 msgid "empty commit set passed"

3673 msgstr "den angivna uppsättningen incheckningar är tom"

3674

3614 -#: sequencer.c:1873

3675 +#: sequencer.c:1874

3676 #, c-format

3677 msgid "git %s: failed to read the index"

3678 msgstr "git %s: misslyckades läsa indexet"

3679

3619 -#: sequencer.c:1880

3680 +#: sequencer.c:1881

3681 #, c-format

3682 msgid "git %s: failed to refresh the index"

3683 msgstr "git %s: misslyckades uppdatera indexet"

3684

3624 -#: sequencer.c:1960

3685 +#: sequencer.c:1961

3686 #, c-format

3687 msgid "%s does not accept arguments: '%s'"

3688 msgstr "%s tar inte argument: \"%s\""

3689

3629 -#: sequencer.c:1969

3690 +#: sequencer.c:1970

3691 #, c-format

3692 msgid "missing arguments for %s"

3693 msgstr "argument saknas för %s"

3694

3634 -#: sequencer.c:2028

3695 +#: sequencer.c:2029

3696 #, c-format

3697 msgid "invalid line %d: %.*s"

3698 msgstr "ogiltig rad %d: %.*s"

3699

3639 -#: sequencer.c:2036

3700 +#: sequencer.c:2037

3701 #, c-format

3702 msgid "cannot '%s' without a previous commit"

3703 msgstr "kan inte utföra \"%s\" utan en föregående incheckning"

3704

3644 -#: sequencer.c:2084 sequencer.c:4137 sequencer.c:4172

3705 +#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173

3706 #, c-format

3707 msgid "could not read '%s'."

3708 msgstr "kunde inte läsa \"%s\"."

3709

3649 -#: sequencer.c:2107

3710 +#: sequencer.c:2108

3711 msgid "please fix this using 'git rebase --edit-todo'."

3712 msgstr "rätta det med \"git rebase --edit-todo\"."

3713

3653 -#: sequencer.c:2109

3714 +#: sequencer.c:2110

3715 #, c-format

3716 msgid "unusable instruction sheet: '%s'"

3717 msgstr "oanvändbart manus: ”%s”"

3718

3658 -#: sequencer.c:2114

3719 +#: sequencer.c:2115

3720 msgid "no commits parsed."

3721 msgstr "inga incheckningar lästes."

3722

3662 -#: sequencer.c:2125

3723 +#: sequencer.c:2126

3724 msgid "cannot cherry-pick during a revert."

3725 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."

3726

3666 -#: sequencer.c:2127

3727 +#: sequencer.c:2128

3728 msgid "cannot revert during a cherry-pick."

3729 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."

3730

3670 -#: sequencer.c:2194

3731 +#: sequencer.c:2195

3732 #, c-format

3733 msgid "invalid key: %s"

3734 msgstr "felaktig nyckel: %s"

3735

3675 -#: sequencer.c:2197

3736 +#: sequencer.c:2198

3737 #, c-format

3738 msgid "invalid value for %s: %s"

3739 msgstr "felaktigt värde för %s: %s"

3740

3680 -#: sequencer.c:2268

3741 +#: sequencer.c:2269

3742 msgid "unusable squash-onto"

3743 msgstr "oanvändbar squash-onto"

3744

3684 -#: sequencer.c:2284

3745 +#: sequencer.c:2285

3746 #, c-format

3747 msgid "malformed options sheet: '%s'"

3748 msgstr "trasigt manus: ”%s”"

3749

3689 -#: sequencer.c:2322

3750 +#: sequencer.c:2323

3751 msgid "a cherry-pick or revert is already in progress"

3752 msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"

3753

3693 -#: sequencer.c:2323

3754 +#: sequencer.c:2324

3755 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3756 msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""

3757

3697 -#: sequencer.c:2326

3758 +#: sequencer.c:2327

3759 #, c-format

3760 msgid "could not create sequencer directory '%s'"

3761 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""

3762

3702 -#: sequencer.c:2340

3763 +#: sequencer.c:2341

3764 msgid "could not lock HEAD"

3765 msgstr "kunde inte låsa HEAD"

3766

3706 -#: sequencer.c:2395 sequencer.c:3402

3767 +#: sequencer.c:2396 sequencer.c:3403

3768 msgid "no cherry-pick or revert in progress"

3769 msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"

3770

3710 -#: sequencer.c:2397

3771 +#: sequencer.c:2398

3772 msgid "cannot resolve HEAD"

3773 msgstr "kan inte bestämma HEAD"

3774

3714 -#: sequencer.c:2399 sequencer.c:2434

3775 +#: sequencer.c:2400 sequencer.c:2435

3776 msgid "cannot abort from a branch yet to be born"

3777 msgstr "kan inte avbryta från en gren som ännu inte är född"

3778

3718 -#: sequencer.c:2420 builtin/grep.c:720

3779 +#: sequencer.c:2421 builtin/grep.c:720

3780 #, c-format

3781 msgid "cannot open '%s'"

3782 msgstr "kan inte öppna \"%s\""

3783

3723 -#: sequencer.c:2422

3784 +#: sequencer.c:2423

3785 #, c-format

3786 msgid "cannot read '%s': %s"

3787 msgstr "kan inte läsa \"%s\": %s"

3788

3728 -#: sequencer.c:2423

3789 +#: sequencer.c:2424

3790 msgid "unexpected end of file"

3791 msgstr "oväntat filslut"

3792

3732 -#: sequencer.c:2429

3793 +#: sequencer.c:2430

3794 #, c-format

3795 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3796 msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"

3797

3737 -#: sequencer.c:2440

3798 +#: sequencer.c:2441

3799 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3800 msgstr ""

3801 "Du verkar ha flyttat HEAD.\n"

3802 "Spolar inte tillbaka, kontrollera HEAD!"

3803

3743 -#: sequencer.c:2544 sequencer.c:3320

3804 +#: sequencer.c:2545 sequencer.c:3321

3805 #, c-format

3806 msgid "could not update %s"

3807 msgstr "kunde inte uppdatera %s"

3808

3748 -#: sequencer.c:2582 sequencer.c:3300

3809 +#: sequencer.c:2583 sequencer.c:3301

3810 msgid "cannot read HEAD"

3811 msgstr "kan inte läsa HEAD"

3812

3752 -#: sequencer.c:2617 sequencer.c:2621 builtin/difftool.c:639

3813 +#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639

3814 #, c-format

3815 msgid "could not copy '%s' to '%s'"

3816 msgstr "kunde inte kopiera in \"%s\" till \"%s\""

3817

3757 -#: sequencer.c:2640

3818 +#: sequencer.c:2641

3819 msgid "could not read index"

3820 msgstr "kunde inte läsa indexet"

3821

3761 -#: sequencer.c:2645

3822 +#: sequencer.c:2646

3823 #, c-format

3824 msgid ""

3825 "execution failed: %s\n"

@@ -3773,11 +3834,11 @@ msgstr ""

3834 "\tgit rebase --continue\n"

3835 "\n"

3836

3776 -#: sequencer.c:2651

3837 +#: sequencer.c:2652

3838 msgid "and made changes to the index and/or the working tree\n"

3839 msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"

3840

3780 -#: sequencer.c:2657

3841 +#: sequencer.c:2658

3842 #, c-format

3843 msgid ""

3844 "execution succeeded: %s\n"

@@ -3794,62 +3855,62 @@ msgstr ""

3855 "\tgit rebase --continue\n"

3856 "\n"

3857

3797 -#: sequencer.c:2770

3858 +#: sequencer.c:2771

3859 msgid "writing fake root commit"

3860 msgstr "skriver fejkad rotincheckning"

3861

3801 -#: sequencer.c:2775

3862 +#: sequencer.c:2776

3863 msgid "writing squash-onto"

3864 msgstr "skriver squash-onto"

3865

3805 -#: sequencer.c:2810

3866 +#: sequencer.c:2811

3867 #, c-format

3868 msgid "failed to find tree of %s"

3869 msgstr "kunde inte hitta trädet för %s."

3870

3810 -#: sequencer.c:2828

3871 +#: sequencer.c:2829

3872 msgid "could not write index"

3873 msgstr "kunde inte skriva indexet"

3874

3814 -#: sequencer.c:2860

3875 +#: sequencer.c:2861

3876 msgid "cannot merge without a current revision"

3877 msgstr "kan inte slå ihop utan en aktuell incheckning"

3878

3818 -#: sequencer.c:2883

3879 +#: sequencer.c:2884

3880 #, c-format

3881 msgid "could not resolve '%s'"

3882 msgstr "kunde inte upplösa \"%s\""

3883

3823 -#: sequencer.c:2905

3884 +#: sequencer.c:2906

3885 #, c-format

3886 msgid "could not get commit message of '%s'"

3887 msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""

3888

3828 -#: sequencer.c:2915 sequencer.c:2940

3889 +#: sequencer.c:2916 sequencer.c:2941

3890 #, c-format

3891 msgid "could not write '%s'"

3892 msgstr "kunde inte skriva \"%s\""

3893

3833 -#: sequencer.c:3004

3894 +#: sequencer.c:3005

3895 #, c-format

3896 msgid "could not even attempt to merge '%.*s'"

3897 msgstr "kunde inte ens försöka slå ihop \"%.*s\""

3898

3838 -#: sequencer.c:3020

3899 +#: sequencer.c:3021

3900 msgid "merge: Unable to write new index file"

3901 msgstr "sammanslagning: Kunde inte skriva ny indexfil"

3902

3842 -#: sequencer.c:3087

3903 +#: sequencer.c:3088

3904 #, c-format

3905 msgid "Applied autostash.\n"

3906 msgstr "Tillämpade autostash.\n"

3907

3847 -#: sequencer.c:3099

3908 +#: sequencer.c:3100

3909 #, c-format

3910 msgid "cannot store %s"

3911 msgstr "kan inte spara %s"

3912

3852 -#: sequencer.c:3102 git-rebase.sh:188

3913 +#: sequencer.c:3103 git-rebase.sh:188

3914 #, c-format

3915 msgid ""

3916 "Applying autostash resulted in conflicts.\n"

@@ -3860,7 +3921,7 @@ msgstr ""

3921 "Dina ändringar är säkra i stashen.\n"

3922 "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"

3923

3863 -#: sequencer.c:3133

3924 +#: sequencer.c:3134

3925 #, c-format

3926 msgid ""

3927 "Could not execute the todo command\n"

@@ -3881,48 +3942,48 @@ msgstr ""

3942 " git rebase --edit-todo\n"

3943 " git rebase --continue\n"

3944

3884 -#: sequencer.c:3201

3945 +#: sequencer.c:3202

3946 #, c-format

3947 msgid "Stopped at %s... %.*s\n"

3948 msgstr "Stoppade på %s... %.*s\n"

3949

3889 -#: sequencer.c:3263

3950 +#: sequencer.c:3264

3951 #, c-format

3952 msgid "unknown command %d"

3953 msgstr "okänt kommando %d"

3954

3894 -#: sequencer.c:3308

3955 +#: sequencer.c:3309

3956 msgid "could not read orig-head"

3957 msgstr "kunde inte läsa orig-head"

3958

3898 -#: sequencer.c:3313 sequencer.c:4351

3959 +#: sequencer.c:3314 sequencer.c:4352

3960 msgid "could not read 'onto'"

3961 msgstr "kunde inte läsa \"onto\""

3962

3902 -#: sequencer.c:3327

3963 +#: sequencer.c:3328

3964 #, c-format

3965 msgid "could not update HEAD to %s"

3966 msgstr "kunde inte uppdatera HEAD till %s"

3967

3907 -#: sequencer.c:3413

3968 +#: sequencer.c:3414

3969 msgid "cannot rebase: You have unstaged changes."

3970 msgstr "kan inte ombasera: Du har oköade ändringar."

3971

3911 -#: sequencer.c:3422

3972 +#: sequencer.c:3423

3973 msgid "cannot amend non-existing commit"

3974 msgstr "kan inte lägga till incheckning som inte finns"

3975

3915 -#: sequencer.c:3424

3976 +#: sequencer.c:3425

3977 #, c-format

3978 msgid "invalid file: '%s'"

3979 msgstr "ogiltig fil: \"%s\""

3980

3920 -#: sequencer.c:3426

3981 +#: sequencer.c:3427

3982 #, c-format

3983 msgid "invalid contents: '%s'"

3984 msgstr "ogiltigt innehåll: \"%s\""

3985

3925 -#: sequencer.c:3429

3986 +#: sequencer.c:3430

3987 msgid ""

3988 "\n"

3989 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3932,54 +3993,54 @@ msgstr ""

3993 "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"

3994 "först och kör sedan \"git rebase --continute\" igen."

3995

3935 -#: sequencer.c:3454 sequencer.c:3492

3996 +#: sequencer.c:3455 sequencer.c:3493

3997 #, c-format

3998 msgid "could not write file: '%s'"

3999 msgstr "kunde inte skriva fil: \"%s\""

4000

3940 -#: sequencer.c:3507

4001 +#: sequencer.c:3508

4002 msgid "could not remove CHERRY_PICK_HEAD"

4003 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"

4004

3944 -#: sequencer.c:3514

4005 +#: sequencer.c:3515

4006 msgid "could not commit staged changes."

4007 msgstr "kunde inte checka in köade ändringar."

4008

3948 -#: sequencer.c:3611

4009 +#: sequencer.c:3612

4010 #, c-format

4011 msgid "%s: can't cherry-pick a %s"

4012 msgstr "%s: kan inte göra \"cherry-pick\" på typen ”%s”"

4013

3953 -#: sequencer.c:3615

4014 +#: sequencer.c:3616

4015 #, c-format

4016 msgid "%s: bad revision"

4017 msgstr "%s: felaktig revision"

4018

3958 -#: sequencer.c:3648

4019 +#: sequencer.c:3649

4020 msgid "can't revert as initial commit"

4021 msgstr "kan inte ångra som första incheckning"

4022

3962 -#: sequencer.c:4097

4023 +#: sequencer.c:4098

4024 msgid "make_script: unhandled options"

4025 msgstr "make_script: flaggor som inte stöds"

4026

3966 -#: sequencer.c:4100

4027 +#: sequencer.c:4101

4028 msgid "make_script: error preparing revisions"

4029 msgstr "make_script: fel när revisioner skulle förberedas"

4030

3970 -#: sequencer.c:4141 sequencer.c:4176

4031 +#: sequencer.c:4142 sequencer.c:4177

4032 #, c-format

4033 msgid "unusable todo list: '%s'"

4034 msgstr "oanvändbar todo-lista: %s"

4035

3975 -#: sequencer.c:4235

4036 +#: sequencer.c:4236

4037 #, c-format

4038 msgid ""

4039 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

4040 msgstr ""

4041 "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."

4042

3982 -#: sequencer.c:4301

4043 +#: sequencer.c:4302

4044 #, c-format

4045 msgid ""

4046 "Warning: some commits may have been dropped accidentally.\n"

@@ -3988,7 +4049,7 @@ msgstr ""

4049 "Varning: vissa incheckningar kan av misstag ha tappats.\n"

4050 "Tappade incheckningar (nyaste först):\n"

4051

3991 -#: sequencer.c:4308

4052 +#: sequencer.c:4309

4053 #, c-format

4054 msgid ""

4055 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -4008,7 +4069,7 @@ msgstr ""

4069 "\" (fel).\n"

4070 "\n"

4071

4011 -#: sequencer.c:4320

4072 +#: sequencer.c:4321

4073 #, c-format

4074 msgid ""

4075 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -4019,12 +4080,12 @@ msgstr ""

4080 "continue\".\n"

4081 "Avbryt ombaseringen med \"git rebase --abort\".\n"

4082

4022 -#: sequencer.c:4374

4083 +#: sequencer.c:4375

4084 #, c-format

4085 msgid "could not parse commit '%s'"

4086 msgstr "kunde inte tolka incheckningen\" %s\""

4087

4027 -#: sequencer.c:4489

4088 +#: sequencer.c:4490

4089 msgid "the script was already rearranged."

4090 msgstr "skriptet har redan omordnats."

4091

@@ -4287,27 +4348,27 @@ msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"

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

4349 msgstr "Misslyckades slå upp HEAD som giltig referens."

4350

4290 -#: submodule.c:1373

4351 +#: submodule.c:1375

4352 #, c-format

4353 msgid "'%s' not recognized as a git repository"

4354 msgstr "\"%s\" känns inte igen som ett git-arkiv"

4355

4295 -#: submodule.c:1511

4356 +#: submodule.c:1513

4357 #, c-format

4358 msgid "could not start 'git status' in submodule '%s'"

4359 msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""

4360

4300 -#: submodule.c:1524

4361 +#: submodule.c:1526

4362 #, c-format

4363 msgid "could not run 'git status' in submodule '%s'"

4364 msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""

4365

4305 -#: submodule.c:1617

4366 +#: submodule.c:1619

4367 #, c-format

4368 msgid "submodule '%s' has dirty index"

4369 msgstr "undermodulen \"%s\" har ett smutsigt index"

4370

4310 -#: submodule.c:1716

4371 +#: submodule.c:1718

4372 #, c-format

4373 msgid ""

4374 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -4315,18 +4376,18 @@ msgstr ""

4376 "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "

4377 "stöds ej"

4378

4318 -#: submodule.c:1728 submodule.c:1784

4379 +#: submodule.c:1730 submodule.c:1786

4380 #, c-format

4381 msgid "could not lookup name for submodule '%s'"

4382 msgstr "kunde inte slå upp namnet för undermodulen \"%s\""

4383

4323 -#: submodule.c:1732 builtin/submodule--helper.c:1261

4384 +#: submodule.c:1734 builtin/submodule--helper.c:1261

4385 #: builtin/submodule--helper.c:1271

4386 #, c-format

4387 msgid "could not create directory '%s'"

4388 msgstr "kunde inte skapa katalogen \"%s\""

4389

4329 -#: submodule.c:1735

4390 +#: submodule.c:1737

4391 #, c-format

4392 msgid ""

4393 "Migrating git directory of '%s%s' from\n"

@@ -4337,16 +4398,16 @@ msgstr ""

4398 "\"%s\" till\n"

4399 "\"%s\"\n"

4400

4340 -#: submodule.c:1819

4401 +#: submodule.c:1821

4402 #, c-format

4403 msgid "could not recurse into submodule '%s'"

4404 msgstr "kunde inte rekursera in i undermodulen \"%s\""

4405

4345 -#: submodule.c:1863

4406 +#: submodule.c:1865

4407 msgid "could not start ls-files in .."

4408 msgstr "kunde inte starta ls-files i .."

4409

4349 -#: submodule.c:1902

4410 +#: submodule.c:1904

4411 #, c-format

4412 msgid "ls-tree returned unexpected return code %d"

4413 msgstr "ls-tree returnerade en oväntad returkod %d"

@@ -4795,7 +4856,7 @@ msgid "could not open '%s' for reading and writing"

4856 msgstr "kunde inte öppna \"%s\" för läsning och skrivning"

4857

4858 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

4798 -#: builtin/am.c:862 builtin/merge.c:1042

4859 +#: builtin/am.c:862 builtin/merge.c:1043

4860 #, c-format

4861 msgid "could not open '%s' for reading"

4862 msgstr "kunde inte öppna \"%s\" för läsning"

@@ -5325,7 +5386,7 @@ msgstr "ta bort \"%s\"\n"

5386 msgid "Unstaged changes after refreshing the index:"

5387 msgstr "Oköade ändringar efter att ha uppdaterat indexet:"

5388

5328 -#: builtin/add.c:233 builtin/rev-parse.c:888

5389 +#: builtin/add.c:233 builtin/rev-parse.c:892

5390 msgid "Could not read the index"

5391 msgstr "Kunde inte läsa indexet"

5392

@@ -5778,7 +5839,7 @@ msgid "pass it through git-apply"

5839 msgstr "sänd det genom git-apply"

5840

5841 #: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665

5781 -#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:207

5842 +#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208

5843 #: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201

5844 #: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631

5845 #: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144

@@ -5831,7 +5892,7 @@ msgstr "ljug om incheckningsdatum"

5892 msgid "use current timestamp for author date"

5893 msgstr "använd nuvarande tidsstämpel för författardatum"

5894

5834 -#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:238

5895 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:239

5896 #: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399

5897 msgid "key-id"

5898 msgstr "nyckel-id"

@@ -7004,7 +7065,7 @@ msgstr "tvinga utcheckning (kasta bort lokala ändringar)"

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

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

7067

7007 -#: builtin/checkout.c:1131 builtin/merge.c:240

7068 +#: builtin/checkout.c:1131 builtin/merge.c:241

7069 msgid "update ignored files (default)"

7070 msgstr "uppdatera ignorerade filer (standard)"

7071

@@ -7030,7 +7091,7 @@ msgstr ""

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

7092

7093 #: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149

7033 -#: builtin/merge.c:237 builtin/pull.c:128 builtin/push.c:572

7094 +#: builtin/merge.c:238 builtin/pull.c:128 builtin/push.c:572

7095 #: builtin/send-pack.c:174

7096 msgid "force progress reporting"

7097 msgstr "tvinga förloppsrapportering"

@@ -8019,7 +8080,7 @@ msgstr "datum"

8080 msgid "override date for commit"

8081 msgstr "överstyr datum för incheckningen"

8082

8022 -#: builtin/commit.c:1457 builtin/merge.c:227 builtin/notes.c:402

8083 +#: builtin/commit.c:1457 builtin/merge.c:228 builtin/notes.c:402

8084 #: builtin/notes.c:565 builtin/tag.c:392

8085 msgid "message"

8086 msgstr "meddelande"

@@ -8056,7 +8117,7 @@ msgstr ""

8117 msgid "the commit is authored by me now (used with -C/-c/--amend)"

8118 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"

8119

8059 -#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:241

8120 +#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:242

8121 #: builtin/pull.c:154 builtin/revert.c:105

8122 msgid "add Signed-off-by:"

8123 msgstr "lägg till Signed-off-by:"

@@ -8081,7 +8142,7 @@ msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

8142 msgid "include status in commit message template"

8143 msgstr "inkludera status i mallen för incheckningsmeddelandet"

8144

8084 -#: builtin/commit.c:1469 builtin/merge.c:239 builtin/pull.c:184

8145 +#: builtin/commit.c:1469 builtin/merge.c:240 builtin/pull.c:184

8146 #: builtin/revert.c:113

8147 msgid "GPG sign commit"

8148 msgstr "GPG-signera incheckning"

@@ -8680,23 +8741,23 @@ msgstr "utför diff för hela katalogen"

8741 msgid "do not prompt before launching a diff tool"

8742 msgstr "fråga inte vid start av diff-verktyg"

8743

8683 -#: builtin/difftool.c:705

8744 +#: builtin/difftool.c:704

8745 msgid "use symlinks in dir-diff mode"

8746 msgstr "använd symboliska länkar i katalogdiffläge"

8747

8687 -#: builtin/difftool.c:706

8748 +#: builtin/difftool.c:705

8749 msgid "<tool>"

8750 msgstr "<verktyg>"

8751

8691 -#: builtin/difftool.c:707

8752 +#: builtin/difftool.c:706

8753 msgid "use the specified diff tool"

8754 msgstr "använd angivet diff-verktyg"

8755

8695 -#: builtin/difftool.c:709

8756 +#: builtin/difftool.c:708

8757 msgid "print a list of diff tools that may be used with `--tool`"

8758 msgstr "visa en lista över diff-verktyg som kan användas med ”--tool”"

8759

8699 -#: builtin/difftool.c:712

8760 +#: builtin/difftool.c:711

8761 msgid ""

8762 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "

8763 "code"

@@ -8704,19 +8765,19 @@ msgstr ""

8765 "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde "

8766 "skilt från noll"

8767

8707 -#: builtin/difftool.c:714

8768 +#: builtin/difftool.c:713

8769 msgid "<command>"

8770 msgstr "<kommando>"

8771

8711 -#: builtin/difftool.c:715

8772 +#: builtin/difftool.c:714

8773 msgid "specify a custom command for viewing diffs"

8774 msgstr "ange eget kommando för att visa diffar"

8775

8715 -#: builtin/difftool.c:739

8776 +#: builtin/difftool.c:738

8777 msgid "no <tool> given for --tool=<tool>"

8778 msgstr "inget <verktyg> angavs för --tool=<verktyg>"

8779

8719 -#: builtin/difftool.c:746

8780 +#: builtin/difftool.c:745

8781 msgid "no <cmd> given for --extcmd=<cmd>"

8782 msgstr "inget <kommando> angavs för --extcmd=<kommando>"

8783

@@ -9602,58 +9663,62 @@ msgstr ""

9663 msgid "process file as it were from this path"

9664 msgstr "hantera filen som om den kom från sökvägen"

9665

9605 -#: builtin/help.c:43

9666 +#: builtin/help.c:45

9667 msgid "print all available commands"

9668 msgstr "visa alla tillgängliga kommandon"

9669

9609 -#: builtin/help.c:44

9670 +#: builtin/help.c:46

9671 msgid "exclude guides"

9672 msgstr "uteslut vägledningar"

9673

9613 -#: builtin/help.c:45

9674 +#: builtin/help.c:47

9675 msgid "print list of useful guides"

9676 msgstr "lista användbara vägledningar"

9677

9617 -#: builtin/help.c:46

9678 +#: builtin/help.c:48

9679 msgid "show man page"

9680 msgstr "visa manualsida"

9681

9621 -#: builtin/help.c:47

9682 +#: builtin/help.c:49

9683 msgid "show manual in web browser"

9684 msgstr "visa manual i webbläsare"

9685

9625 -#: builtin/help.c:49

9686 +#: builtin/help.c:51

9687 msgid "show info page"

9688 msgstr "visa info-sida"

9689

9629 -#: builtin/help.c:55

9690 +#: builtin/help.c:53

9691 +msgid "print command description"

9692 +msgstr "visa kommandobeskrivning"

9693 +

9694 +#: builtin/help.c:58

9695 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"

9696 msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]"

9697

9633 -#: builtin/help.c:67

9698 +#: builtin/help.c:70

9699 #, c-format

9700 msgid "unrecognized help format '%s'"

9701 msgstr "okänt hjälpformat: ”%s”"

9702

9638 -#: builtin/help.c:94

9703 +#: builtin/help.c:97

9704 msgid "Failed to start emacsclient."

9705 msgstr "Misslyckades starta emacsclient."

9706

9642 -#: builtin/help.c:107

9707 +#: builtin/help.c:110

9708 msgid "Failed to parse emacsclient version."

9709 msgstr "Kunde inte tolka emacsclient-version."

9710

9646 -#: builtin/help.c:115

9711 +#: builtin/help.c:118

9712 #, c-format

9713 msgid "emacsclient version '%d' too old (< 22)."

9714 msgstr "emacsclient version \"%d\" för gammal (< 22)."

9715

9651 -#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173

9716 +#: builtin/help.c:136 builtin/help.c:158 builtin/help.c:168 builtin/help.c:176

9717 #, c-format

9718 msgid "failed to exec '%s'"

9719 msgstr "exec misslyckades för \"%s\""

9720

9656 -#: builtin/help.c:211

9721 +#: builtin/help.c:214

9722 #, c-format

9723 msgid ""

9724 "'%s': path for unsupported man viewer.\n"

@@ -9662,7 +9727,7 @@ msgstr ""

9727 "\"%s\": sökväg för man-visare som ej stöds.\n"

9728 "Använd \"man.<verktyg>.cmd\" istället."

9729

9665 -#: builtin/help.c:223

9730 +#: builtin/help.c:226

9731 #, c-format

9732 msgid ""

9733 "'%s': cmd for supported man viewer.\n"

@@ -9671,61 +9736,25 @@ msgstr ""

9736 "\"%s\": kommando för man-visare som stöds.\n"

9737 "Använd \"man.<verktyg>.path\" istället."

9738

9674 -#: builtin/help.c:340

9739 +#: builtin/help.c:343

9740 #, c-format

9741 msgid "'%s': unknown man viewer."

9742 msgstr "\"%s\": okänd man-visare."

9743

9679 -#: builtin/help.c:357

9744 +#: builtin/help.c:360

9745 msgid "no man viewer handled the request"

9746 msgstr "ingen man-visare hanterade förfrågan"

9747

9683 -#: builtin/help.c:365

9748 +#: builtin/help.c:368

9749 msgid "no info viewer handled the request"

9750 msgstr "ingen info-visare hanterade förfrågan"

9751

9687 -#: builtin/help.c:407

9688 -msgid "Defining attributes per path"

9689 -msgstr "Definierar attribut per sökväg"

9690 -

9691 -#: builtin/help.c:408

9692 -msgid "Everyday Git With 20 Commands Or So"

9693 -msgstr "Git för dagligt bruk i ungefär 20 kommandon"

9694 -

9695 -#: builtin/help.c:409

9696 -msgid "A Git glossary"

9697 -msgstr "En Git-ordlista"

9698 -

9699 -#: builtin/help.c:410

9700 -msgid "Specifies intentionally untracked files to ignore"

9701 -msgstr "Ange avsiktligen ospårade filer att ignorera"

9702 -

9703 -#: builtin/help.c:411

9704 -msgid "Defining submodule properties"

9705 -msgstr "Ange egenskaper för undermoduler"

9706 -

9707 -#: builtin/help.c:412

9708 -msgid "Specifying revisions and ranges for Git"

9709 -msgstr "Ange versioner och intervall i Git"

9710 -

9711 -#: builtin/help.c:413

9712 -msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

9713 -msgstr "Introduktion till Git (för version 1.5.1 och senare)"

9714 -

9715 -#: builtin/help.c:414

9716 -msgid "An overview of recommended workflows with Git"

9717 -msgstr "Översikt över rekommenderade arbetsflöden med Git"

9718 -

9719 -#: builtin/help.c:426

9720 -msgid "The common Git guides are:\n"

9721 -msgstr "De vanliga Git-vägledningarna är:\n"

9722 -

9723 -#: builtin/help.c:444

9752 +#: builtin/help.c:415

9753 #, c-format

9754 msgid "'%s' is aliased to '%s'"

9755 msgstr "\"%s\" är ett alias för \"%s\""

9756

9728 -#: builtin/help.c:466 builtin/help.c:483

9757 +#: builtin/help.c:442 builtin/help.c:459

9758 #, c-format

9759 msgid "usage: %s%s"

9760 msgstr "användning: %s%s"

@@ -10064,8 +10093,8 @@ msgstr "ignorerar mallen %s"

10093

10094 #: builtin/init-db.c:120

10095 #, c-format

10067 -msgid "templates not found %s"

10068 -msgstr "mallarna hittades inte %s"

10096 +msgid "templates not found in %s"

10097 +msgstr "mallarna hittades inte i %s"

10098

10099 #: builtin/init-db.c:135

10100 #, c-format

@@ -10742,183 +10771,183 @@ msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"

10771 msgid "empty mbox: '%s'"

10772 msgstr "tom mbox: ”%s”"

10773

10745 -#: builtin/merge.c:50

10774 +#: builtin/merge.c:51

10775 msgid "git merge [<options>] [<commit>...]"

10776 msgstr "git merge [<flaggor>] [<incheckning>...]"

10777

10749 -#: builtin/merge.c:51

10778 +#: builtin/merge.c:52

10779 msgid "git merge --abort"

10780 msgstr "git merge --abort"

10781

10753 -#: builtin/merge.c:52

10782 +#: builtin/merge.c:53

10783 msgid "git merge --continue"

10784 msgstr "git merge --continue"

10785

10757 -#: builtin/merge.c:109

10786 +#: builtin/merge.c:110

10787 msgid "switch `m' requires a value"

10788 msgstr "flaggan \"m\" behöver ett värde"

10789

10761 -#: builtin/merge.c:146

10790 +#: builtin/merge.c:147

10791 #, c-format

10792 msgid "Could not find merge strategy '%s'.\n"

10793 msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"

10794

10766 -#: builtin/merge.c:147

10795 +#: builtin/merge.c:148

10796 #, c-format

10797 msgid "Available strategies are:"

10798 msgstr "Tillgängliga strategier är:"

10799

10771 -#: builtin/merge.c:152

10800 +#: builtin/merge.c:153

10801 #, c-format

10802 msgid "Available custom strategies are:"

10803 msgstr "Tillgängliga skräddarsydda strategier är:"

10804

10776 -#: builtin/merge.c:202 builtin/pull.c:142

10805 +#: builtin/merge.c:203 builtin/pull.c:142

10806 msgid "do not show a diffstat at the end of the merge"

10807 msgstr "visa inte en diffstat när sammanslagningen är färdig"

10808

10780 -#: builtin/merge.c:205 builtin/pull.c:145

10809 +#: builtin/merge.c:206 builtin/pull.c:145

10810 msgid "show a diffstat at the end of the merge"

10811 msgstr "visa en diffstat när sammanslagningen är färdig"

10812

10784 -#: builtin/merge.c:206 builtin/pull.c:148

10813 +#: builtin/merge.c:207 builtin/pull.c:148

10814 msgid "(synonym to --stat)"

10815 msgstr "(synonym till --stat)"

10816

10788 -#: builtin/merge.c:208 builtin/pull.c:151

10817 +#: builtin/merge.c:209 builtin/pull.c:151

10818 msgid "add (at most <n>) entries from shortlog to merge commit message"

10819 msgstr ""

10820 "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"

10821

10793 -#: builtin/merge.c:211 builtin/pull.c:157

10822 +#: builtin/merge.c:212 builtin/pull.c:157

10823 msgid "create a single commit instead of doing a merge"

10824 msgstr "skapa en ensam incheckning istället för en sammanslagning"

10825

10797 -#: builtin/merge.c:213 builtin/pull.c:160

10826 +#: builtin/merge.c:214 builtin/pull.c:160

10827 msgid "perform a commit if the merge succeeds (default)"

10828 msgstr "utför en incheckning om sammanslagningen lyckades (standard)"

10829

10801 -#: builtin/merge.c:215 builtin/pull.c:163

10830 +#: builtin/merge.c:216 builtin/pull.c:163

10831 msgid "edit message before committing"

10832 msgstr "redigera meddelande innan incheckning"

10833

10805 -#: builtin/merge.c:216

10834 +#: builtin/merge.c:217

10835 msgid "allow fast-forward (default)"

10836 msgstr "tillåt snabbspolning (standard)"

10837

10809 -#: builtin/merge.c:218 builtin/pull.c:169

10838 +#: builtin/merge.c:219 builtin/pull.c:169

10839 msgid "abort if fast-forward is not possible"

10840 msgstr "avbryt om snabbspolning inte är möjlig"

10841

10813 -#: builtin/merge.c:222 builtin/pull.c:172

10842 +#: builtin/merge.c:223 builtin/pull.c:172

10843 msgid "verify that the named commit has a valid GPG signature"

10844 msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"

10845

10817 -#: builtin/merge.c:223 builtin/notes.c:777 builtin/pull.c:176

10846 +#: builtin/merge.c:224 builtin/notes.c:777 builtin/pull.c:176

10847 #: builtin/revert.c:109

10848 msgid "strategy"

10849 msgstr "strategi"

10850

10822 -#: builtin/merge.c:224 builtin/pull.c:177

10851 +#: builtin/merge.c:225 builtin/pull.c:177

10852 msgid "merge strategy to use"

10853 msgstr "sammanslagningsstrategi att använda"

10854

10826 -#: builtin/merge.c:225 builtin/pull.c:180

10855 +#: builtin/merge.c:226 builtin/pull.c:180

10856 msgid "option=value"

10857 msgstr "alternativ=värde"

10858

10830 -#: builtin/merge.c:226 builtin/pull.c:181

10859 +#: builtin/merge.c:227 builtin/pull.c:181

10860 msgid "option for selected merge strategy"

10861 msgstr "alternativ för vald sammanslagningsstrategi"

10862

10834 -#: builtin/merge.c:228

10863 +#: builtin/merge.c:229

10864 msgid "merge commit message (for a non-fast-forward merge)"

10865 msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"

10866

10838 -#: builtin/merge.c:232

10867 +#: builtin/merge.c:233

10868 msgid "abort the current in-progress merge"

10869 msgstr "avbryt den pågående sammanslagningen"

10870

10842 -#: builtin/merge.c:234

10871 +#: builtin/merge.c:235

10872 msgid "continue the current in-progress merge"

10873 msgstr "fortsätt den pågående sammanslagningen"

10874

10846 -#: builtin/merge.c:236 builtin/pull.c:188

10875 +#: builtin/merge.c:237 builtin/pull.c:188

10876 msgid "allow merging unrelated histories"

10877 msgstr "tillåt sammanslagning av orelaterade historier"

10878

10850 -#: builtin/merge.c:242

10879 +#: builtin/merge.c:243

10880 msgid "verify commit-msg hook"

10881 msgstr "bekräfta commit-msg-krok"

10882

10854 -#: builtin/merge.c:267

10883 +#: builtin/merge.c:268

10884 msgid "could not run stash."

10885 msgstr "kunde köra stash."

10886

10858 -#: builtin/merge.c:272

10887 +#: builtin/merge.c:273

10888 msgid "stash failed"

10889 msgstr "stash misslyckades"

10890

10862 -#: builtin/merge.c:277

10891 +#: builtin/merge.c:278

10892 #, c-format

10893 msgid "not a valid object: %s"

10894 msgstr "inte ett giltigt objekt: %s"

10895

10867 -#: builtin/merge.c:299 builtin/merge.c:316

10896 +#: builtin/merge.c:300 builtin/merge.c:317

10897 msgid "read-tree failed"

10898 msgstr "read-tree misslyckades"

10899

10871 -#: builtin/merge.c:346

10900 +#: builtin/merge.c:347

10901 msgid " (nothing to squash)"

10902 msgstr " (inget att platta till)"

10903

10875 -#: builtin/merge.c:357

10904 +#: builtin/merge.c:358

10905 #, c-format

10906 msgid "Squash commit -- not updating HEAD\n"

10907 msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"

10908

10880 -#: builtin/merge.c:407

10909 +#: builtin/merge.c:408

10910 #, c-format

10911 msgid "No merge message -- not updating HEAD\n"

10912 msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"

10913

10885 -#: builtin/merge.c:457

10914 +#: builtin/merge.c:458

10915 #, c-format

10916 msgid "'%s' does not point to a commit"

10917 msgstr "\"%s\" verkar inte peka på en incheckning"

10918

10890 -#: builtin/merge.c:547

10919 +#: builtin/merge.c:548

10920 #, c-format

10921 msgid "Bad branch.%s.mergeoptions string: %s"

10922 msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"

10923

10895 -#: builtin/merge.c:668

10924 +#: builtin/merge.c:669

10925 msgid "Not handling anything other than two heads merge."

10926 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."

10927

10899 -#: builtin/merge.c:682

10928 +#: builtin/merge.c:683

10929 #, c-format

10930 msgid "Unknown option for merge-recursive: -X%s"

10931 msgstr "Felaktig flagga för merge-recursive: -X%s"

10932

10904 -#: builtin/merge.c:697

10933 +#: builtin/merge.c:698

10934 #, c-format

10935 msgid "unable to write %s"

10936 msgstr "kunde inte skriva %s"

10937

10909 -#: builtin/merge.c:748

10938 +#: builtin/merge.c:749

10939 #, c-format

10940 msgid "Could not read from '%s'"

10941 msgstr "Kunde inte läsa från \"%s\""

10942

10914 -#: builtin/merge.c:757

10943 +#: builtin/merge.c:758

10944 #, c-format

10945 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

10946 msgstr ""

10947 "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "

10948 "den.\n"

10949

10921 -#: builtin/merge.c:763

10950 +#: builtin/merge.c:764

10951 #, c-format

10952 msgid ""

10953 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -10934,69 +10963,69 @@ msgstr ""

10963 "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"

10964 "avbryter incheckningen.\n"

10965

10937 -#: builtin/merge.c:799

10966 +#: builtin/merge.c:800

10967 msgid "Empty commit message."

10968 msgstr "Tomt incheckningsmeddelande."

10969

10941 -#: builtin/merge.c:818

10970 +#: builtin/merge.c:819

10971 #, c-format

10972 msgid "Wonderful.\n"

10973 msgstr "Underbart.\n"

10974

10946 -#: builtin/merge.c:871

10975 +#: builtin/merge.c:872

10976 #, c-format

10977 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

10978 msgstr ""

10979 "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"

10980

10952 -#: builtin/merge.c:910

10981 +#: builtin/merge.c:911

10982 msgid "No current branch."

10983 msgstr "Inte på någon gren."

10984

10956 -#: builtin/merge.c:912

10985 +#: builtin/merge.c:913

10986 msgid "No remote for the current branch."

10987 msgstr "Ingen fjärr för aktuell gren."

10988

10960 -#: builtin/merge.c:914

10989 +#: builtin/merge.c:915

10990 msgid "No default upstream defined for the current branch."

10991 msgstr "Ingen standarduppström angiven för aktuell gren."

10992

10964 -#: builtin/merge.c:919

10993 +#: builtin/merge.c:920

10994 #, c-format

10995 msgid "No remote-tracking branch for %s from %s"

10996 msgstr "Ingen fjärrspårande gren för %s från %s"

10997

10969 -#: builtin/merge.c:972

10998 +#: builtin/merge.c:973

10999 #, c-format

11000 msgid "Bad value '%s' in environment '%s'"

11001 msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""

11002

10974 -#: builtin/merge.c:1074

11003 +#: builtin/merge.c:1075

11004 #, c-format

11005 msgid "not something we can merge in %s: %s"

11006 msgstr "inte något vi kan slå ihop med %s: %s"

11007

10979 -#: builtin/merge.c:1108

11008 +#: builtin/merge.c:1109

11009 msgid "not something we can merge"

11010 msgstr "inte något vi kan slå ihop"

11011

10983 -#: builtin/merge.c:1210

11012 +#: builtin/merge.c:1211

11013 msgid "--abort expects no arguments"

11014 msgstr "--abort tar inga argument"

11015

10987 -#: builtin/merge.c:1214

11016 +#: builtin/merge.c:1215

11017 msgid "There is no merge to abort (MERGE_HEAD missing)."

11018 msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."

11019

10991 -#: builtin/merge.c:1226

11020 +#: builtin/merge.c:1227

11021 msgid "--continue expects no arguments"

11022 msgstr "--continue tar inga argument"

11023

10995 -#: builtin/merge.c:1230

11024 +#: builtin/merge.c:1231

11025 msgid "There is no merge in progress (MERGE_HEAD missing)."

11026 msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."

11027

10999 -#: builtin/merge.c:1246

11028 +#: builtin/merge.c:1247

11029 msgid ""

11030 "You have not concluded your merge (MERGE_HEAD exists).\n"

11031 "Please, commit your changes before you merge."

@@ -11004,7 +11033,7 @@ msgstr ""

11033 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"

11034 "Checka in dina ändringar innan du slår ihop."

11035

11007 -#: builtin/merge.c:1253

11036 +#: builtin/merge.c:1254

11037 msgid ""

11038 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

11039 "Please, commit your changes before you merge."

@@ -11012,114 +11041,114 @@ msgstr ""

11041 "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"

11042 "Checka in dina ändringar innan du slår ihop."

11043

11015 -#: builtin/merge.c:1256

11044 +#: builtin/merge.c:1257

11045 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

11046 msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."

11047

11019 -#: builtin/merge.c:1265

11048 +#: builtin/merge.c:1266

11049 msgid "You cannot combine --squash with --no-ff."

11050 msgstr "Du kan inte kombinera --squash med --no-ff."

11051

11023 -#: builtin/merge.c:1273

11052 +#: builtin/merge.c:1274

11053 msgid "No commit specified and merge.defaultToUpstream not set."

11054 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."

11055

11027 -#: builtin/merge.c:1290

11056 +#: builtin/merge.c:1291

11057 msgid "Squash commit into empty head not supported yet"

11058 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"

11059

11031 -#: builtin/merge.c:1292

11060 +#: builtin/merge.c:1293

11061 msgid "Non-fast-forward commit does not make sense into an empty head"

11062 msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"

11063

11035 -#: builtin/merge.c:1297

11064 +#: builtin/merge.c:1298

11065 #, c-format

11066 msgid "%s - not something we can merge"

11067 msgstr "%s - inte något vi kan slå ihop"

11068

11040 -#: builtin/merge.c:1299

11069 +#: builtin/merge.c:1300

11070 msgid "Can merge only exactly one commit into empty head"

11071 msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud"

11072

11044 -#: builtin/merge.c:1333

11073 +#: builtin/merge.c:1334

11074 #, c-format

11075 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

11076 msgstr ""

11077 "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."

11078

11050 -#: builtin/merge.c:1336

11079 +#: builtin/merge.c:1337

11080 #, c-format

11081 msgid "Commit %s has a bad GPG signature allegedly by %s."

11082 msgstr ""

11083 "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."

11084

11056 -#: builtin/merge.c:1339

11085 +#: builtin/merge.c:1340

11086 #, c-format

11087 msgid "Commit %s does not have a GPG signature."

11088 msgstr "Incheckning %s har inte någon GPG-signatur."

11089

11061 -#: builtin/merge.c:1342

11090 +#: builtin/merge.c:1343

11091 #, c-format

11092 msgid "Commit %s has a good GPG signature by %s\n"

11093 msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"

11094

11066 -#: builtin/merge.c:1401

11095 +#: builtin/merge.c:1402

11096 msgid "refusing to merge unrelated histories"

11097 msgstr "vägrar slå samman orelaterad historik"

11098

11070 -#: builtin/merge.c:1410

11099 +#: builtin/merge.c:1411

11100 msgid "Already up to date."

11101 msgstr "Redan à jour."

11102

11074 -#: builtin/merge.c:1420

11103 +#: builtin/merge.c:1421

11104 #, c-format

11105 msgid "Updating %s..%s\n"

11106 msgstr "Uppdaterar %s..%s\n"

11107

11079 -#: builtin/merge.c:1461

11108 +#: builtin/merge.c:1462

11109 #, c-format

11110 msgid "Trying really trivial in-index merge...\n"

11111 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"

11112

11084 -#: builtin/merge.c:1468

11113 +#: builtin/merge.c:1469

11114 #, c-format

11115 msgid "Nope.\n"

11116 msgstr "Nej.\n"

11117

11089 -#: builtin/merge.c:1493

11118 +#: builtin/merge.c:1494

11119 msgid "Already up to date. Yeeah!"

11120 msgstr "Redan à jour. Toppen!"

11121

11093 -#: builtin/merge.c:1499

11122 +#: builtin/merge.c:1500

11123 msgid "Not possible to fast-forward, aborting."

11124 msgstr "Kan inte snabbspola, avbryter."

11125

11097 -#: builtin/merge.c:1522 builtin/merge.c:1601

11126 +#: builtin/merge.c:1523 builtin/merge.c:1602

11127 #, c-format

11128 msgid "Rewinding the tree to pristine...\n"

11129 msgstr "Återspolar trädet till orört...\n"

11130

11102 -#: builtin/merge.c:1526

11131 +#: builtin/merge.c:1527

11132 #, c-format

11133 msgid "Trying merge strategy %s...\n"

11134 msgstr "Försöker sammanslagningsstrategin %s...\n"

11135

11107 -#: builtin/merge.c:1592

11136 +#: builtin/merge.c:1593

11137 #, c-format

11138 msgid "No merge strategy handled the merge.\n"

11139 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"

11140

11112 -#: builtin/merge.c:1594

11141 +#: builtin/merge.c:1595

11142 #, c-format

11143 msgid "Merge with strategy %s failed.\n"

11144 msgstr "Sammanslagning med strategin %s misslyckades.\n"

11145

11117 -#: builtin/merge.c:1603

11146 +#: builtin/merge.c:1604

11147 #, c-format

11148 msgid "Using the %s to prepare resolving by hand.\n"

11149 msgstr "Använder %s för att förbereda lösning för hand.\n"

11150

11122 -#: builtin/merge.c:1615

11151 +#: builtin/merge.c:1616

11152 #, c-format

11153 msgid "Automatic merge went well; stopped before committing as requested\n"

11154 msgstr ""

@@ -13609,23 +13638,23 @@ msgstr "rev-list stöder inte visning av anteckningar"

13638 msgid "cannot combine --use-bitmap-index with object filtering"

13639 msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering"

13640

13612 -#: builtin/rev-parse.c:402

13641 +#: builtin/rev-parse.c:406

13642 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"

13643 msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]"

13644

13616 -#: builtin/rev-parse.c:407

13645 +#: builtin/rev-parse.c:411

13646 msgid "keep the `--` passed as an arg"

13647 msgstr "behåll \"--\" sänt som argument"

13648

13620 -#: builtin/rev-parse.c:409

13649 +#: builtin/rev-parse.c:413

13650 msgid "stop parsing after the first non-option argument"

13651 msgstr "sluta tolka efter första argument som inte är flagga"

13652

13624 -#: builtin/rev-parse.c:412

13653 +#: builtin/rev-parse.c:416

13654 msgid "output in stuck long form"

13655 msgstr "utdata fast i lång form"

13656

13628 -#: builtin/rev-parse.c:545

13657 +#: builtin/rev-parse.c:549

13658 msgid ""

13659 "git rev-parse --parseopt [<options>] -- [<args>...]\n"

13660 " or: git rev-parse --sq-quote [<arg>...]\n"

@@ -15270,7 +15299,7 @@ msgstr ""

15299 msgid "print debugging messages to stderr"

15300 msgstr "skriv felsökningsmeddelanden på standard fel"

15301

15273 -#: git.c:26

15302 +#: git.c:27

15303 msgid ""

15304 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"

15305 " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"

@@ -15287,7 +15316,7 @@ msgstr ""

15316 " [--git-dir=<sökväg>] [--work-tree=<sökväg>] [--namespace=<namn>]\n"

15317 " <kommando> [<flaggor>]"

15318

15290 -#: git.c:33

15319 +#: git.c:34

15320 msgid ""

15321 "'git help -a' and 'git help -g' list available subcommands and some\n"

15322 "concept guides. See 'git help <command>' or 'git help <concept>'\n"

@@ -15297,48 +15326,48 @@ msgstr ""

15326 "några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"

15327 "<koncept>\" för att läsa mer om specifika underkommandon och koncept."

15328

15300 -#: git.c:113

15329 +#: git.c:173

15330 #, c-format

15331 msgid "no directory given for --git-dir\n"

15332 msgstr "ingen katalog angavs för --git-dir\n"

15333

15305 -#: git.c:127

15334 +#: git.c:187

15335 #, c-format

15336 msgid "no namespace given for --namespace\n"

15337 msgstr "ingen namnrymd angavs för --namespace\n"

15338

15310 -#: git.c:141

15339 +#: git.c:201

15340 #, c-format

15341 msgid "no directory given for --work-tree\n"

15342 msgstr "ingen katalog angavs för --work-tree\n"

15343

15315 -#: git.c:155

15344 +#: git.c:215

15345 #, c-format

15346 msgid "no prefix given for --super-prefix\n"

15347 msgstr "inget prefix angavs för --super-prefix\n"

15348

15320 -#: git.c:177

15349 +#: git.c:237

15350 #, c-format

15351 msgid "-c expects a configuration string\n"

15352 msgstr "-c förväntar en konfigurationssträng\n"

15353

15325 -#: git.c:215

15354 +#: git.c:275

15355 #, c-format

15356 msgid "no directory given for -C\n"

15357 msgstr "ingen katalog angavs för -C\n"

15358

15330 -#: git.c:233

15359 +#: git.c:300

15360 #, c-format

15361 msgid "unknown option: %s\n"

15362 msgstr "okänd flagga: %s\n"

15363

15335 -#: git.c:698

15364 +#: git.c:765

15365 #, c-format

15366 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"

15367 msgstr ""

15368 "expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n"

15369

15341 -#: git.c:710

15370 +#: git.c:777

15371 #, c-format

15372 msgid "failed to run command '%s': %s\n"

15373 msgstr "misslyckades köra kommandot \"%s\": %s\n"

@@ -15380,129 +15409,656 @@ msgstr "argument"

15409 msgid "object filtering"

15410 msgstr "objektfiltrering"

15411

15383 -#: common-cmds.h:9

15384 -msgid "start a working area (see also: git help tutorial)"

15385 -msgstr "starta arbetskatalog (se också: git help tutorial)"

15412 +#: parse-options.h:157

15413 +msgid "expiry-date"

15414 +msgstr "giltig-till"

15415

15387 -#: common-cmds.h:10

15388 -msgid "work on the current change (see also: git help everyday)"

15389 -msgstr "jobba med aktuell förändring (se också: git help everyday)"

15416 +#: parse-options.h:172

15417 +msgid "no-op (backward compatibility)"

15418 +msgstr "ingen funktion (bakåtkompatibilitet)"

15419

15391 -#: common-cmds.h:11

15392 -msgid "examine the history and state (see also: git help revisions)"

15393 -msgstr "utforska historiken och tillståndet (se också: git help revisions)"

15420 +#: parse-options.h:251

15421 +msgid "be more verbose"

15422 +msgstr "var mer pratsam"

15423

15395 -#: common-cmds.h:12

15396 -msgid "grow, mark and tweak your common history"

15397 -msgstr "utöka, markera och justera din gemensamma historik"

15424 +#: parse-options.h:253

15425 +msgid "be more quiet"

15426 +msgstr "var mer tyst"

15427

15399 -#: common-cmds.h:13

15400 -msgid "collaborate (see also: git help workflows)"

15401 -msgstr "samarbeta (se också: git help workflows)"

15428 +#: parse-options.h:259

15429 +msgid "use <n> digits to display SHA-1s"

15430 +msgstr "använd <n> siffror för att visa SHA-1:or"

15431

15403 -#: common-cmds.h:17

15432 +#: command-list.h:50

15433 msgid "Add file contents to the index"

15434 msgstr "Lägg filinnehåll till indexet"

15435

15407 -#: common-cmds.h:18

15436 +#: command-list.h:51

15437 +msgid "Apply a series of patches from a mailbox"

15438 +msgstr "Tillämpa en serie patchar från en brevlåda"

15439 +

15440 +#: command-list.h:52

15441 +msgid "Annotate file lines with commit information"

15442 +msgstr "Kommentera filrader med incheckningsinformation"

15443 +

15444 +#: command-list.h:53

15445 +msgid "Apply a patch to files and/or to the index"

15446 +msgstr "Tillämpa en patch på filer och/eller indexet"

15447 +

15448 +#: command-list.h:54

15449 +msgid "Import an Arch repository into Git"

15450 +msgstr "Importera ett Arch-arkiv till Git"

15451 +

15452 +#: command-list.h:55

15453 +msgid "Create an archive of files from a named tree"

15454 +msgstr "Skapa ett arkiv över filer från ett namngivet träd"

15455 +

15456 +#: command-list.h:56

15457 msgid "Use binary search to find the commit that introduced a bug"

15458 msgstr "Använd binärsökning för att hitta ändringen som introducerade ett fel"

15459

15411 -#: common-cmds.h:19

15460 +#: command-list.h:57

15461 +msgid "Show what revision and author last modified each line of a file"

15462 +msgstr "Visa version och författare som sist modifierade varje rad i en fil"

15463 +

15464 +#: command-list.h:58

15465 msgid "List, create, or delete branches"

15466 msgstr "Visa, skapa eller ta bort grenar"

15467

15415 -#: common-cmds.h:20

15468 +#: command-list.h:59

15469 +msgid "Move objects and refs by archive"

15470 +msgstr "Flytta objekt och referenser efter arkiv"

15471 +

15472 +#: command-list.h:60

15473 +msgid "Provide content or type and size information for repository objects"

15474 +msgstr ""

15475 +"Visa innehåller eller typ- och storleksinformation för objekt i arkivet."

15476 +

15477 +#: command-list.h:61

15478 +msgid "Display gitattributes information"

15479 +msgstr "Visa information från gitattributes"

15480 +

15481 +#: command-list.h:62

15482 +msgid "Debug gitignore / exclude files"

15483 +msgstr "Felsök gitignore / exkluderings-filer"

15484 +

15485 +#: command-list.h:63

15486 +msgid "Show canonical names and email addresses of contacts"

15487 +msgstr "Visa kanoniska namn och e-postadresser för kontakter"

15488 +

15489 +#: command-list.h:64

15490 msgid "Switch branches or restore working tree files"

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

15492

15419 -#: common-cmds.h:21

15493 +#: command-list.h:65

15494 +msgid "Copy files from the index to the working tree"

15495 +msgstr "Kopiera filer från indexet till arbetskatalogen"

15496 +

15497 +#: command-list.h:66

15498 +msgid "Ensures that a reference name is well formed"

15499 +msgstr "Se till att referensen är välformad"

15500 +

15501 +#: command-list.h:67

15502 +msgid "Find commits yet to be applied to upstream"

15503 +msgstr "Hitta incheckningar som ännu inte applicerats uppströms"

15504 +

15505 +#: command-list.h:68

15506 +msgid "Apply the changes introduced by some existing commits"

15507 +msgstr "Applicera ändringarna introducerade av befintliga incheckningar"

15508 +

15509 +#: command-list.h:69

15510 +msgid "Graphical alternative to git-commit"

15511 +msgstr "Grafiskt alternativ till git-commit"

15512 +

15513 +#: command-list.h:70

15514 +msgid "Remove untracked files from the working tree"

15515 +msgstr "Ta bort ospårade filer från arbetskatalogen"

15516 +

15517 +#: command-list.h:71

15518 msgid "Clone a repository into a new directory"

15519 msgstr "Klona ett arkiv till en ny katalog"

15520

15423 -#: common-cmds.h:22

15521 +#: command-list.h:72

15522 +msgid "Display data in columns"

15523 +msgstr "Visa data i kolumner"

15524 +

15525 +#: command-list.h:73

15526 msgid "Record changes to the repository"

15527 msgstr "Protokollför ändringar i arkivet"

15528

15427 -#: common-cmds.h:23

15529 +#: command-list.h:74

15530 +msgid "Write and verify Git commit graph files"

15531 +msgstr "Skriv och verifiera Git-incheckningsgraffiler"

15532 +

15533 +#: command-list.h:75

15534 +msgid "Create a new commit object"

15535 +msgstr "Skapa ett nytt incheckningsobjekt"

15536 +

15537 +#: command-list.h:76

15538 +msgid "Get and set repository or global options"

15539 +msgstr "Läs och skriv alternativ för arkiv eller globalt"

15540 +

15541 +#: command-list.h:77

15542 +msgid "Count unpacked number of objects and their disk consumption"

15543 +msgstr "Räkna antal opackade objekt och mängd diskutrymme"

15544 +

15545 +#: command-list.h:78

15546 +msgid "Retrieve and store user credentials"

15547 +msgstr "Hämta och spara användarreferenser"

15548 +

15549 +#: command-list.h:79

15550 +msgid "Helper to temporarily store passwords in memory"

15551 +msgstr "Hjälpprogram för att tillfälligt lagra lösenord i minnet"

15552 +

15553 +#: command-list.h:80

15554 +msgid "Helper to store credentials on disk"

15555 +msgstr "Hjälpprogram för att lagra användarreferenser på disk"

15556 +

15557 +#: command-list.h:81

15558 +msgid "Export a single commit to a CVS checkout"

15559 +msgstr "Exportera en enkel incheckning i en CVS-utcheckning"

15560 +

15561 +#: command-list.h:82

15562 +msgid "Salvage your data out of another SCM people love to hate"

15563 +msgstr "Rädda dina data ut ur andra SCM folk älskar att hata"

15564 +

15565 +#: command-list.h:83

15566 +msgid "A CVS server emulator for Git"

15567 +msgstr "En CVS-serveremulator för Git"

15568 +

15569 +#: command-list.h:84

15570 +msgid "A really simple server for Git repositories"

15571 +msgstr "En riktigt enkel server för Git-arkiv"

15572 +

15573 +#: command-list.h:85

15574 +msgid "Give an object a human readable name based on an available ref"

15575 +msgstr "Ge ett objekt användarläsbara namn baserade på en tillgänglig referens"

15576 +

15577 +#: command-list.h:86

15578 msgid "Show changes between commits, commit and working tree, etc"

15579 msgstr "Visa ändringar mellan incheckningar, med arbetskatalogen, osv"

15580

15431 -#: common-cmds.h:24

15581 +#: command-list.h:87

15582 +msgid "Compares files in the working tree and the index"

15583 +msgstr "Jämför filer i arbetskatalogen och indexet"

15584 +

15585 +#: command-list.h:88

15586 +msgid "Compare a tree to the working tree or index"

15587 +msgstr "Jämför en träd med arbetskatalogen eller indexet"

15588 +

15589 +#: command-list.h:89

15590 +msgid "Compares the content and mode of blobs found via two tree objects"

15591 +msgstr "Visar innehåll och läge för blob:ar som hittats via två trädobjekt"

15592 +

15593 +#: command-list.h:90

15594 +msgid "Show changes using common diff tools"

15595 +msgstr "Visa ändringar med vanliga diff-verktyg"

15596 +

15597 +#: command-list.h:91

15598 +msgid "Git data exporter"

15599 +msgstr "Exporterare för Git-data"

15600 +

15601 +#: command-list.h:92

15602 +msgid "Backend for fast Git data importers"

15603 +msgstr "Bakända för snabba Git-dataimporterare"

15604 +

15605 +#: command-list.h:93

15606 msgid "Download objects and refs from another repository"

15607 msgstr "Hämta objekt och referenser från annat arkiv"

15608

15435 -#: common-cmds.h:25

15609 +#: command-list.h:94

15610 +msgid "Receive missing objects from another repository"

15611 +msgstr "Ta emot saknade objekt från annat arkiv"

15612 +

15613 +#: command-list.h:95

15614 +msgid "Rewrite branches"

15615 +msgstr "Skriv om grenar"

15616 +

15617 +#: command-list.h:96

15618 +msgid "Produce a merge commit message"

15619 +msgstr "Skapa incheckningsmeddelande för en sammanslagning"

15620 +

15621 +#: command-list.h:97

15622 +msgid "Output information on each ref"

15623 +msgstr "Visa information för varje referens"

15624 +

15625 +#: command-list.h:98

15626 +msgid "Prepare patches for e-mail submission"

15627 +msgstr "Förbered patchar för insändning via e-post"

15628 +

15629 +#: command-list.h:99

15630 +msgid "Verifies the connectivity and validity of the objects in the database"

15631 +msgstr "Bekräftar konnektivitet och validitet för objektet i databasen"

15632 +

15633 +#: command-list.h:100

15634 +msgid "Cleanup unnecessary files and optimize the local repository"

15635 +msgstr "Städa onödiga filer och optimera det lokala arkivet"

15636 +

15637 +#: command-list.h:101

15638 +msgid "Extract commit ID from an archive created using git-archive"

15639 +msgstr "Hämta inchecknings-ID från ett arkiv skapat med git-archive"

15640 +

15641 +#: command-list.h:102

15642 msgid "Print lines matching a pattern"

15643 msgstr "Visa rader som motsvarar mönster"

15644

15439 -#: common-cmds.h:26

15645 +#: command-list.h:103

15646 +msgid "A portable graphical interface to Git"

15647 +msgstr "Ett portabelt grafiskt gränssnitt för Git"

15648 +

15649 +#: command-list.h:104

15650 +msgid "Compute object ID and optionally creates a blob from a file"

15651 +msgstr "Beräkna objekt-ID och möjligen skapa en blob från en fil"

15652 +

15653 +#: command-list.h:105

15654 +msgid "Display help information about Git"

15655 +msgstr "Visa hjälpinformation om Git"

15656 +

15657 +#: command-list.h:106

15658 +msgid "Server side implementation of Git over HTTP"

15659 +msgstr "Serversideimplementation av Git över HTTP"

15660 +

15661 +#: command-list.h:107

15662 +msgid "Download from a remote Git repository via HTTP"

15663 +msgstr "Hämta objekt och referenser från annat Git-arkiv över HTTP"

15664 +

15665 +#: command-list.h:108

15666 +msgid "Push objects over HTTP/DAV to another repository"

15667 +msgstr "Sänd objekt över HTTP/DAV till ett annat arkiv"

15668 +

15669 +#: command-list.h:109

15670 +msgid "Send a collection of patches from stdin to an IMAP folder"

15671 +msgstr "Sänd en samling patchar från stdin till en IMAP-mapp"

15672 +

15673 +#: command-list.h:110

15674 +msgid "Build pack index file for an existing packed archive"

15675 +msgstr "SKapa pack-indexfiler för ett befintligt packat arkiv"

15676 +

15677 +#: command-list.h:111

15678 msgid "Create an empty Git repository or reinitialize an existing one"

15679 msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt"

15680

15443 -#: common-cmds.h:27

15681 +#: command-list.h:112

15682 +msgid "Instantly browse your working repository in gitweb"

15683 +msgstr "Omedelbart bläddra i din arbetskatalog med gitweb"

15684 +

15685 +#: command-list.h:113

15686 +msgid "add or parse structured information in commit messages"

15687 +msgstr ""

15688 +"lägg till eller tolka strukturerad information i incheckningsmeddelanden"

15689 +

15690 +#: command-list.h:114

15691 +msgid "The Git repository browser"

15692 +msgstr "Bläddraren för Git-arkiv"

15693 +

15694 +#: command-list.h:115

15695 msgid "Show commit logs"

15696 msgstr "Visa incheckningsloggar"

15697

15447 -#: common-cmds.h:28

15698 +#: command-list.h:116

15699 +msgid "Show information about files in the index and the working tree"

15700 +msgstr "Visa information om filer i indexet och arbetskatalogen"

15701 +

15702 +#: command-list.h:117

15703 +msgid "List references in a remote repository"

15704 +msgstr "Lista referenser i ett fjärrarkiv"

15705 +

15706 +#: command-list.h:118

15707 +msgid "List the contents of a tree object"

15708 +msgstr "Visa innehållet i ett trädobjekt"

15709 +

15710 +#: command-list.h:119

15711 +msgid "Extracts patch and authorship from a single e-mail message"

15712 +msgstr "Hämta patch och ägarskap från ett enkelt e-postmeddelande"

15713 +

15714 +#: command-list.h:120

15715 +msgid "Simple UNIX mbox splitter program"

15716 +msgstr "Enkelt program för att dela en UNIX mbox"

15717 +

15718 +#: command-list.h:121

15719 msgid "Join two or more development histories together"

15720 msgstr "Slå ihop två eller flera utvecklingshistorier"

15721

15451 -#: common-cmds.h:29

15722 +#: command-list.h:122

15723 +msgid "Find as good common ancestors as possible for a merge"

15724 +msgstr "Hitta en så bra anfader som möjligt för sammanslagning"

15725 +

15726 +#: command-list.h:123

15727 +msgid "Run a three-way file merge"

15728 +msgstr "Kör en trevägs-filsammanslagning"

15729 +

15730 +#: command-list.h:124

15731 +msgid "Run a merge for files needing merging"

15732 +msgstr "Kör en sammanslagning för filer som behöver det"

15733 +

15734 +#: command-list.h:125

15735 +msgid "The standard helper program to use with git-merge-index"

15736 +msgstr "Förvalt hjälpprogram att använda tillsammans med git-merge-index"

15737 +

15738 +#: command-list.h:126

15739 +msgid "Run merge conflict resolution tools to resolve merge conflicts"

15740 +msgstr "Kör verktyg för lösning av sammanslagningskonflikter"

15741 +

15742 +#: command-list.h:127

15743 +msgid "Show three-way merge without touching index"

15744 +msgstr "Visa trevägssammanslagning utan att röra indexet"

15745 +

15746 +#: command-list.h:128

15747 +msgid "Creates a tag object"

15748 +msgstr "Skapar ett taggobjekt"

15749 +

15750 +#: command-list.h:129

15751 +msgid "Build a tree-object from ls-tree formatted text"

15752 +msgstr "Bygg ett trädobjekt från ls-tree-formaterad text"

15753 +

15754 +#: command-list.h:130

15755 msgid "Move or rename a file, a directory, or a symlink"

15756 msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk"

15757

15455 -#: common-cmds.h:30

15758 +#: command-list.h:131

15759 +msgid "Find symbolic names for given revs"

15760 +msgstr "Hitta symboliska namn för givna referenser"

15761 +

15762 +#: command-list.h:132

15763 +msgid "Add or inspect object notes"

15764 +msgstr "Lägg till eller inspektera objektanteckningar"

15765 +

15766 +#: command-list.h:133

15767 +msgid "Import from and submit to Perforce repositories"

15768 +msgstr "Importera från eller sänd till Perforce-arkiv"

15769 +

15770 +#: command-list.h:134

15771 +msgid "Create a packed archive of objects"

15772 +msgstr "Skapa ett packat arkiv med objekt"

15773 +

15774 +#: command-list.h:135

15775 +msgid "Find redundant pack files"

15776 +msgstr "Hitta redundanta pack-filer"

15777 +

15778 +#: command-list.h:136

15779 +msgid "Pack heads and tags for efficient repository access"

15780 +msgstr "Packa huvuden och taggar för effektiv arkivåtkomst"

15781 +

15782 +#: command-list.h:137

15783 +msgid "Routines to help parsing remote repository access parameters"

15784 +msgstr ""

15785 +"Rutiner för att göra det lättare att tolka åtkomstparametrar för fjärrarkiv"

15786 +

15787 +#: command-list.h:138

15788 +msgid "Compute unique ID for a patch"

15789 +msgstr "Beräkna unik ID för en patch"

15790 +

15791 +#: command-list.h:139

15792 +msgid "Prune all unreachable objects from the object database"

15793 +msgstr "Ta bort alla onåbara objekt från objektdatabasen"

15794 +

15795 +#: command-list.h:140

15796 +msgid "Remove extra objects that are already in pack files"

15797 +msgstr "Ta bort extraobjekt som redan finns i pack-filerna"

15798 +

15799 +#: command-list.h:141

15800 msgid "Fetch from and integrate with another repository or a local branch"

15801 msgstr "Hämta från och integrera med annat arkiv eller en lokal gren"

15802

15459 -#: common-cmds.h:31

15803 +#: command-list.h:142

15804 msgid "Update remote refs along with associated objects"

15805 msgstr "Uppdatera fjärr-referenser och tillhörande objekt"

15806

15463 -#: common-cmds.h:32

15807 +#: command-list.h:143

15808 +msgid "Applies a quilt patchset onto the current branch"

15809 +msgstr "Tillämpar en quilt-patchuppsättning på aktiv gren"

15810 +

15811 +#: command-list.h:144

15812 +msgid "Reads tree information into the index"

15813 +msgstr "Läser trädinformation in i indexet"

15814 +

15815 +#: command-list.h:145

15816 msgid "Reapply commits on top of another base tip"

15817 msgstr "Applicera incheckningar på nytt ovanpå en annan bastopp"

15818

15467 -#: common-cmds.h:33

15819 +#: command-list.h:146

15820 +msgid "Receive what is pushed into the repository"

15821 +msgstr "Ta emot det som sänds till arkivet"

15822 +

15823 +#: command-list.h:147

15824 +msgid "Manage reflog information"

15825 +msgstr "Hantera referenslogg-information"

15826 +

15827 +#: command-list.h:148

15828 +msgid "Manage set of tracked repositories"

15829 +msgstr "Hantera uppsättningen spårade arkiv"

15830 +

15831 +#: command-list.h:149

15832 +msgid "Pack unpacked objects in a repository"

15833 +msgstr "Packa opackade objekt i ett arkiv"

15834 +

15835 +#: command-list.h:150

15836 +msgid "Create, list, delete refs to replace objects"

15837 +msgstr "Skapa, visa, ta bort referenser för att ersätta objekt"

15838 +

15839 +#: command-list.h:151

15840 +msgid "Generates a summary of pending changes"

15841 +msgstr "Skapar en sammanfattning av väntande ändringar"

15842 +

15843 +#: command-list.h:152

15844 +msgid "Reuse recorded resolution of conflicted merges"

15845 +msgstr "Återanvänd sparad lösning av sammanslagningskonflikter"

15846 +

15847 +#: command-list.h:153

15848 msgid "Reset current HEAD to the specified state"

15849 msgstr "Återställ aktuell HEAD till angivet tillstånd"

15850

15471 -#: common-cmds.h:34

15851 +#: command-list.h:154

15852 +msgid "Revert some existing commits"

15853 +msgstr "Återställ några befintliga incheckningar"

15854 +

15855 +#: command-list.h:155

15856 +msgid "Lists commit objects in reverse chronological order"

15857 +msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning"

15858 +

15859 +#: command-list.h:156

15860 +msgid "Pick out and massage parameters"

15861 +msgstr "Plocka ut och massera parametrar"

15862 +

15863 +#: command-list.h:157

15864 msgid "Remove files from the working tree and from the index"

15865 msgstr "Ta bort filer från arbetskatalogen och från indexet"

15866

15475 -#: common-cmds.h:35

15867 +#: command-list.h:158

15868 +msgid "Send a collection of patches as emails"

15869 +msgstr "Sänd en uppsättning patchar som e-post"

15870 +

15871 +#: command-list.h:159

15872 +msgid "Push objects over Git protocol to another repository"

15873 +msgstr "Sänd objekt över Git-protokollet till annat arkiv"

15874 +

15875 +#: command-list.h:160

15876 +msgid "Restricted login shell for Git-only SSH access"

15877 +msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git"

15878 +

15879 +#: command-list.h:161

15880 +msgid "Summarize 'git log' output"

15881 +msgstr "Summera \"git log\"-utdata"

15882 +

15883 +#: command-list.h:162

15884 msgid "Show various types of objects"

15885 msgstr "Visa olika sorters objekt"

15886

15479 -#: common-cmds.h:36

15887 +#: command-list.h:163

15888 +msgid "Show branches and their commits"

15889 +msgstr "Visa grenar och deras incheckningar"

15890 +

15891 +#: command-list.h:164

15892 +msgid "Show packed archive index"

15893 +msgstr "Skapa packat arkivindex"

15894 +

15895 +#: command-list.h:165

15896 +msgid "List references in a local repository"

15897 +msgstr "Visa referenser i ett lokalt arkiv"

15898 +

15899 +#: command-list.h:166

15900 +msgid "Git's i18n setup code for shell scripts"

15901 +msgstr "Git:s i18n-startkod för skalskript"

15902 +

15903 +#: command-list.h:167

15904 +msgid "Common Git shell script setup code"

15905 +msgstr "Gemensam skriptstartkod för Git"

15906 +

15907 +#: command-list.h:168

15908 +msgid "Stash the changes in a dirty working directory away"

15909 +msgstr "Spara undan ändringar i en lortig arbetskatalog"

15910 +

15911 +#: command-list.h:169

15912 +msgid "Add file contents to the staging area"

15913 +msgstr "Lägg filinnehållet till indexet"

15914 +

15915 +#: command-list.h:170

15916 msgid "Show the working tree status"

15917 msgstr "Visa status för arbetskatalogen"

15918

15483 -#: common-cmds.h:37

15919 +#: command-list.h:171

15920 +msgid "Remove unnecessary whitespace"

15921 +msgstr "Ta bort onödiga blanksteg"

15922 +

15923 +#: command-list.h:172

15924 +msgid "Initialize, update or inspect submodules"

15925 +msgstr "Initiera, uppdatera eller inspektera undermoduler"

15926 +

15927 +#: command-list.h:173

15928 +msgid "Bidirectional operation between a Subversion repository and Git"

15929 +msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git"

15930 +

15931 +#: command-list.h:174

15932 +msgid "Read, modify and delete symbolic refs"

15933 +msgstr "Läs, modifiera eller ta bort symbolisk referens"

15934 +

15935 +#: command-list.h:175

15936 msgid "Create, list, delete or verify a tag object signed with GPG"

15937 msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt"

15938

15487 -#: parse-options.h:157

15488 -msgid "expiry-date"

15489 -msgstr "giltig-till"

15939 +#: command-list.h:176

15940 +msgid "Creates a temporary file with a blob's contents"

15941 +msgstr "Skapar temporära filer med innehållet från en blob"

15942

15491 -#: parse-options.h:172

15492 -msgid "no-op (backward compatibility)"

15493 -msgstr "ingen funktion (bakåtkompatibilitet)"

15943 +#: command-list.h:177

15944 +msgid "Unpack objects from a packed archive"

15945 +msgstr "Packa upp objekt från ett pakat arkiv"

15946

15495 -#: parse-options.h:251

15496 -msgid "be more verbose"

15497 -msgstr "var mer pratsam"

15947 +#: command-list.h:178

15948 +msgid "Register file contents in the working tree to the index"

15949 +msgstr "Registrera filinnehållet från arbetskatalogen i indexet"

15950

15499 -#: parse-options.h:253

15500 -msgid "be more quiet"

15501 -msgstr "var mer tyst"

15951 +#: command-list.h:179

15952 +msgid "Update the object name stored in a ref safely"

15953 +msgstr "Uppdatera objektnamnet i en referens på ett säkert sätt"

15954

15503 -#: parse-options.h:259

15504 -msgid "use <n> digits to display SHA-1s"

15505 -msgstr "använd <n> siffror för att visa SHA-1:or"

15955 +#: command-list.h:180

15956 +msgid "Update auxiliary info file to help dumb servers"

15957 +msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar"

15958 +

15959 +#: command-list.h:181

15960 +msgid "Send archive back to git-archive"

15961 +msgstr "Sänd arkivet tillbaka till git-archive"

15962 +

15963 +#: command-list.h:182

15964 +msgid "Send objects packed back to git-fetch-pack"

15965 +msgstr "Sänd packade objekt tillbaka till git-fetch-pack"

15966 +

15967 +#: command-list.h:183

15968 +msgid "Show a Git logical variable"

15969 +msgstr "Visa en logisk Git-variabel"

15970 +

15971 +#: command-list.h:184

15972 +msgid "Check the GPG signature of commits"

15973 +msgstr "Kontrollera GPG-signaturer för incheckningar"

15974 +

15975 +#: command-list.h:185

15976 +msgid "Validate packed Git archive files"

15977 +msgstr "Bekräfta packade Git-arkivfiler"

15978 +

15979 +#: command-list.h:186

15980 +msgid "Check the GPG signature of tags"

15981 +msgstr "Kontrollera GPG-signaturer i taggar"

15982 +

15983 +#: command-list.h:187

15984 +msgid "Git web interface (web frontend to Git repositories)"

15985 +msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)"

15986 +

15987 +#: command-list.h:188

15988 +msgid "Show logs with difference each commit introduces"

15989 +msgstr "Visa loggar med differenser varje incheckning introducerar"

15990 +

15991 +#: command-list.h:189

15992 +msgid "Manage multiple working trees"

15993 +msgstr "Hantera ytterligare arbetskataloger"

15994 +

15995 +#: command-list.h:190

15996 +msgid "Create a tree object from the current index"

15997 +msgstr "Skapa ett trädobjekt från aktuellt index"

15998 +

15999 +#: command-list.h:191

16000 +msgid "Defining attributes per path"

16001 +msgstr "Definierar attribut per sökväg"

16002 +

16003 +#: command-list.h:192

16004 +msgid "Git command-line interface and conventions"

16005 +msgstr "Gits kommandoradsgränssnitt och -konventioner"

16006 +

16007 +#: command-list.h:193

16008 +msgid "A Git core tutorial for developers"

16009 +msgstr "Grundläggande Git-handledning för utvecklare"

16010 +

16011 +#: command-list.h:194

16012 +msgid "Git for CVS users"

16013 +msgstr "Git för CVS-användare"

16014 +

16015 +#: command-list.h:195

16016 +msgid "Tweaking diff output"

16017 +msgstr "Justrea diff-utdata"

16018 +

16019 +#: command-list.h:196

16020 +msgid "A useful minimum set of commands for Everyday Git"

16021 +msgstr "Ett användbart minsta uppsättning kommandon för vardags-Git"

16022 +

16023 +#: command-list.h:197

16024 +msgid "A Git Glossary"

16025 +msgstr "En Git-ordlista"

16026 +

16027 +#: command-list.h:198

16028 +msgid "Hooks used by Git"

16029 +msgstr "Krokar som används av Git"

16030 +

16031 +#: command-list.h:199

16032 +msgid "Specifies intentionally untracked files to ignore"

16033 +msgstr "Ange avsiktligen ospårade filer att ignorera"

16034 +

16035 +#: command-list.h:200

16036 +msgid "Defining submodule properties"

16037 +msgstr "Ange egenskaper för undermoduler"

16038 +

16039 +#: command-list.h:201

16040 +msgid "Git namespaces"

16041 +msgstr "Git-namnrymder"

16042 +

16043 +#: command-list.h:202

16044 +msgid "Git Repository Layout"

16045 +msgstr "Gits arkivlayout"

16046 +

16047 +#: command-list.h:203

16048 +msgid "Specifying revisions and ranges for Git"

16049 +msgstr "Ange versioner och intervall i Git"

16050 +

16051 +#: command-list.h:204

16052 +msgid "A tutorial introduction to Git: part two"

16053 +msgstr "Introduktion till Git: del två"

16054 +

16055 +#: command-list.h:205

16056 +msgid "A tutorial introduction to Git"

16057 +msgstr "Introduktion till Git"

16058 +

16059 +#: command-list.h:206

16060 +msgid "An overview of recommended workflows with Git"

16061 +msgstr "Översikt över rekommenderade arbetsflöden med Git"

16062

16063 #: rerere.h:40

16064 msgid "update the index with reused conflict resolution if possible"

@@ -16255,7 +16811,7 @@ msgid ""

16811 "e, edit <commit> = use commit, but stop for amending\n"

16812 "s, squash <commit> = use commit, but meld into previous commit\n"

16813 "f, fixup <commit> = like \"squash\", but discard this commit's log message\n"

16258 -"x, exec <commit> = run command (the rest of the line) using shell\n"

16814 +"x, exec <command> = run command (the rest of the line) using shell\n"

16815 "d, drop <commit> = remove commit\n"

16816 "l, label <label> = label current HEAD with a name\n"

16817 "t, reset <label> = reset HEAD to a label\n"

@@ -16276,7 +16832,7 @@ msgstr ""

16832 "incheckning\n"

16833 "f, fixup <incheckning> = som \"squash\", men förkasta "

16834 "incheckningsmeddelandet\n"

16279 -"x, exec <incheckning> = kör kommando (resten av raden) i skalet\n"

16835 +"x, exec <kommando> = kör kommando (resten av raden) i skalet\n"

16836 "d, drop <incheckning> = ta bort incheckning\n"

16837 "l, label <etikett> = ge aktuellt HEAD ett namn\n"

16838 "t, reset <etikett> = återställ HEAD till en etikett\n"

@@ -17547,6 +18103,9 @@ msgstr ""

18103 msgid "Do you really want to send %s? [y|N]: "

18104 msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "

18105

18106 +#~ msgid "Everyday Git With 20 Commands Or So"

18107 +#~ msgstr "Git för dagligt bruk i ungefär 20 kommandon"

18108 +

18109 #~ msgid "Could not open '%s' for writing"

18110 #~ msgstr "Kunde inte öppna \"%s\" för skrivning"

18111

@@ -17761,9 +18320,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "

18320 #~ msgid "blob object"

18321 #~ msgstr "blob-objekt"

18322

17764 -#~ msgid "other tag object"

17765 -#~ msgstr "annat taggobjekt"

17766 -

18323 #~ msgid ""

18324 #~ "There is nothing to exclude from by :(exclude) patterns.\n"

18325 #~ "Perhaps you forgot to add either ':/' or '.' ?"

@@ -18334,9 +18890,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "

18890 #~ msgid "no branch specified"

18891 #~ msgstr "inget grennamn angavs"

18892

18337 -#~ msgid "check a branch out in a separate working directory"

18338 -#~ msgstr "checka ut en gren i separat arbetskatalog"

18339 -

18893 #~ msgid "prune .git/worktrees"

18894 #~ msgstr "rensa .git/worktrees"

18895

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