summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jiang Xin <worldhello.net@gmail.com>2012-10-17 09:38:30 +0800
committerLibravatar Jiang Xin <worldhello.net@gmail.com>2012-10-17 09:38:30 +0800
commitb408887045e3e4abe1551936d4877f6b942c1916 (patch)
tree5a23ab9bfc560dea837a413635f983b4d3e3685e
parentMerge branch 'master' of git://github.com/vnwildman/git (diff)
parentl10n: Update Swedish translation (1964t0f0u) (diff)
downloadtgif-b408887045e3e4abe1551936d4877f6b942c1916.tar.xz
Merge branch 'master' of https://github.com/nafmo/git-l10n-sv
* 'master' of https://github.com/nafmo/git-l10n-sv: l10n: Update Swedish translation (1964t0f0u)
-rw-r--r--po/sv.po879
1 files changed, 438 insertions, 441 deletions
diff --git a/po/sv.po b/po/sv.po
index 7ce7e581d9..9b3aa744bc 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git 1.7.12\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2012-09-15 10:21+0800\n"
-"PO-Revision-Date: 2012-10-02 08:15+0100\n"
+"POT-Creation-Date: 2012-10-16 08:38+0800\n"
+"PO-Revision-Date: 2012-10-16 08:36+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -73,12 +73,11 @@ msgstr "prefix"
msgid "prepend prefix to each pathname in the archive"
msgstr "lägg till prefix till varje sökväg i arkivet"
-# %s är ett verb ("Untracked"/"Ignored"); lägg till ett -e.
-#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2332
-#: builtin/blame.c:2333 builtin/config.c:56 builtin/fast-export.c:642
-#: builtin/fast-export.c:644 builtin/grep.c:800 builtin/hash-object.c:77
-#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:537
-#: builtin/notes.c:694 builtin/read-tree.c:107 parse-options.h:149
+#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2389
+#: builtin/blame.c:2390 builtin/config.c:56 builtin/fast-export.c:642
+#: builtin/fast-export.c:644 builtin/grep.c:801 builtin/hash-object.c:77
+#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540
+#: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149
msgid "file"
msgstr "fil"
@@ -118,7 +117,7 @@ msgstr "arkiv"
msgid "retrieve the archive from remote repository <repo>"
msgstr "hämta arkivet från fjärrarkivet <arkiv>"
-#: archive.c:346 builtin/archive.c:95 builtin/notes.c:616
+#: archive.c:346 builtin/archive.c:95 builtin/notes.c:619
msgid "command"
msgstr "kommando"
@@ -136,7 +135,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:89 builtin/commit.c:714
+#: bundle.c:89 builtin/commit.c:672
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
@@ -145,7 +144,7 @@ msgstr "kunde inte öppna \"%s\""
msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
-#: bundle.c:164 sequencer.c:557 sequencer.c:989 builtin/log.c:290
+#: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290
#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
@@ -204,12 +203,12 @@ msgstr "kan inte skapa \"%s\""
msgid "index-pack died"
msgstr "index-pack dog"
-#: commit.c:48
+#: commit.c:50
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
-#: commit.c:50
+#: commit.c:52
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s är inte en incheckning!"
@@ -318,32 +317,7 @@ msgstr ""
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:1401
-msgid " 0 files changed"
-msgstr " 0 filer ändrade"
-
-#: diff.c:1405
-#, c-format
-msgid " %d file changed"
-msgid_plural " %d files changed"
-msgstr[0] " %d fil ändrad"
-msgstr[1] " %d filer ändrade"
-
-#: diff.c:1422
-#, c-format
-msgid ", %d insertion(+)"
-msgid_plural ", %d insertions(+)"
-msgstr[0] ", %d tillägg(+)"
-msgstr[1] ", %d tillägg(+)"
-
-#: diff.c:1433
-#, c-format
-msgid ", %d deletion(-)"
-msgid_plural ", %d deletions(-)"
-msgstr[0] ", %d borttagning(-)"
-msgstr[1] ", %d borttagningar(-)"
-
-#: diff.c:3460
+#: diff.c:3458
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -364,17 +338,17 @@ msgstr "gpg godtog inte data"
msgid "gpg failed to sign the data"
msgstr "gpg misslyckades signera data"
-#: grep.c:1320
+#: grep.c:1441
#, c-format
msgid "'%s': unable to read %s"
msgstr "\"%s\" kunde inte läsa %s"
-#: grep.c:1337
+#: grep.c:1458
#, c-format
msgid "'%s': %s"
msgstr "\"%s\": %s"
-#: grep.c:1348
+#: grep.c:1469
#, c-format
msgid "'%s': short read %s"
msgstr "\"%s\": kort läsning %s"
@@ -741,19 +715,19 @@ msgstr[1] ""
"Din gren och \"%s\" har divergerat,\n"
"och har %d respektive %d olika incheckningar.\n"
-#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977
+#: sequencer.c:123 builtin/merge.c:864 builtin/merge.c:977
#: builtin/merge.c:1087 builtin/merge.c:1097
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Kunde inte öppna \"%s\" för skrivning"
-#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867
+#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:867
#: builtin/merge.c:1089 builtin/merge.c:1102
#, c-format
msgid "Could not write to '%s'"
msgstr "Kunde inte skriva till \"%s\""
-#: sequencer.c:144
+#: sequencer.c:146
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -761,7 +735,7 @@ msgstr ""
"efter att ha löst konflikterna, markera de rättade sökvägarna\n"
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\""
-#: sequencer.c:147
+#: sequencer.c:149
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -771,214 +745,214 @@ msgstr ""
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
"och checka in resultatet med \"git commit\""
-#: sequencer.c:160 sequencer.c:765 sequencer.c:848
+#: sequencer.c:162 sequencer.c:770 sequencer.c:853
#, c-format
msgid "Could not write to %s"
msgstr "Kunde inte skriva till %s"
-#: sequencer.c:163
+#: sequencer.c:165
#, c-format
msgid "Error wrapping up %s"
msgstr "Fel vid ombrytning av %s"
-#: sequencer.c:178
+#: sequencer.c:180
msgid "Your local changes would be overwritten by cherry-pick."
msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"."
-#: sequencer.c:180
+#: sequencer.c:182
msgid "Your local changes would be overwritten by revert."
msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"."
-#: sequencer.c:183
+#: sequencer.c:185
msgid "Commit your changes or stash them to proceed."
msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta."
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:233
+#: sequencer.c:235
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Kunde inte skriva ny indexfil"
-#: sequencer.c:261
+#: sequencer.c:266
msgid "Could not resolve HEAD commit\n"
msgstr "Kunde inte bestämma HEAD:s incheckning\n"
-#: sequencer.c:282
+#: sequencer.c:287
msgid "Unable to update cache tree\n"
msgstr "Kan inte uppdatera cacheträd\n"
-#: sequencer.c:327
+#: sequencer.c:332
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Kunde inte tolka incheckningen %s\n"
-#: sequencer.c:332
+#: sequencer.c:337
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "Kunde inte tolka föräldraincheckningen %s\n"
-#: sequencer.c:398
+#: sequencer.c:403
msgid "Your index file is unmerged."
msgstr "Din indexfil har inte slagits ihop."
-#: sequencer.c:401
+#: sequencer.c:406
msgid "You do not have a valid HEAD"
msgstr "Du har ingen giltig HEAD"
-#: sequencer.c:416
+#: sequencer.c:421
#, c-format
msgid "Commit %s is a merge but no -m option was given."
msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte."
-#: sequencer.c:424
+#: sequencer.c:429
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Incheckning %s har inte förälder %d"
-#: sequencer.c:428
+#: sequencer.c:433
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning"
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:439
+#: sequencer.c:444
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:443
+#: sequencer.c:448
#, c-format
msgid "Cannot get commit message for %s"
msgstr "Kan inte hämta incheckningsmeddelande för %s"
-#: sequencer.c:527
+#: sequencer.c:532
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:528
+#: sequencer.c:533
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:560
+#: sequencer.c:565
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:568
+#: sequencer.c:573
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:573
+#: sequencer.c:578
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:631
+#: sequencer.c:636
#, c-format
msgid "Cannot %s during a %s"
msgstr "kan inte %s under en %s"
-#: sequencer.c:653
+#: sequencer.c:658
#, c-format
msgid "Could not parse line %d."
msgstr "Kan inte tolka rad %d."
-#: sequencer.c:658
+#: sequencer.c:663
msgid "No commits parsed."
msgstr "Inga incheckningar lästes."
-#: sequencer.c:671
+#: sequencer.c:676
#, c-format
msgid "Could not open %s"
msgstr "Kunde inte öppna %s"
-#: sequencer.c:675
+#: sequencer.c:680
#, c-format
msgid "Could not read %s."
msgstr "kunde inte läsa %s."
-#: sequencer.c:682
+#: sequencer.c:687
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "Oanvändbart manus: %s"
-#: sequencer.c:710
+#: sequencer.c:715
#, c-format
msgid "Invalid key: %s"
msgstr "Felaktig nyckel: %s"
-#: sequencer.c:713
+#: sequencer.c:718
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Felaktigt värde för %s: %s"
-#: sequencer.c:725
+#: sequencer.c:730
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Trasigt manus: %s"
-#: sequencer.c:746
+#: sequencer.c:751
msgid "a cherry-pick or revert is already in progress"
msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
-#: sequencer.c:747
+#: sequencer.c:752
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:751
+#: sequencer.c:756
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:767 sequencer.c:852
+#: sequencer.c:772 sequencer.c:857
#, c-format
msgid "Error wrapping up %s."
msgstr "Fel vid ombrytning av %s."
-#: sequencer.c:786 sequencer.c:920
+#: sequencer.c:791 sequencer.c:925
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:788
+#: sequencer.c:793
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:790
+#: sequencer.c:795
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:812 builtin/apply.c:4005
+#: sequencer.c:817 builtin/apply.c:4005
#, c-format
msgid "cannot open %s: %s"
msgstr "kan inte öppna %s: %s"
-#: sequencer.c:815
+#: sequencer.c:820
#, c-format
msgid "cannot read %s: %s"
msgstr "kan inte läsa %s: %s"
-#: sequencer.c:816
+#: sequencer.c:821
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:822
+#: sequencer.c:827
#, 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:845
+#: sequencer.c:850
#, c-format
msgid "Could not format %s."
msgstr "Kunde inte formatera %s."
-#: sequencer.c:1007
+#: sequencer.c:1012
msgid "Can't revert as initial commit"
msgstr "Kan inte ångra som första incheckning"
-#: sequencer.c:1008
+#: sequencer.c:1013
msgid "Can't cherry-pick into empty head"
msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
@@ -1374,7 +1348,7 @@ msgstr "git add [flaggor] [--] <filmönster>..."
msgid "unexpected diff status %c"
msgstr "diff-status %c förväntades inte"
-#: builtin/add.c:67 builtin/commit.c:229
+#: builtin/add.c:67 builtin/commit.c:230
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
@@ -1439,7 +1413,7 @@ msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
msgid "dry run"
msgstr "testkörning"
-#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1187
+#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1154
#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477
#: builtin/mv.c:62 builtin/read-tree.c:112
msgid "be verbose"
@@ -1516,7 +1490,7 @@ msgstr "Inget angivet, inget tillagt.\n"
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Kanske menade du att skriva \"git add .\"?\n"
-#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
+#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:290 builtin/mv.c:82
#: builtin/rm.c:162
msgid "index file corrupt"
msgstr "indexfilen trasig"
@@ -2057,95 +2031,95 @@ msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil"
msgid "[rev-opts] are documented in git-rev-list(1)"
msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)"
-#: builtin/blame.c:2316
+#: builtin/blame.c:2373
msgid "Show blame entries as we find them, incrementally"
msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
-#: builtin/blame.c:2317
+#: builtin/blame.c:2374
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
-#: builtin/blame.c:2318
+#: builtin/blame.c:2375
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
-#: builtin/blame.c:2319
+#: builtin/blame.c:2376
msgid "Show work cost statistics"
msgstr "Visa statistik över arbetskostnad"
-#: builtin/blame.c:2320
+#: builtin/blame.c:2377
msgid "Show output score for blame entries"
msgstr "Visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:2321
+#: builtin/blame.c:2378
msgid "Show original filename (Default: auto)"
msgstr "Visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:2322
+#: builtin/blame.c:2379
msgid "Show original linenumber (Default: off)"
msgstr "Visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:2323
+#: builtin/blame.c:2380
msgid "Show in a format designed for machine consumption"
msgstr "Visa i ett format avsett för maskinkonsumtion"
-#: builtin/blame.c:2324
+#: builtin/blame.c:2381
msgid "Show porcelain format with per-line commit information"
msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:2325
+#: builtin/blame.c:2382
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Använd samma utdataläge som git-annotate (Standard: av)"
-#: builtin/blame.c:2326
+#: builtin/blame.c:2383
msgid "Show raw timestamp (Default: off)"
msgstr "Visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:2327
+#: builtin/blame.c:2384
msgid "Show long commit SHA1 (Default: off)"
msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:2328
+#: builtin/blame.c:2385
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:2329
+#: builtin/blame.c:2386
msgid "Show author email instead of name (Default: off)"
msgstr "Visa författarens e-post istället för namn (Standard: av)"
-#: builtin/blame.c:2330
+#: builtin/blame.c:2387
msgid "Ignore whitespace differences"
msgstr "Ignorera ändringar i blanksteg"
-#: builtin/blame.c:2331
+#: builtin/blame.c:2388
msgid "Spend extra cycles to find better match"
msgstr "Slösa extra cykler med att hitta bättre träff"
-#: builtin/blame.c:2332
+#: builtin/blame.c:2389
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"
-#: builtin/blame.c:2333
+#: builtin/blame.c:2390
msgid "Use <file>'s contents as the final image"
msgstr "Använd <fil>s innehåll som slutgiltig bild"
-#: builtin/blame.c:2334 builtin/blame.c:2335
+#: builtin/blame.c:2391 builtin/blame.c:2392
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:2334
+#: builtin/blame.c:2391
msgid "Find line copies within and across files"
msgstr "Hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:2335
+#: builtin/blame.c:2392
msgid "Find line movements within and across files"
msgstr "Hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:2336
+#: builtin/blame.c:2393
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2336
+#: builtin/blame.c:2393
msgid "Process only line range n,m, counting from 1"
msgstr "Behandla endast radintervallet n,m, med början på 1"
@@ -2354,8 +2328,8 @@ msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765
-#: builtin/branch.c:771 builtin/commit.c:1395 builtin/commit.c:1396
-#: builtin/commit.c:1397 builtin/commit.c:1398 builtin/tag.c:470
+#: builtin/branch.c:771 builtin/commit.c:1362 builtin/commit.c:1363
+#: builtin/commit.c:1364 builtin/commit.c:1365 builtin/tag.c:470
msgid "commit"
msgstr "incheckning"
@@ -2531,8 +2505,8 @@ msgid "git check-attr [-a | --all | attr...] [--] pathname..."
msgstr "git check-attr [-a | --all | attr...] [--] sökväg..."
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-a | --all | attr...] < <list-of-paths>"
-msgstr "git check-attr --stdin [-a | --all | attr...] < <sökvägslista>"
+msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
+msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <sökvägslista>"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
@@ -2912,7 +2886,7 @@ msgstr "tvinga"
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
-#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:802
+#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:803
#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199
msgid "pattern"
msgstr "mönster"
@@ -3038,7 +3012,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD"
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:747
+#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:748
msgid "depth"
msgstr "djup"
@@ -3116,69 +3090,69 @@ msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"
-#: builtin/clone.c:642
+#: builtin/clone.c:690
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:646
+#: builtin/clone.c:694
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:657
+#: builtin/clone.c:705
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "flaggorna --bare och --origin %s är inkompatibla."
-#: builtin/clone.c:671
+#: builtin/clone.c:719
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:676
+#: builtin/clone.c:724
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"
-#: builtin/clone.c:686
+#: builtin/clone.c:734
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
-#: builtin/clone.c:696
+#: builtin/clone.c:744
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:709 builtin/clone.c:723
+#: builtin/clone.c:757 builtin/clone.c:771
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/clone.c:712
+#: builtin/clone.c:760
#, c-format
msgid "could not create work tree dir '%s'."
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:731
+#: builtin/clone.c:779
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:733
+#: builtin/clone.c:781
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:789
+#: builtin/clone.c:823
#, c-format
msgid "Don't know how to clone %s"
msgstr "Vet inte hur man klonar %s"
-#: builtin/clone.c:838
+#: builtin/clone.c:872
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:845
+#: builtin/clone.c:879
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
@@ -3214,15 +3188,15 @@ msgstr "Spaltfyllnad mellan spalter"
msgid "--command must be the first argument"
msgstr "--command måste vara första argument"
-#: builtin/commit.c:33
+#: builtin/commit.c:34
msgid "git commit [options] [--] <filepattern>..."
msgstr "git commit [flaggor] [--] <filmöster>..."
-#: builtin/commit.c:38
+#: builtin/commit.c:39
msgid "git status [options] [--] <filepattern>..."
msgstr "git status [flaggor] [--] <filmönster>..."
-#: builtin/commit.c:43
+#: builtin/commit.c:44
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -3247,7 +3221,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:55
+#: builtin/commit.c:56
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -3257,7 +3231,7 @@ msgstr ""
"blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"
"så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"
-#: builtin/commit.c:60
+#: builtin/commit.c:61
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -3273,93 +3247,93 @@ msgstr ""
"\n"
"Annars använder du \"git reset\"\n"
-#: builtin/commit.c:256
+#: builtin/commit.c:257
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
-#: builtin/commit.c:298
+#: builtin/commit.c:299
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
-#: builtin/commit.c:304
+#: builtin/commit.c:305
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
-#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
+#: builtin/commit.c:338 builtin/commit.c:359 builtin/commit.c:409
msgid "unable to write new_index file"
msgstr "kunde inte skriva filen new_index"
-#: builtin/commit.c:389
+#: builtin/commit.c:390
msgid "cannot do a partial commit during a merge."
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
-#: builtin/commit.c:391
+#: builtin/commit.c:392
msgid "cannot do a partial commit during a cherry-pick."
msgstr "kan inte utföra en delvis incheckning under en cherry-pick."
-#: builtin/commit.c:401
+#: builtin/commit.c:402
msgid "cannot read the index"
msgstr "kan inte läsa indexet"
-#: builtin/commit.c:421
+#: builtin/commit.c:422
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:510 builtin/commit.c:516
+#: builtin/commit.c:509 builtin/commit.c:515
#, c-format
msgid "invalid commit: %s"
msgstr "felaktig incheckning: %s"
-#: builtin/commit.c:539
+#: builtin/commit.c:538
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:600
+#: builtin/commit.c:558
#, c-format
msgid "Malformed ident string: '%s'"
msgstr "Felaktig indragningssträng: \"%s\""
-#: builtin/commit.c:638 builtin/commit.c:671 builtin/commit.c:985
+#: builtin/commit.c:596 builtin/commit.c:629 builtin/commit.c:952
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
-#: builtin/commit.c:650 builtin/shortlog.c:296
+#: builtin/commit.c:608 builtin/shortlog.c:296
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:652
+#: builtin/commit.c:610
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
-#: builtin/commit.c:656
+#: builtin/commit.c:614
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
-#: builtin/commit.c:662
+#: builtin/commit.c:620
msgid "commit has empty message"
msgstr "incheckningen har ett tomt meddelande"
-#: builtin/commit.c:678
+#: builtin/commit.c:636
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
-#: builtin/commit.c:682
+#: builtin/commit.c:640
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:686
+#: builtin/commit.c:644
#, c-format
msgid "could not read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: builtin/commit.c:738
+#: builtin/commit.c:705
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
-#: builtin/commit.c:749
+#: builtin/commit.c:716
#, c-format
msgid ""
"\n"
@@ -3374,7 +3348,7 @@ msgstr ""
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:754
+#: builtin/commit.c:721
#, c-format
msgid ""
"\n"
@@ -3389,7 +3363,7 @@ msgstr ""
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:766
+#: builtin/commit.c:733
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '#' will be ignored, and an empty message aborts the commit.\n"
@@ -3397,7 +3371,7 @@ msgstr ""
"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
"med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n"
-#: builtin/commit.c:771
+#: builtin/commit.c:738
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '#' will be kept; you may remove them yourself if you want to.\n"
@@ -3407,131 +3381,131 @@ msgstr ""
"med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n"
"Ett tomt meddelande avbryter incheckningen.\n"
-#: builtin/commit.c:784
+#: builtin/commit.c:751
#, c-format
msgid "%sAuthor: %s"
msgstr "%sFörfattare: %s"
-#: builtin/commit.c:791
+#: builtin/commit.c:758
#, c-format
msgid "%sCommitter: %s"
msgstr "%sIncheckare: %s"
-#: builtin/commit.c:811
+#: builtin/commit.c:778
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:848
+#: builtin/commit.c:815
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:863 builtin/tag.c:361
+#: builtin/commit.c:830 builtin/tag.c:361
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
-#: builtin/commit.c:960
+#: builtin/commit.c:927
#, c-format
msgid "No existing author found with '%s'"
msgstr "Hittade ingen befintlig författare med \"%s\""
-#: builtin/commit.c:975 builtin/commit.c:1175
+#: builtin/commit.c:942 builtin/commit.c:1142
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:1015
+#: builtin/commit.c:982
msgid "Using both --reset-author and --author does not make sense"
msgstr "Kan inte använda både --reset-author och --author"
-#: builtin/commit.c:1026
+#: builtin/commit.c:993
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1029
+#: builtin/commit.c:996
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
-#: builtin/commit.c:1031
+#: builtin/commit.c:998
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
-#: builtin/commit.c:1034
+#: builtin/commit.c:1001
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
-#: builtin/commit.c:1044
+#: builtin/commit.c:1011
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Endast en av -c/-C/-F/--fixup kan användas."
-#: builtin/commit.c:1046
+#: builtin/commit.c:1013
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."
-#: builtin/commit.c:1054
+#: builtin/commit.c:1021
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author kan endast användas med -C, -c eller --amend."
-#: builtin/commit.c:1071
+#: builtin/commit.c:1038
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Endast en av --include/--only/--all/--interactive/--patch kan användas."
-#: builtin/commit.c:1073
+#: builtin/commit.c:1040
msgid "No paths with --include/--only does not make sense."
msgstr "Du måste ange sökvägar tillsammans med --include/--only."
-#: builtin/commit.c:1075
+#: builtin/commit.c:1042
msgid "Clever... amending the last one with dirty index."
msgstr "Smart... utöka den senaste med smutsigt index."
-#: builtin/commit.c:1077
+#: builtin/commit.c:1044
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
-#: builtin/commit.c:1087 builtin/tag.c:577
+#: builtin/commit.c:1054 builtin/tag.c:577
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
-#: builtin/commit.c:1092
+#: builtin/commit.c:1059
msgid "Paths with -a does not make sense."
msgstr "Kan inte ange sökvägar med -a."
-#: builtin/commit.c:1189 builtin/commit.c:1417
+#: builtin/commit.c:1156 builtin/commit.c:1384
msgid "show status concisely"
msgstr "vis koncis status"
-#: builtin/commit.c:1191 builtin/commit.c:1419
+#: builtin/commit.c:1158 builtin/commit.c:1386
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1193 builtin/commit.c:1421 builtin/push.c:389
+#: builtin/commit.c:1160 builtin/commit.c:1388 builtin/push.c:389
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1196 builtin/commit.c:1423
+#: builtin/commit.c:1163 builtin/commit.c:1390
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1198 builtin/commit.c:1426 builtin/fast-export.c:636
+#: builtin/commit.c:1165 builtin/commit.c:1393 builtin/fast-export.c:636
#: builtin/fast-export.c:639 builtin/tag.c:461
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1199 builtin/commit.c:1426
+#: builtin/commit.c:1166 builtin/commit.c:1393
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"
-#: builtin/commit.c:1202
+#: builtin/commit.c:1169
msgid "show ignored files"
msgstr "visa ignorerade filer"
-#: builtin/commit.c:1203 parse-options.h:151
+#: builtin/commit.c:1170 parse-options.h:151
msgid "when"
msgstr "när"
-#: builtin/commit.c:1204
+#: builtin/commit.c:1171
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -3539,217 +3513,217 @@ msgstr ""
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1206
+#: builtin/commit.c:1173
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1275
+#: builtin/commit.c:1242
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: builtin/commit.c:1277
+#: builtin/commit.c:1244
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: builtin/commit.c:1318
+#: builtin/commit.c:1285
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: builtin/commit.c:1320
+#: builtin/commit.c:1287
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: builtin/commit.c:1387
+#: builtin/commit.c:1354
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1388
+#: builtin/commit.c:1355
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1390
+#: builtin/commit.c:1357
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1391 builtin/tag.c:459
+#: builtin/commit.c:1358 builtin/tag.c:459
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1392
+#: builtin/commit.c:1359
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1392
+#: builtin/commit.c:1359
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1393 builtin/gc.c:178
+#: builtin/commit.c:1360 builtin/gc.c:178
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1393
+#: builtin/commit.c:1360
msgid "override date for commit"
msgstr "överstyr datum för inchecknignen"
-#: builtin/commit.c:1394 builtin/merge.c:206 builtin/notes.c:534
-#: builtin/notes.c:691 builtin/tag.c:457
+#: builtin/commit.c:1361 builtin/merge.c:206 builtin/notes.c:537
+#: builtin/notes.c:694 builtin/tag.c:457
msgid "message"
msgstr "meddelande"
-#: builtin/commit.c:1394
+#: builtin/commit.c:1361
msgid "commit message"
msgstr "incheckningsmeddelande"
-#: builtin/commit.c:1395