msgstr ""
"Project-Id-Version: git 2.34.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2022-01-11 09:38+0800\n"
+"POT-Creation-Date: 2022-01-17 08:34+0800\n"
"PO-Revision-Date: 2022-01-11 16:34+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
-#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033
-#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
msgid "a branch named '%s' already exists"
msgstr "det finns redan en gren som heter \"%s\""
-#: branch.c:313
-#, c-format
-msgid "cannot force update the branch '%s'checked out at '%s'"
-msgstr ""
-"kan inte tvinga uppdatering av grenen \"%s\" som är utcheckad på \"%s\""
-
#: branch.c:313
#, c-format
msgid "cannot force update the branch '%s' checked out at '%s'"
msgid "%s: unsupported file type"
msgstr "%s: filtypen stöds ej"
-#: object-file.c:2329 builtin/fetch.c:1448
+#: object-file.c:2329 builtin/fetch.c:1453
#, c-format
msgid "%s is not a valid object"
msgstr "%s är inte ett giltigt objekt"
msgid "update_ref failed for ref '%s': %s"
msgstr "update_ref misslyckades för referensen \"%s\": %s"
-#: refs.c:2069
+#: refs.c:2067
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
-#: refs.c:2152
+#: refs.c:2150
msgid "ref updates forbidden inside quarantine environment"
msgstr "referensuppdateringar förbjudna i karantänmiljö"
-#: refs.c:2163
+#: refs.c:2161
msgid "ref updates aborted by hook"
msgstr "referensuppdateringar avbrutna av krok"
-#: refs.c:2271 refs.c:2301
+#: refs.c:2269 refs.c:2299
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "\"%s\" finns; kan inte skapa \"%s\""
-#: refs.c:2277 refs.c:2312
+#: refs.c:2275 refs.c:2310
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
-#: refs/files-backend.c:1268
+#: refs/files-backend.c:1267
#, c-format
msgid "could not remove reference %s"
msgstr "kunde inte ta bort referensen %s"
-#: refs/files-backend.c:1282 refs/packed-backend.c:1549
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
#: refs/packed-backend.c:1559
#, c-format
msgid "could not delete reference %s: %s"
msgstr "kunde inte ta bort referensen %s: %s"
-#: refs/files-backend.c:1285 refs/packed-backend.c:1562
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
#, c-format
msgid "could not delete references: %s"
msgstr "kunde inte ta bort referenser: %s"
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:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
+#: builtin/grep.c:772
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
msgid "invalid remote service path"
msgstr "felaktig sökväg till fjärrtjänst"
-#: transport-helper.c:661 transport.c:1474
+#: transport-helper.c:661 transport.c:1479
msgid "operation not supported by protocol"
msgstr "funktionen stöds inte av protokollet"
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:924 builtin/fetch.c:2047
+#: builtin/clone.c:924 builtin/fetch.c:2052
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
msgid "accept refspecs from stdin"
msgstr "ta emot referenser från standard in"
-#: builtin/fetch.c:587
+#: builtin/fetch.c:592
msgid "couldn't find remote ref HEAD"
msgstr "kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:761
+#: builtin/fetch.c:766
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"
-#: builtin/fetch.c:862
+#: builtin/fetch.c:867
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:866
+#: builtin/fetch.c:871
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:880
+#: builtin/fetch.c:885
msgid "can't fetch in current branch"
msgstr "kan inte hämta i aktuell gren"
-#: builtin/fetch.c:881
+#: builtin/fetch.c:886
msgid "checked out in another worktree"
msgstr "utcheckat i en annan arbetskatalog"
-#: builtin/fetch.c:891
+#: builtin/fetch.c:896
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
-#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951
-#: builtin/fetch.c:963
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
+#: builtin/fetch.c:968
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:896
+#: builtin/fetch.c:901
msgid "would clobber existing tag"
msgstr "skulle skriva över befintlig tagg"
-#: builtin/fetch.c:918
+#: builtin/fetch.c:923
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:921
+#: builtin/fetch.c:926
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:924
+#: builtin/fetch.c:929
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:963
+#: builtin/fetch.c:968
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:968
+#: builtin/fetch.c:973
msgid "non-fast-forward"
msgstr "ej snabbspolad"
-#: builtin/fetch.c:1071
+#: builtin/fetch.c:1076
msgid ""
"fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
"av; för att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n"
"\"git config fetch.showForcedUpdates true\""
-#: builtin/fetch.c:1075
+#: builtin/fetch.c:1080
#, c-format
msgid ""
"it took %.2f seconds to check forced updates; you can use\n"
"showForcedUpdates\n"
"false\" för att undvika testet\n"
-#: builtin/fetch.c:1107
+#: builtin/fetch.c:1112
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s sände inte alla nödvändiga objekt\n"
-#: builtin/fetch.c:1136
+#: builtin/fetch.c:1141
#, c-format
msgid "rejected %s because shallow roots are not allowed to be updated"
msgstr "avvisade %s då grunda rötter inte tillåts uppdateras"
-#: builtin/fetch.c:1226 builtin/fetch.c:1374
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:1247
+#: builtin/fetch.c:1252
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"vissa lokala referenser kunde inte uppdateras; testa att köra\n"
" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
-#: builtin/fetch.c:1344
+#: builtin/fetch.c:1349
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:1345
+#: builtin/fetch.c:1350
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:1377
+#: builtin/fetch.c:1382
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:1378 builtin/remote.c:1128
+#: builtin/fetch.c:1383 builtin/remote.c:1128
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:1400
+#: builtin/fetch.c:1405
#, c-format
msgid "refusing to fetch into branch '%s' checked out at '%s'"
msgstr "vägrar hämta till grenen \"%s\" som är utcheckad på \"%s\""
-#: builtin/fetch.c:1420
+#: builtin/fetch.c:1425
#, c-format
msgid "option \"%s\" value \"%s\" is not valid for %s"
msgstr "flaggan \"%s\" med värdet \"%s\" är inte giltigt för %s"
-#: builtin/fetch.c:1423
+#: builtin/fetch.c:1428
#, c-format
msgid "option \"%s\" is ignored for %s\n"
msgstr "flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:1450
+#: builtin/fetch.c:1455
#, c-format
msgid "the object %s does not exist"
msgstr "objektet %s finns inte"
-#: builtin/fetch.c:1638
+#: builtin/fetch.c:1643
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream"
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1655
#, c-format
msgid ""
"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
"kunde inte sätta uppström för HEAD till \"%s\" från \"%s\" när det inte "
"pekar mot någon gren."
-#: builtin/fetch.c:1663
+#: builtin/fetch.c:1668
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "ställer inte in uppströmsgren för en fjärrspårande gren på fjärren"
-#: builtin/fetch.c:1665
+#: builtin/fetch.c:1670
msgid "not setting upstream for a remote tag"
msgstr "ställer inte in uppström för en fjärrtag"
-#: builtin/fetch.c:1667
+#: builtin/fetch.c:1672
msgid "unknown branch type"
msgstr "okänd grentyp"
-#: builtin/fetch.c:1669
+#: builtin/fetch.c:1674
msgid ""
"no source branch found;\n"
"you need to specify exactly one branch with the --set-upstream option"
"hittade ingen källgren;\n"
"du måste ange exakt en gren med flaggan --set-upstream"
-#: builtin/fetch.c:1799 builtin/fetch.c:1862
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:1809 builtin/fetch.c:1864
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
#, c-format
msgid "could not fetch %s"
msgstr "kunde inte hämta %s"
-#: builtin/fetch.c:1821
+#: builtin/fetch.c:1826
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "kunde inte hämta \"%s\" (felkod: %d)\n"
-#: builtin/fetch.c:1925
+#: builtin/fetch.c:1930
msgid ""
"no remote repository specified; please specify either a URL or a\n"
"remote name from which new revisions should be fetched"
"inget fjärrarkiv angavs; ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar ska hämtas från"
-#: builtin/fetch.c:1961
+#: builtin/fetch.c:1966
msgid "you need to specify a tag name"
msgstr "du måste ange namnet på en tagg"
-#: builtin/fetch.c:2027
+#: builtin/fetch.c:2032
msgid "--negotiate-only needs one or more --negotiate-tip=*"
msgstr "--negotiate-only behöver en eller flera --negotiate-tip=*"
-#: builtin/fetch.c:2031
+#: builtin/fetch.c:2036
msgid "negative depth in --deepen is not supported"
msgstr "negativa djup stöds inte i --deepen"
-#: builtin/fetch.c:2040
+#: builtin/fetch.c:2045
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:2057
+#: builtin/fetch.c:2062
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:2059
+#: builtin/fetch.c:2064
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:2068
+#: builtin/fetch.c:2073
#, c-format
msgid "no such remote or remote group: %s"
msgstr "fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:2076
+#: builtin/fetch.c:2081
msgid "fetching a group and specifying refspecs does not make sense"
msgstr "kan inte hämta från grupp och ange referensspecifikationer"
-#: builtin/fetch.c:2092
+#: builtin/fetch.c:2097
msgid "must supply remote when using --negotiate-only"
msgstr "måste ange fjärr när --negotiate-only anges"
-#: builtin/fetch.c:2097
+#: builtin/fetch.c:2102
msgid "protocol does not support --negotiate-only, exiting"
msgstr "protokollet stöder inte --negotiate-only, avslutar"
-#: builtin/fetch.c:2116
+#: builtin/fetch.c:2121
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
"--filter kan endast användas med fjärren konfigurerad i extensions."
"partialclone"
-#: builtin/fetch.c:2120
+#: builtin/fetch.c:2125
msgid "--atomic can only be used when fetching from one remote"
msgstr "--atomic kan bara användas vid hämtning från en fjärr"
-#: builtin/fetch.c:2124
+#: builtin/fetch.c:2129
msgid "--stdin can only be used when fetching from one remote"
msgstr "--stdin kan bara användas vid hämtning fårn en fjärr"
projects / thirdparty / git.git / blobdiff