msgstr ""
"Project-Id-Version: git 2.16.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-12-31 10:45+0800\n"
-"PO-Revision-Date: 2018-01-01 09:36+0100\n"
+"POT-Creation-Date: 2018-01-07 07:50+0800\n"
+"PO-Revision-Date: 2018-01-09 20:07+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
+#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4927 builtin/am.c:2229
msgid "num"
msgstr "antal"
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: apply.c:4959 builtin/am.c:2245 builtin/interpret-trailers.c:95
+#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
#: builtin/pack-objects.c:3009
msgid "action"
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:4983 builtin/am.c:2217
msgid "root"
msgstr "rot"
"--reverse och --first-parent tillsammans kräver att du anger senaste "
"incheckningen"
-#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1179
-#: sequencer.c:2367 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
+#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
+#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
#: builtin/shortlog.c:191
msgid "revision walk setup failed"
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:88 sequencer.c:1357 sequencer.c:1804 sequencer.c:2631
-#: sequencer.c:2657 sequencer.c:2748 sequencer.c:2850 builtin/commit.c:782
+#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
+#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
-#: commit.c:41 sequencer.c:1611 builtin/am.c:421 builtin/am.c:465
-#: builtin/am.c:1471 builtin/am.c:2106
+#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1434 builtin/am.c:2069
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
msgid "Unable to create '%s.lock': %s"
msgstr "Kunde inte skapa \"%s.lock\": %s"
-#: merge.c:41
+#: merge.c:74
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
-#: merge.c:95 builtin/am.c:1980 builtin/am.c:2014 builtin/checkout.c:379
+#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
#: builtin/checkout.c:600 builtin/clone.c:754
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
msgid "Adding %s"
msgstr "Lägger till %s"
-#: merge-recursive.c:1955
+#: merge-recursive.c:1958
+#, c-format
+msgid "Dirty index: cannot merge (dirty: %s)"
+msgstr "Smutsigt index: kan inte slå ihop (smutsiga: %s)"
+
+#: merge-recursive.c:1962
msgid "Already up to date!"
msgstr "Redan à jour!"
-#: merge-recursive.c:1964
+#: merge-recursive.c:1971
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "sammanslagning av träden %s och %s misslyckades"
-#: merge-recursive.c:2061
+#: merge-recursive.c:2068
msgid "Merging:"
msgstr "Slår ihop:"
-#: merge-recursive.c:2074
+#: merge-recursive.c:2081
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "hittade %u gemensam förfader:"
msgstr[1] "hittade %u gemensamma förfäder:"
-#: merge-recursive.c:2113
+#: merge-recursive.c:2120
msgid "merge returned no commit"
msgstr "sammanslagningen returnerade ingen incheckning"
-#: merge-recursive.c:2176
+#: merge-recursive.c:2183
#, c-format
msgid "Could not parse object '%s'"
msgstr "Kunde inte tolka objektet \"%s\""
-#: merge-recursive.c:2190 builtin/merge.c:656 builtin/merge.c:815
+#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:2370 sequencer.c:2725 wrapper.c:658 builtin/merge.c:1048
+#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
#, c-format
msgid "could not close '%s'"
msgstr "kunde inte stänga \"%s\""
-#: read-cache.c:2442 sequencer.c:1366 sequencer.c:2093
+#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
#, c-format
msgid "could not stat '%s'"
msgstr "kunde inte ta status på \"%s\""
"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"
"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."
-#: send-pack.c:151
+#: send-pack.c:141
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "kunde inte tolka fjärruppackningsstatus: %s"
-#: send-pack.c:153
+#: send-pack.c:143
#, c-format
msgid "remote unpack failed: %s"
msgstr "fjärruppackning misslyckades: %s"
-#: send-pack.c:316
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "misslyckades underteckna push-certifikatet"
-#: send-pack.c:429
+#: send-pack.c:419
msgid "the receiving end does not support --signed push"
msgstr "mottagarsidan stöder inte push med --signed"
-#: send-pack.c:431
+#: send-pack.c:421
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
"signed"
-#: send-pack.c:443
+#: send-pack.c:433
msgid "the receiving end does not support --atomic push"
msgstr "mottagarsidan stöder inte push med --atomic"
-#: send-pack.c:448
+#: send-pack.c:438
msgid "the receiving end does not support push options"
msgstr "mottagarsidan stöder inte push-flaggor"
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
"och checka in resultatet med \"git commit\""
-#: sequencer.c:297 sequencer.c:1715
+#: sequencer.c:297 sequencer.c:1718
#, c-format
msgid "could not lock '%s'"
msgstr "kunde inte låsa \"%s\""
-#: sequencer.c:300 sequencer.c:1592 sequencer.c:1720 sequencer.c:1734
-#: sequencer.c:2723 sequencer.c:2794 wrapper.c:656
+#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
+#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "kunde inte skriva till \"%s\""
msgid "could not write eol to '%s'"
msgstr "kunde inte skriva radslut till \"%s\""
-#: sequencer.c:308 sequencer.c:1597 sequencer.c:1722
+#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
#, c-format
msgid "failed to finalize '%s'."
msgstr "misslyckades färdigställa \"%s\"."
-#: sequencer.c:332 sequencer.c:829 sequencer.c:1618 builtin/am.c:259
+#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
#: builtin/commit.c:754 builtin/merge.c:1046
#, c-format
msgid "could not read '%s'"
msgstr "%s: Kunde inte skriva ny indexfil"
#: sequencer.c:496
-msgid "could not resolve HEAD commit\n"
-msgstr "kunde inte bestämma HEAD:s incheckning\n"
+msgid "could not resolve HEAD commit"
+msgstr "kunde inte bestämma HEAD:s incheckning"
#: sequencer.c:516
-msgid "unable to update cache tree\n"
-msgstr "kan inte uppdatera cacheträd\n"
+msgid "unable to update cache tree"
+msgstr "kan inte uppdatera cacheträd"
#: sequencer.c:600
#, c-format
#: sequencer.c:702
#, c-format
-msgid "could not parse commit %s\n"
-msgstr "kunde inte tolka incheckningen %s\n"
+msgid "could not parse commit %s"
+msgstr "kunde inte tolka incheckningen %s"
#: sequencer.c:707
#, c-format
-msgid "could not parse parent commit %s\n"
-msgstr "kunde inte tolka föräldraincheckningen %s\n"
+msgid "could not parse parent commit %s"
+msgstr "kunde inte tolka föräldraincheckningen %s"
#: sequencer.c:836
#, c-format
msgid "This is a combination of %d commits."
msgstr "Det här är en kombination av %d incheckningar."
-#: sequencer.c:857 sequencer.c:2742
+#: sequencer.c:857 sequencer.c:2748
msgid "need a HEAD to fixup"
msgstr "behöver en HEAD-incheckning att rätta"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1025
+#: sequencer.c:1023
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:1088 sequencer.c:1864
+#: sequencer.c:1086 sequencer.c:1867
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "kunde inte byta namn på \"%s\" till \"%s\""
-#: sequencer.c:1139
+#: sequencer.c:1137
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:1140
+#: sequencer.c:1138
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:1182
+#: sequencer.c:1180
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:1192
+#: sequencer.c:1190
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:1198
+#: sequencer.c:1196
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:1319
+#: sequencer.c:1270
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s tar inte argument: \"%s\""
+
+#: sequencer.c:1279
+#, c-format
+msgid "missing arguments for %s"
+msgstr "argument saknas för %s"
+
+#: sequencer.c:1322
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ogiltig rad %d: %.*s"
-#: sequencer.c:1327
+#: sequencer.c:1330
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
-#: sequencer.c:1360 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636
-#: sequencer.c:2662 sequencer.c:2752 sequencer.c:2853
+#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
+#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
#, c-format
msgid "could not read '%s'."
msgstr "kunde inte läsa \"%s\"."
-#: sequencer.c:1372
+#: sequencer.c:1375
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "rätta det med \"git rebase --edit-todo\"."
-#: sequencer.c:1374
+#: sequencer.c:1377
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "oanvändbart manus: ”%s”"
-#: sequencer.c:1379
+#: sequencer.c:1382
msgid "no commits parsed."
msgstr "inga incheckningar lästes."
-#: sequencer.c:1390
+#: sequencer.c:1393
msgid "cannot cherry-pick during a revert."
msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
-#: sequencer.c:1392
+#: sequencer.c:1395
msgid "cannot revert during a cherry-pick."
msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
-#: sequencer.c:1459
+#: sequencer.c:1462
#, c-format
msgid "invalid key: %s"
msgstr "felaktig nyckel: %s"
-#: sequencer.c:1462
+#: sequencer.c:1465
#, c-format
msgid "invalid value for %s: %s"
msgstr "felaktigt värde för %s: %s"
-#: sequencer.c:1528
+#: sequencer.c:1531
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "trasigt manus: ”%s”"
-#: sequencer.c:1566
+#: sequencer.c:1569
msgid "a cherry-pick or revert is already in progress"
msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
-#: sequencer.c:1567
+#: sequencer.c:1570
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1570
+#: sequencer.c:1573
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:1585
+#: sequencer.c:1588
msgid "could not lock HEAD"
msgstr "kunde inte låsa HEAD"
-#: sequencer.c:1643 sequencer.c:2227
+#: sequencer.c:1646 sequencer.c:2230
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:1645
+#: sequencer.c:1648
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:1647 sequencer.c:1682
+#: sequencer.c:1650 sequencer.c:1685
msgid "cannot abort from a branch yet to be born"
msgstr "kan inte avbryta från en gren som ännu inte är född"
-#: sequencer.c:1668 builtin/grep.c:713
+#: sequencer.c:1671 builtin/grep.c:713
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
-#: sequencer.c:1670
+#: sequencer.c:1673
#, c-format
msgid "cannot read '%s': %s"
msgstr "kan inte läsa \"%s\": %s"
-#: sequencer.c:1671
+#: sequencer.c:1674
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:1677
+#: sequencer.c:1680
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
-#: sequencer.c:1688
+#: sequencer.c:1691
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Du verkar ha flyttat HEAD.\n"
"Spolar inte tillbaka, kontrollera HEAD!"
-#: sequencer.c:1829 sequencer.c:2125
+#: sequencer.c:1832 sequencer.c:2128
msgid "cannot read HEAD"
msgstr "kan inte läsa HEAD"
-#: sequencer.c:1869 builtin/difftool.c:639
+#: sequencer.c:1872 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "kunde inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:1888
+#: sequencer.c:1891
msgid "could not read index"
msgstr "kunde inte läsa indexet"
-#: sequencer.c:1893
+#: sequencer.c:1896
#, c-format
msgid ""
"execution failed: %s\n"
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:1899
+#: sequencer.c:1902
msgid "and made changes to the index and/or the working tree\n"
msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"
-#: sequencer.c:1905
+#: sequencer.c:1908
#, c-format
msgid ""
"execution succeeded: %s\n"
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:1964
+#: sequencer.c:1967
#, c-format
msgid "Applied autostash.\n"
msgstr "Tillämpade autostash.\n"
-#: sequencer.c:1976
+#: sequencer.c:1979
#, c-format
msgid "cannot store %s"
msgstr "kan inte spara %s"
-#: sequencer.c:1979 git-rebase.sh:175
+#: sequencer.c:1982 git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"Dina ändringar är säkra i stashen.\n"
"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
-#: sequencer.c:2061
+#: sequencer.c:2064
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Stoppade på %s... %.*s\n"
-#: sequencer.c:2103
+#: sequencer.c:2106
#, c-format
msgid "unknown command %d"
msgstr "okänt kommando %d"
-#: sequencer.c:2133
+#: sequencer.c:2136
msgid "could not read orig-head"
msgstr "kunde inte läsa orig-head"
-#: sequencer.c:2138 sequencer.c:2739
+#: sequencer.c:2141 sequencer.c:2745
msgid "could not read 'onto'"
msgstr "kunde inte läsa \"onto\""
-#: sequencer.c:2145
+#: sequencer.c:2148
#, c-format
msgid "could not update %s"
msgstr "kunde inte uppdatera %s"
-#: sequencer.c:2152
+#: sequencer.c:2155
#, c-format
msgid "could not update HEAD to %s"
msgstr "kunde inte uppdatera HEAD till %s"
-#: sequencer.c:2236
+#: sequencer.c:2239
msgid "cannot rebase: You have unstaged changes."
msgstr "kan inte ombasera: Du har oköade ändringar."
-#: sequencer.c:2241
+#: sequencer.c:2244
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
-#: sequencer.c:2250
+#: sequencer.c:2253
msgid "cannot amend non-existing commit"
msgstr "kan inte lägga till incheckning som inte finns"
-#: sequencer.c:2252
+#: sequencer.c:2255
#, c-format
msgid "invalid file: '%s'"
msgstr "ogiltig fil: \"%s\""
-#: sequencer.c:2254
+#: sequencer.c:2257
#, c-format
msgid "invalid contents: '%s'"
msgstr "ogiltigt innehåll: \"%s\""
-#: sequencer.c:2257
+#: sequencer.c:2260
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
"först och kör sedan \"git rebase --continute\" igen."
-#: sequencer.c:2267
+#: sequencer.c:2270
msgid "could not commit staged changes."
msgstr "kunde inte checka in köade ändringar."
-#: sequencer.c:2347
+#: sequencer.c:2350
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: kan inte göra \"cherry-pick\" på typen ”%s”"
-#: sequencer.c:2351
+#: sequencer.c:2354
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:2384
+#: sequencer.c:2387
msgid "can't revert as initial commit"
msgstr "kan inte ångra som första incheckning"
-#: sequencer.c:2489
+#: sequencer.c:2492
msgid "make_script: unhandled options"
msgstr "make_script: flaggor som inte stöds"
-#: sequencer.c:2492
+#: sequencer.c:2495
msgid "make_script: error preparing revisions"
msgstr "make_script: fel när revisioner skulle förberedas"
-#: sequencer.c:2526 sequencer.c:2561
+#: sequencer.c:2529 sequencer.c:2564
#, c-format
msgid "unusable todo list: '%s'"
msgstr "oanvändbar todo-lista: %s"
-#: sequencer.c:2609
+#: sequencer.c:2615
#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr ""
"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
-#: sequencer.c:2689
+#: sequencer.c:2695
#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Varning: vissa incheckningar kan av misstag ha tappats.\n"
"Tappade incheckningar (nyaste först):\n"
-#: sequencer.c:2696
+#: sequencer.c:2702
#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\" (fel).\n"
"\n"
-#: sequencer.c:2708
+#: sequencer.c:2714
#, c-format
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue\".\n"
"Avbryt ombaseringen med \"git rebase --abort\".\n"
-#: sequencer.c:2721 sequencer.c:2788 wrapper.c:225 wrapper.c:395
+#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
#: builtin/am.c:779
#, c-format
msgid "could not open '%s' for writing"
msgstr "kunde inte öppna \"%s\" för skrivning"
-#: sequencer.c:2769
+#: sequencer.c:2775
#, c-format
msgid "could not parse commit '%s'"
msgstr "kunde inte tolka incheckningen\" %s\""
-#: sequencer.c:2891
+#: sequencer.c:2897
msgid "the script was already rearranged."
msgstr "skriptet har redan omordnats."
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
-#: builtin/am.c:1197
+#: builtin/am.c:1160
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "När du har löst problemet, kör \"%s --continue\"."
-#: builtin/am.c:1198
+#: builtin/am.c:1161
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."
-#: builtin/am.c:1199
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."
-#: builtin/am.c:1306
+#: builtin/am.c:1269
msgid "Patch is empty."
msgstr "Patchen är tom."
-#: builtin/am.c:1372
+#: builtin/am.c:1335
#, c-format
msgid "invalid ident line: %.*s"
msgstr "ogiltig ident-rad: %.*s"
-#: builtin/am.c:1394
+#: builtin/am.c:1357
#, c-format
msgid "unable to parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: builtin/am.c:1587
+#: builtin/am.c:1550
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Arkivet saknar objekt som behövs för att falla tillbaka på 3-"
"vägssammanslagning."
-#: builtin/am.c:1589
+#: builtin/am.c:1552
msgid "Using index info to reconstruct a base tree..."
msgstr "Använder indexinfo för att återskapa ett basträd..."
-#: builtin/am.c:1608
+#: builtin/am.c:1571
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
"Har du handredigerat din patch?\n"
"Den kan inte tillämpas på blobbar som antecknats i dess index."
-#: builtin/am.c:1614
+#: builtin/am.c:1577
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-#: builtin/am.c:1639
+#: builtin/am.c:1602
msgid "Failed to merge in the changes."
msgstr "Misslyckades slå ihop ändringarna."
-#: builtin/am.c:1663 builtin/merge.c:642
+#: builtin/am.c:1626 builtin/merge.c:642
msgid "git write-tree failed to write a tree"
msgstr "git write-tree misslyckades skriva ett träd"
-#: builtin/am.c:1670
+#: builtin/am.c:1633
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
-#: builtin/am.c:1683 builtin/commit.c:1798 builtin/merge.c:825
+#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
#: builtin/merge.c:850
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: builtin/am.c:1716 builtin/am.c:1720
+#: builtin/am.c:1679 builtin/am.c:1683
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "kan inte återuppta: %s finns inte."
-#: builtin/am.c:1736
+#: builtin/am.c:1699
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"kan inte vara interaktiv om standard in inte är ansluten till en terminal."
-#: builtin/am.c:1741
+#: builtin/am.c:1704
msgid "Commit Body is:"
msgstr "Incheckningskroppen är:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1751
+#: builtin/am.c:1714
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "
-#: builtin/am.c:1801
+#: builtin/am.c:1764
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
-#: builtin/am.c:1841 builtin/am.c:1913
+#: builtin/am.c:1804 builtin/am.c:1876
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
-#: builtin/am.c:1857
+#: builtin/am.c:1820
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/am.c:1865
+#: builtin/am.c:1828
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
-#: builtin/am.c:1871
+#: builtin/am.c:1834
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "En kopia av patchen som misslyckades finns i: %s"
-#: builtin/am.c:1916
+#: builtin/am.c:1879
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"Om det inte är något kvar att köa kan det hända att något annat redan\n"
"introducerat samma ändringar; kanske du bör hoppa över patchen."
-#: builtin/am.c:1923
+#: builtin/am.c:1886
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"lösta.\n"
"Du kan köra ”git rm” för att godta ”borttagen av dem” för den."
-#: builtin/am.c:2030 builtin/am.c:2034 builtin/am.c:2046 builtin/reset.c:332
+#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr "Kan inte tolka objektet ”%s”."
-#: builtin/am.c:2082
+#: builtin/am.c:2045
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
-#: builtin/am.c:2117
+#: builtin/am.c:2080
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
-#: builtin/am.c:2180
+#: builtin/am.c:2143
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Felaktigt värde för --patch-format: %s"
-#: builtin/am.c:2213
+#: builtin/am.c:2176
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2214
+#: builtin/am.c:2177
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2183
msgid "run interactively"
msgstr "kör interaktivt"
-#: builtin/am.c:2222
+#: builtin/am.c:2185
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
-#: builtin/am.c:2224
+#: builtin/am.c:2187
msgid "allow fall back on 3way merging if needed"
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr "var tyst"
-#: builtin/am.c:2227
+#: builtin/am.c:2190
msgid "add a Signed-off-by line to the commit message"
msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
-#: builtin/am.c:2230
+#: builtin/am.c:2193
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
-#: builtin/am.c:2232
+#: builtin/am.c:2195
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/am.c:2234
+#: builtin/am.c:2197
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/am.c:2236
+#: builtin/am.c:2199
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/am.c:2238
+#: builtin/am.c:2201
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"
-#: builtin/am.c:2241
+#: builtin/am.c:2204
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"
-#: builtin/am.c:2244
+#: builtin/am.c:2207
msgid "strip everything before a scissors line"
msgstr "ta bort allting före en saxlinje"
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass it through git-apply"
msgstr "sänd det genom git-apply"
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
msgid "n"
msgstr "n"
-#: builtin/am.c:2269 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr "format"
-#: builtin/am.c:2270
+#: builtin/am.c:2233
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
-#: builtin/am.c:2276
+#: builtin/am.c:2239
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/am.c:2278
+#: builtin/am.c:2241
msgid "continue applying patches after resolving a conflict"
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
-#: builtin/am.c:2281
+#: builtin/am.c:2244
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
-#: builtin/am.c:2284
+#: builtin/am.c:2247
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
-#: builtin/am.c:2287
+#: builtin/am.c:2250
msgid "restore the original branch and abort the patching operation."
msgstr "återställ originalgrenen och avbryt patchningen."
-#: builtin/am.c:2291
+#: builtin/am.c:2254
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
-#: builtin/am.c:2293
+#: builtin/am.c:2256
msgid "use current timestamp for author date"
msgstr "använd nuvarande tidsstämpel för författardatum"
-#: builtin/am.c:2295 builtin/commit.c:1636 builtin/merge.c:236
+#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/am.c:2296
+#: builtin/am.c:2259
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
-#: builtin/am.c:2299
+#: builtin/am.c:2262
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
-#: builtin/am.c:2317
+#: builtin/am.c:2280
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
"Flaggan -b/--binary har varit utan funktion länge, och\n"
"kommer tas bort. Vi ber dig att inte använda den längre."
-#: builtin/am.c:2324
+#: builtin/am.c:2287
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
-#: builtin/am.c:2339
+#: builtin/am.c:2302
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
-#: builtin/am.c:2363
+#: builtin/am.c:2326
#, c-format
msgid ""
"Stray %s directory found.\n"
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
-#: builtin/am.c:2369
+#: builtin/am.c:2332
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:994
+#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
msgid "Could not execute editor"
msgstr "Kunde inte starta textredigerare"
msgid "Could not init rewritten commits"
msgstr "Kunde inte initiera omskrivna incheckningar"
-#: git-rebase--interactive.sh:972
+#: git-rebase--interactive.sh:897
+msgid "Could not generate todo list"
+msgstr "Kunde inte skapa todo-lista"
+
+#: git-rebase--interactive.sh:973
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)"
msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)"
-#: git-rebase--interactive.sh:977
+#: git-rebase--interactive.sh:978
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
"\n"
-#: git-rebase--interactive.sh:984
+#: git-rebase--interactive.sh:985
msgid "Note that empty commits are commented out"
msgstr "Observera att tomma incheckningar är utkommenterade"
#~ "\n"
#~ "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
-#~ msgid "Could not write to %s"
-#~ msgstr "Kunde inte skriva till %s"
-
#~ msgid "Error wrapping up %s."
#~ msgstr "Fel vid ombrytning av %s."
projects / thirdparty / git.git / commitdiff
