From 9ff1198e6770d08472db2d9c9661ed63105e52a8 Mon Sep 17 00:00:00 2001 From: Peter Krefting Date: Sat, 26 Dec 2015 12:27:15 +0100 Subject: l10n: sv.po: Update Swedish translation (2477t0f0u) Signed-off-by: Peter Krefting diff --git a/po/sv.po b/po/sv.po index 3774b9f..940c5c5 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,10 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: git 2.6.0\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2015-12-11 23:36+0800\n" -"PO-Revision-Date: 2015-12-18 09:06+0100\n" +"POT-Creation-Date: 2015-12-22 22:50+0800\n" +"PO-Revision-Date: 2015-12-26 12:25+0100\n" "Last-Translator: Peter Krefting \n" -"Language-Team: Svenska \n" +"Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,7 +75,7 @@ msgstr "fmt" msgid "archive format" msgstr "arkivformat" -#: archive.c:430 builtin/log.c:1228 +#: archive.c:430 builtin/log.c:1229 msgid "prefix" msgstr "prefix" @@ -280,7 +280,7 @@ msgstr "Arkivet saknar dessa nödvändiga incheckningar:" #: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083 #: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:849 builtin/log.c:1456 builtin/log.c:1689 builtin/merge.c:358 +#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -320,7 +320,7 @@ msgstr "rev-list dog" msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -1260,16 +1260,16 @@ msgstr[1] "" msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n" -#: revision.c:2191 +#: revision.c:2193 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2194 +#: revision.c:2196 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar" -#: revision.c:2388 +#: revision.c:2390 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" @@ -1683,30 +1683,21 @@ msgstr "kan inte komma åt \"%s\": %s" msgid "unable to access '%s'" msgstr "kan inte komma åt \"%s\"" -#: wrapper.c:611 -#, c-format -msgid "unable to look up current user in the passwd file: %s" -msgstr "kan inte slå upp aktuell användare i passwd-filen: %s" - -#: wrapper.c:612 -msgid "no such user" -msgstr "okänd användare" - -#: wrapper.c:620 +#: wrapper.c:608 msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" -#: wrapper.c:647 +#: wrapper.c:635 #, c-format msgid "could not open %s for writing" msgstr "kunde inte öppna %s för skrivning" -#: wrapper.c:658 builtin/am.c:425 +#: wrapper.c:646 builtin/am.c:425 #, c-format msgid "could not write to %s" msgstr "kunde inte skriva till %s" -#: wrapper.c:664 +#: wrapper.c:652 #, c-format msgid "could not close %s" msgstr "kunde inte stänga %s" @@ -2235,14 +2226,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" #: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545 +#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543 #: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "testkörning" #: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19 #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114 +#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "var pratsam" @@ -2428,7 +2419,7 @@ msgstr "" msgid "Patch is empty. Was it split wrong?" msgstr "Patchen är tom. Delades den upp felaktigt?" -#: builtin/am.c:1417 builtin/log.c:1344 +#: builtin/am.c:1417 builtin/log.c:1347 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" @@ -4234,7 +4225,7 @@ msgstr "utför en 3-vägssammanslagning för den nya grenen" msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250 +#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250 msgid "style" msgstr "stil" @@ -4256,7 +4247,7 @@ msgstr "" "kontrollera inte om en annan arbetskatalog håller den angivna referensen" #: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112 -#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560 +#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" @@ -5145,7 +5136,7 @@ msgstr "visa koncis status" msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546 +#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544 #: builtin/worktree.c:423 msgid "machine-readable output" msgstr "maskinläsbar utdata" @@ -5272,7 +5263,7 @@ msgstr "" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)" -#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86 +#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" @@ -5841,7 +5832,7 @@ msgstr "fördjupa historik för grund klon" msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:118 builtin/log.c:1232 +#: builtin/fetch.c:118 builtin/log.c:1233 msgid "dir" msgstr "kat" @@ -7160,187 +7151,191 @@ msgstr "git format-patch [] [ | ]" msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1210 +#: builtin/log.c:1211 msgid "use [PATCH n/m] even with a single patch" msgstr "använd [PATCH n/m] även för en ensam patch" -#: builtin/log.c:1213 +#: builtin/log.c:1214 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1217 +#: builtin/log.c:1218 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1219 +#: builtin/log.c:1220 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1221 +#: builtin/log.c:1222 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1222 +#: builtin/log.c:1223 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1223 +#: builtin/log.c:1224 msgid "use instead of '.patch'" msgstr "använd istället för \".patch\"" -#: builtin/log.c:1225 +#: builtin/log.c:1226 msgid "start numbering patches at instead of 1" msgstr "börja numrera patchar på istället för 1" -#: builtin/log.c:1227 +#: builtin/log.c:1228 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1229 +#: builtin/log.c:1230 msgid "Use [] instead of [PATCH]" msgstr "Använd [] istället för [PATCH]" -#: builtin/log.c:1232 +#: builtin/log.c:1233 msgid "store resulting files in " msgstr "spara filerna i " -#: builtin/log.c:1235 +#: builtin/log.c:1236 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1238 +#: builtin/log.c:1239 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1240 +#: builtin/log.c:1241 +msgid "output all-zero hash in From header" +msgstr "använd hashvärde med nollor i From-huvud" + +#: builtin/log.c:1243 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1242 +#: builtin/log.c:1245 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1244 +#: builtin/log.c:1247 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1245 +#: builtin/log.c:1248 msgid "header" msgstr "huvud" -#: builtin/log.c:1246 +#: builtin/log.c:1249 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1247 builtin/log.c:1249 +#: builtin/log.c:1250 builtin/log.c:1252 msgid "email" msgstr "epost" -#: builtin/log.c:1247 +#: builtin/log.c:1250 msgid "add To: header" msgstr "Lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1249 +#: builtin/log.c:1252 msgid "add Cc: header" msgstr "Lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1251 +#: builtin/log.c:1254 msgid "ident" msgstr "ident" -#: builtin/log.c:1252 +#: builtin/log.c:1255 msgid "set From address to (or committer ident if absent)" msgstr "sätt Från-adress till (eller incheckare om ident saknas)" -#: builtin/log.c:1254 +#: builtin/log.c:1257 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1255 +#: builtin/log.c:1258 msgid "make first mail a reply to " msgstr "Gör det första brevet ett svar till " -#: builtin/log.c:1256 builtin/log.c:1259 +#: builtin/log.c:1259 builtin/log.c:1262 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1257 +#: builtin/log.c:1260 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1260 +#: builtin/log.c:1263 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1264 +#: builtin/log.c:1267 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1266 +#: builtin/log.c:1269 msgid "signature" msgstr "signatur" -#: builtin/log.c:1267 +#: builtin/log.c:1270 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1269 +#: builtin/log.c:1272 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1270 +#: builtin/log.c:1273 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1359 +#: builtin/log.c:1362 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1361 +#: builtin/log.c:1364 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix och -k kan inte användas samtidigt." -#: builtin/log.c:1369 +#: builtin/log.c:1372 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1371 +#: builtin/log.c:1374 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1373 +#: builtin/log.c:1376 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1396 +#: builtin/log.c:1401 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1398 +#: builtin/log.c:1403 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1495 +#: builtin/log.c:1500 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:1558 +#: builtin/log.c:1563 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1606 +#: builtin/log.c:1611 msgid "git cherry [-v] [ [ []]]" msgstr "git cherry [-v] [ [ []]]" -#: builtin/log.c:1660 +#: builtin/log.c:1665 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange manuellt.\n" -#: builtin/log.c:1671 builtin/log.c:1673 builtin/log.c:1685 +#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" @@ -8760,19 +8755,19 @@ msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." -#: builtin/push.c:15 +#: builtin/push.c:16 msgid "git push [] [ [...]]" msgstr "git push [] [ [...]]" -#: builtin/push.c:86 +#: builtin/push.c:88 msgid "tag shorthand without " msgstr "taggförkortning utan " -#: builtin/push.c:96 +#: builtin/push.c:98 msgid "--delete only accepts plain target ref names" msgstr "--delete godtar endast enkla målreferensnamn" -#: builtin/push.c:140 +#: builtin/push.c:142 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -8781,7 +8776,7 @@ msgstr "" "För att välja ett av alternativen permanent, se push.default i \"git help " "config\"." -#: builtin/push.c:143 +#: builtin/push.c:145 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -8806,7 +8801,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:158 +#: builtin/push.c:160 #, c-format msgid "" "You are not currently on a branch.\n" @@ -8821,7 +8816,7 @@ msgstr "" "\n" " git push %s HEAD:\n" -#: builtin/push.c:172 +#: builtin/push.c:174 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -8834,12 +8829,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:180 +#: builtin/push.c:182 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända." -#: builtin/push.c:183 +#: builtin/push.c:185 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -8850,7 +8845,7 @@ msgstr "" "aktuella grenen \"%s\", utan att tala om för mig vad som\n" "skall sändas för att uppdatera fjärrgrenen." -#: builtin/push.c:206 +#: builtin/push.c:208 msgid "" "push.default is unset; its implicit value has changed in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -8898,14 +8893,14 @@ msgstr "" "liknande läget \"current\" istället för \"simple\" om du ibland använder\n" "äldre versioner av Git.)" -#: builtin/push.c:273 +#: builtin/push.c:275 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Du angav inga referensspecifikationer att sända, och push.default är " "\"nothing\"." -#: builtin/push.c:280 +#: builtin/push.c:282 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -8917,7 +8912,7 @@ msgstr "" "\"git pull ....\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:286 +#: builtin/push.c:288 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -8929,7 +8924,7 @@ msgstr "" "\"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:292 +#: builtin/push.c:294 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -8943,11 +8938,11 @@ msgstr "" "(t.ex. \"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer." -#: builtin/push.c:299 +#: builtin/push.c:301 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren." -#: builtin/push.c:302 +#: builtin/push.c:304 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -8958,22 +8953,22 @@ msgstr "" "pekar på något som inte är en incheckning, utan att använda flaggan\n" "\"--force\".\n" -#: builtin/push.c:361 +#: builtin/push.c:363 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:365 +#: builtin/push.c:367 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:395 +#: builtin/push.c:397 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:396 +#: builtin/push.c:398 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -8994,100 +8989,104 @@ msgstr "" "\n" " git push \n" -#: builtin/push.c:411 +#: builtin/push.c:413 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:412 +#: builtin/push.c:414 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:417 +#: builtin/push.c:419 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:418 +#: builtin/push.c:420 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:423 +#: builtin/push.c:425 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:539 +#: builtin/push.c:537 msgid "repository" msgstr "arkiv" -#: builtin/push.c:540 builtin/send-pack.c:161 +#: builtin/push.c:538 builtin/send-pack.c:161 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:541 builtin/send-pack.c:163 +#: builtin/push.c:539 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:543 +#: builtin/push.c:541 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:544 +#: builtin/push.c:542 msgid "push tags (can't be used with --all or --mirror)" msgstr "sänd taggar (kan inte användas med --all eller --mirror)" -#: builtin/push.c:547 builtin/send-pack.c:164 +#: builtin/push.c:545 builtin/send-pack.c:164 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:549 builtin/send-pack.c:175 +#: builtin/push.c:547 builtin/send-pack.c:175 msgid "refname>::