summaryrefslogtreecommitdiff
path: root/po/sv.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/sv.po')
-rw-r--r--po/sv.po7167
1 files changed, 3848 insertions, 3319 deletions
diff --git a/po/sv.po b/po/sv.po
index 96340dc4fa..48c5765491 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,60 +5,60 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.12.0\n"
+"Project-Id-Version: git 2.14.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-02-18 01:00+0800\n"
-"PO-Revision-Date: 2017-02-20 19:38+0100\n"
+"POT-Creation-Date: 2017-07-19 22:35+0200\n"
+"PO-Revision-Date: 2017-07-20 22:56+0200\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
-"Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 2.0.2\n"
-#: advice.c:55
+#: advice.c:58
#, c-format
msgid "hint: %.*s\n"
msgstr "tips: %.*s\n"
-#: advice.c:83
+#: advice.c:86
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "
"samman."
-#: advice.c:85
+#: advice.c:88
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en incheckning eftersom du har filer som inte slagits "
"samman."
-#: advice.c:87
+#: advice.c:90
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits "
"samman."
-#: advice.c:89
+#: advice.c:92
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."
-#: advice.c:91
+#: advice.c:94
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "
"samman."
-#: advice.c:93
+#: advice.c:96
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."
-#: advice.c:101
+#: advice.c:104
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -66,23 +66,23 @@ msgstr ""
"Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
"som lämpligt för att ange lösning och checka in."
-#: advice.c:109
+#: advice.c:112
msgid "Exiting because of an unresolved conflict."
msgstr "Avslutar på grund av olöst konflikgt."
-#: advice.c:114 builtin/merge.c:1206
+#: advice.c:117 builtin/merge.c:1184
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
-#: advice.c:116
+#: advice.c:119
msgid "Please, commit your changes before merging."
msgstr "Checka in dina ändringar innan du utför sammanslagningen."
-#: advice.c:117
+#: advice.c:120
msgid "Exiting because of unfinished merge."
msgstr "Avslutar på grund av ofullbordad sammanslagning."
-#: advice.c:123
+#: advice.c:126
#, c-format
msgid ""
"Note: checking out '%s'.\n"
@@ -111,82 +111,92 @@ msgstr ""
" git checkout -b <namn-på-ny-gren>\n"
"\n"
-#: apply.c:57
+#: apply.c:58
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "okänt alternativ för whitespace: \"%s\""
-#: apply.c:73
+#: apply.c:74
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "okänt alternativ för ignore-whitespace: \"%s\""
-#: apply.c:125
+#: apply.c:126
msgid "--reject and --3way cannot be used together."
-msgstr "--reject och --3way kan inte användas samtidigt"
+msgstr "--reject och --3way kan inte användas samtidigt."
-#: apply.c:127
+#: apply.c:128
msgid "--cached and --3way cannot be used together."
-msgstr "--cached och --3way kan inte användas samtidigt"
+msgstr "--cached och --3way kan inte användas samtidigt."
-#: apply.c:130
+#: apply.c:131
msgid "--3way outside a repository"
msgstr "--3way utanför arkiv"
-#: apply.c:141
+#: apply.c:142
msgid "--index outside a repository"
msgstr "--index utanför arkiv"
-#: apply.c:144
+#: apply.c:145
msgid "--cached outside a repository"
msgstr "--cached utanför arkiv"
-#: apply.c:845
+#: apply.c:836
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
-#: apply.c:854
+#: apply.c:845
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec returnerade %d för indata: %s"
-#: apply.c:938
+#: apply.c:929
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "kan inte hitta filnamn i patchen på rad %d"
-#: apply.c:977
+#: apply.c:967
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"
-#: apply.c:983
+#: apply.c:973
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"
-#: apply.c:984
+#: apply.c:974
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"
-#: apply.c:990
+#: apply.c:979
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"
-#: apply.c:1488
+#: apply.c:1008
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "ogiltigt läge på rad %d: %s"
+
+#: apply.c:1326
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "huvudet är inkonsekvent mellan rad %d och %d"
+
+#: apply.c:1498
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: förväntade rad: %.*s"
-#: apply.c:1557
+#: apply.c:1567
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "patch-fragment utan huvud på rad %d: %.*s"
-#: apply.c:1577
+#: apply.c:1587
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -202,82 +212,82 @@ msgstr[1] ""
"sökvägskomponenter\n"
"tas bort (rad %d)"
-#: apply.c:1589
+#: apply.c:1600
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)"
-#: apply.c:1759
+#: apply.c:1770
msgid "new file depends on old contents"
msgstr "ny fil beror på gammalt innehåll"
-#: apply.c:1761
+#: apply.c:1772
msgid "deleted file still has contents"
msgstr "borttagen fil har fortfarande innehåll"
-#: apply.c:1795
+#: apply.c:1806
#, c-format
msgid "corrupt patch at line %d"
msgstr "trasig patch på rad %d"
-#: apply.c:1832
+#: apply.c:1843
#, c-format
msgid "new file %s depends on old contents"
msgstr "nya filen %s beror på gammalt innehåll"
-#: apply.c:1834
+#: apply.c:1845
#, c-format
msgid "deleted file %s still has contents"
msgstr "borttagna filen %s har fortfarande innehåll"
-#: apply.c:1837
+#: apply.c:1848
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** varning: filen %s blir tom men har inte tagits bort"
-#: apply.c:1984
+#: apply.c:1995
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "trasig binärpatch på rad %d: %.*s"
-#: apply.c:2021
+#: apply.c:2032
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "binärpatchen på rad %d känns inte igen"
-#: apply.c:2182
+#: apply.c:2193
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch med bara skräp på rad %d"
-#: apply.c:2265
+#: apply.c:2276
#, c-format
msgid "unable to read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
-#: apply.c:2269
+#: apply.c:2280
#, c-format
msgid "unable to open or read %s"
msgstr "kunde inte öppna eller läsa %s"
-#: apply.c:2922
+#: apply.c:2933
#, c-format
msgid "invalid start of line: '%c'"
msgstr "felaktig inledning på rad: \"%c\""
-#: apply.c:3041
+#: apply.c:3052
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."
msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
-#: apply.c:3053
+#: apply.c:3064
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"
-#: apply.c:3059
+#: apply.c:3070
#, c-format
msgid ""
"while searching for:\n"
@@ -286,25 +296,25 @@ msgstr ""
"vid sökning efter:\n"
"%.*s"
-#: apply.c:3081
+#: apply.c:3092
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "saknar binära patchdata för \"%s\""
-#: apply.c:3089
+#: apply.c:3100
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s"
"\""
-#: apply.c:3135
+#: apply.c:3146
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden"
-#: apply.c:3145
+#: apply.c:3156
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
@@ -312,538 +322,543 @@ msgstr ""
"patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "
"innehållet."
-#: apply.c:3153
+#: apply.c:3164
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "patchen appliceras på en tom \"%s\", men den är inte tom"
-#: apply.c:3171
+#: apply.c:3182
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas"
-#: apply.c:3184
+#: apply.c:3195
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "binärpatchen kan inte tillämpas på \"%s\""
-#: apply.c:3190
+#: apply.c:3201
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
-#: apply.c:3211
+#: apply.c:3222
#, c-format
msgid "patch failed: %s:%ld"
msgstr "patch misslyckades: %s:%ld"
-#: apply.c:3333
+#: apply.c:3344
#, c-format
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248
+#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr "misslyckades läsa %s"
-#: apply.c:3389
+#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
-#: apply.c:3418 apply.c:3658
+#: apply.c:3429 apply.c:3669
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "sökvägen %s har ändrat namn/tagits bort"
-#: apply.c:3501 apply.c:3672
+#: apply.c:3512 apply.c:3683
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: finns inte i indexet"
-#: apply.c:3510 apply.c:3680
+#: apply.c:3521 apply.c:3691
#, c-format
msgid "%s: does not match index"
msgstr "%s: motsvarar inte indexet"
-#: apply.c:3545
+#: apply.c:3556
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"arkivet saknar objekt som behövs för att falla tillbaka på 3-"
"vägssammanslagning."
-#: apply.c:3548
+#: apply.c:3559
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Faller tillbaka på trevägssammanslagning...\n"
-#: apply.c:3564 apply.c:3568
+#: apply.c:3575 apply.c:3579
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "kunde inte läsa aktuellt innehåll i \"%s\""
-#: apply.c:3580
+#: apply.c:3591
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n"
-#: apply.c:3594
+#: apply.c:3605
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Applicerade patchen på \"%s\" med konflikter.\n"
-#: apply.c:3599
+#: apply.c:3610
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Tillämpade patchen på \"%s\" rent.\n"
-#: apply.c:3625
+#: apply.c:3636
msgid "removal patch leaves file contents"
msgstr "patch för borttagning lämnar kvar filinnehåll"
-#: apply.c:3697
+#: apply.c:3708
#, c-format
msgid "%s: wrong type"
msgstr "%s: fel typ"
-#: apply.c:3699
+#: apply.c:3710
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s har typen %o, förväntade %o"
-#: apply.c:3850 apply.c:3852
+#: apply.c:3860 apply.c:3862
#, c-format
msgid "invalid path '%s'"
-msgstr "ogiltig sökväg: %s"
+msgstr "ogiltig sökväg ”%s”"
-#: apply.c:3908
+#: apply.c:3918
#, c-format
msgid "%s: already exists in index"
msgstr "%s: finns redan i indexet"
-#: apply.c:3911
+#: apply.c:3921
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: finns redan i arbetskatalogen"
-#: apply.c:3931
+#: apply.c:3941
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
-#: apply.c:3936
+#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
-#: apply.c:3956
+#: apply.c:3966
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
-#: apply.c:3960
+#: apply.c:3970
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patchen kan inte tillämpas"
-#: apply.c:3975
+#: apply.c:3985
#, c-format
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
-#: apply.c:4066
+#: apply.c:4076
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s"
-#: apply.c:4073
+#: apply.c:4083
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"
-#: apply.c:4076
+#: apply.c:4086
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
-#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135
+#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
-#: apply.c:4085
+#: apply.c:4095
#, c-format
msgid "could not add %s to temporary index"
msgstr "kunde inte lägga till %s till temporärt index"
-#: apply.c:4095
+#: apply.c:4105
#, c-format
msgid "could not write temporary index to %s"
msgstr "kunde inte skriva temporärt index till %s"
-#: apply.c:4233
+#: apply.c:4243
#, c-format
msgid "unable to remove %s from index"
msgstr "kan inte ta bort %s från indexet"
-#: apply.c:4268
+#: apply.c:4278
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "trasig patch för undermodulen %s"
-#: apply.c:4274
+#: apply.c:4284
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
-#: apply.c:4282
+#: apply.c:4292
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
-#: apply.c:4288 apply.c:4432
+#: apply.c:4298 apply.c:4442
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
-#: apply.c:4329
+#: apply.c:4339
#, c-format
msgid "failed to write to '%s'"
msgstr "misslyckades skriva till \"%s\""
-#: apply.c:4333
+#: apply.c:4343
#, c-format
msgid "closing file '%s'"
msgstr "stänger filen \"%s\""
-#: apply.c:4403
+#: apply.c:4413
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "kan inte skriva filen \"%s\" läge %o"
-#: apply.c:4501
+#: apply.c:4511
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tillämpade patchen %s rent."
-#: apply.c:4509
+#: apply.c:4519
msgid "internal error"
msgstr "internt fel"
-#: apply.c:4512
+#: apply.c:4522
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
-#: apply.c:4523
+#: apply.c:4533
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986
+#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
#, c-format
msgid "cannot open %s"
msgstr "kan inte öppna %s"
-#: apply.c:4545
+#: apply.c:4555
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Stycke %d tillämpades rent."
-#: apply.c:4549
+#: apply.c:4559
#, c-format
msgid "Rejected hunk #%d."
msgstr "Refuserar stycke %d."
-#: apply.c:4659
+#: apply.c:4669
#, c-format
msgid "Skipped patch '%s'."
msgstr "Ignorerar patch \"%s\"."
-#: apply.c:4667
+#: apply.c:4677
msgid "unrecognized input"
msgstr "indata känns inte igen"
-#: apply.c:4686
+#: apply.c:4696
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
-#: apply.c:4824
+#: apply.c:4833
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kan inte öppna patchen \"%s\": %s"
-#: apply.c:4849
+#: apply.c:4860
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "undertryckte %d fel i blanksteg"
msgstr[1] "undertryckte %d fel i blanksteg"
-#: apply.c:4855 apply.c:4870
+#: apply.c:4866 apply.c:4881
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d rad lägger till fel i blanksteg."
msgstr[1] "%d rader lägger till fel i blanksteg."
-#: apply.c:4863
+#: apply.c:4874
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."
msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
-#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
-#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
-#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591
-#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960
-#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104
-#: git-add--interactive.perl:239
+#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
+#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
+#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
+#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
+#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: git-add--interactive.perl:197
msgid "path"
msgstr "sökväg"
-#: apply.c:4911
+#: apply.c:4922
msgid "don't apply changes matching the given path"
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
-#: apply.c:4914
+#: apply.c:4925
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: apply.c:4916 builtin/am.c:2286
+#: apply.c:4927 builtin/am.c:2266
msgid "num"
msgstr "antal"
-#: apply.c:4917
+#: apply.c:4928
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
-#: apply.c:4920
+#: apply.c:4931
msgid "ignore additions made by the patch"
msgstr "ignorera tillägg gjorda av patchen"
-#: apply.c:4922
+#: apply.c:4933
msgid "instead of applying the patch, output diffstat for the input"
msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
-#: apply.c:4926
+#: apply.c:4937
msgid "show number of added and deleted lines in decimal notation"
msgstr "visa antal tillagda och borttagna rader decimalt"
-#: apply.c:4928
+#: apply.c:4939
msgid "instead of applying the patch, output a summary for the input"
msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
-#: apply.c:4930
+#: apply.c:4941
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
-#: apply.c:4932
+#: apply.c:4943
msgid "make sure the patch is applicable to the current index"
msgstr "se till att patchen kan tillämpas på aktuellt index"
-#: apply.c:4934
+#: apply.c:4945
msgid "apply a patch without touching the working tree"
msgstr "tillämpa en patch utan att röra arbetskatalogen"
-#: apply.c:4936
+#: apply.c:4947
msgid "accept a patch that touches outside the working area"
msgstr "godta en patch som rör filer utanför arbetskatalogen"
-#: apply.c:4938
+#: apply.c:4949
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
-#: apply.c:4940
+#: apply.c:4951
msgid "attempt three-way merge if a patch does not apply"
msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
-#: apply.c:4942
+#: apply.c:4953
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507
+#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
-#: apply.c:4947
+#: apply.c:4958
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: apply.c:4948 builtin/am.c:2265
+#: apply.c:4959 builtin/am.c:2245
msgid "action"
msgstr "åtgärd"
-#: apply.c:4949
+#: apply.c:4960
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
-#: apply.c:4952 apply.c:4955
+#: apply.c:4963 apply.c:4966
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
-#: apply.c:4958
+#: apply.c:4969
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
-#: apply.c:4960
+#: apply.c:4971
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
-#: apply.c:4962
+#: apply.c:4973
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
-#: apply.c:4964
+#: apply.c:4975
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19
-#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
-#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114
+#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
+#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
+#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr "var pratsam"
-#: apply.c:4967
+#: apply.c:4978
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
-#: apply.c:4970
+#: apply.c:4981
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: apply.c:4972 builtin/am.c:2274
+#: apply.c:4983 builtin/am.c:2254
msgid "root"
msgstr "rot"
-#: apply.c:4973
+#: apply.c:4984
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
-#: archive.c:12
+#: archive.c:13
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]"
-#: archive.c:13
+#: archive.c:14
msgid "git archive --list"
msgstr "git archive --list"
-#: archive.c:14
+#: archive.c:15
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
"git archive --remote <arkiv> [--exec <kmd>] [<flaggor>] <träd-igt> "
"[<sökväg>...]"
-#: archive.c:15
+#: archive.c:16
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
-#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
-#: archive.c:429
+#: archive.c:418
msgid "fmt"
msgstr "fmt"
-#: archive.c:429
+#: archive.c:418
msgid "archive format"
msgstr "arkivformat"
-#: archive.c:430 builtin/log.c:1429
+#: archive.c:419 builtin/log.c:1446
msgid "prefix"
msgstr "prefix"
-#: archive.c:431
+#: archive.c:420
msgid "prepend prefix to each pathname in the archive"
msgstr "lägg till prefix till varje sökväg i arkivet"
-#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054
-#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
+#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
+#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
+#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
+#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
#: parse-options.h:153
msgid "file"
msgstr "fil"
-#: archive.c:433 builtin/archive.c:89
+#: archive.c:422 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "skriv arkivet till filen"
-#: archive.c:435
+#: archive.c:424
msgid "read .gitattributes in working directory"
msgstr "läs .gitattributes i arbetskatalogen"
-#: archive.c:436
+#: archive.c:425
msgid "report archived files on stderr"
msgstr "rapportera arkiverade filer på standard fel"
-#: archive.c:437
+#: archive.c:426
msgid "store only"
msgstr "endast spara"
-#: archive.c:438
+#: archive.c:427
msgid "compress faster"
msgstr "komprimera snabbare"
-#: archive.c:446
+#: archive.c:435
msgid "compress better"
msgstr "komprimera bättre"
-#: archive.c:449
+#: archive.c:438
msgid "list supported archive formats"
msgstr "visa understödda arkivformat"
-#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
-#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969
+#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
msgid "repo"
msgstr "arkiv"
-#: archive.c:452 builtin/archive.c:91
+#: archive.c:441 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "hämta arkivet från fjärrarkivet <arkiv>"
-#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
msgid "command"
msgstr "kommando"
-#: archive.c:454 builtin/archive.c:93
+#: archive.c:443 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "sökväg till kommandot git-upload-archive på fjärren"
-#: archive.c:461
+#: archive.c:450
msgid "Unexpected option --remote"
msgstr "Oväntad flagga --remote"
-#: archive.c:463
+#: archive.c:452
msgid "Option --exec can only be used together with --remote"
msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
-#: archive.c:465
+#: archive.c:454
msgid "Unexpected option --output"
msgstr "Oväntad flagga --output"
-#: archive.c:487
+#: archive.c:476
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Okänt arkivformat \"%s\""
-#: archive.c:494
+#: archive.c:483
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
-#: attr.c:263
+#: attr.c:214
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%-*s är inte ett giltigt namn på attribut"
+
+#: attr.c:410
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -851,12 +866,7 @@ msgstr ""
"Negativa mönster ignoreras i git-attribut\n"
"Använd '\\!' för att inleda med ett utropstecken."
-#: bisect.c:441
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Kunde inte öppna filen \"%s\""
-
-#: bisect.c:446
+#: bisect.c:447
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
@@ -931,7 +941,7 @@ msgstr "Bisect: en sammanslagningsbas måste testas\n"
msgid "a %s revision is needed"
msgstr "en %s-revision behövs"
-#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262
+#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
#, c-format
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
@@ -966,15 +976,54 @@ msgid_plural "(roughly %d steps)"
msgstr[0] "(ungefär %d steg)"
msgstr[1] "(ungefär %d steg)"
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
-#: bisect.c:998
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#: bisect.c:1000
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n"
msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n"
+#: blame.c:1757
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents och --reverse fungerar inte så bra tillsammans."
+
+#: blame.c:1768
+msgid "cannot use --contents with final commit object name"
+msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"
+
+#: blame.c:1788
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse och --first-parent tillsammans kräver att du anger senaste "
+"incheckningen"
+
+#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
+#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
+#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
+#: builtin/shortlog.c:177
+msgid "revision walk setup failed"
+msgstr "misslyckades skapa revisionstraversering"
+
+#: blame.c:1815
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse --first-parent tillsammans kräver ett intervall på första-förälder-"
+"kedjan"
+
+#: blame.c:1826
+#, c-format
+msgid "no such path %s in %s"
+msgstr "sökvägen %s i %s finns inte"
+
+#: blame.c:1837
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "kan inte läsa objektet %s för sökvägen %s"
+
#: branch.c:53
#, c-format
msgid ""
@@ -1052,7 +1101,7 @@ msgstr "\"%s\" är inte ett giltigt grennamn."
#: branch.c:190
#, c-format
msgid "A branch named '%s' already exists."
-msgstr "Det finns redan en gren som heter \"%s\""
+msgstr "Det finns redan en gren som heter ”%s”."
#: branch.c:198
msgid "Cannot force update the current branch."
@@ -1101,14 +1150,14 @@ msgstr "Objektnamnet är tvetydigt: \"%s\"."
#: branch.c:290
#, c-format
msgid "Not a valid branch point: '%s'."
-msgstr "Avgreningspunkten är inte giltig: \"%s\""
+msgstr "Avgreningspunkten är inte giltig: ”%s”."
#: branch.c:344
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "\"%s\" är redan utcheckad på \"%s\""
-#: branch.c:363
+#: branch.c:366
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
@@ -1118,97 +1167,90 @@ msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
msgid "'%s' does not look like a v2 bundle file"
msgstr "'%s' ser inte ut som en v2-bundle-fil"
-#: bundle.c:61
+#: bundle.c:62
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777
+#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
-#: bundle.c:139
+#: bundle.c:140
msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
-#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290
-#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348
-#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
-#: builtin/merge.c:360 builtin/shortlog.c:177
-msgid "revision walk setup failed"
-msgstr "misslyckades skapa revisionstraversering"
-
-#: bundle.c:185
+#: bundle.c:186
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Paketet (bundlen) innehåller denna referens:"
msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:"
-#: bundle.c:192
+#: bundle.c:193
msgid "The bundle records a complete history."
msgstr "Paketet (bundlen) beskriver en komplett historik."
-#: bundle.c:194
+#: bundle.c:195
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Paketet (bundlen) kräver denna referens:"
msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"
-#: bundle.c:253
+#: bundle.c:254
msgid "Could not spawn pack-objects"
msgstr "Kunde inte starta pack-objects"
-#: bundle.c:264
+#: bundle.c:265
msgid "pack-objects died"
msgstr "pack-objects misslyckades"
-#: bundle.c:304
+#: bundle.c:307
msgid "rev-list died"
msgstr "rev-list dog"
-#: bundle.c:353
+#: bundle.c:356
#, c-format
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:165 builtin/log.c:1572 builtin/shortlog.c:282
+#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
-#: bundle.c:451
+#: bundle.c:454
msgid "Refusing to create empty bundle."
msgstr "Vägrar skapa ett tomt paket (bundle)."
-#: bundle.c:463
+#: bundle.c:466
#, c-format
msgid "cannot create '%s'"
msgstr "kan inte skapa \"%s\""
-#: bundle.c:491
+#: bundle.c:494
msgid "index-pack died"
msgstr "index-pack dog"
-#: color.c:300
+#: color.c:301
#, c-format
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
-#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457
-#: builtin/am.c:1493 builtin/am.c:2127
+#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
+#: builtin/am.c:1469 builtin/am.c:2107
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
-#: commit.c:42
+#: commit.c:43
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s är inte en incheckning!"
-#: commit.c:1514
+#: commit.c:1511
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -1222,149 +1264,169 @@ msgstr ""
msgid "memory exhausted"
msgstr "minnet slut"
-#: config.c:518
+#: config.c:186
+msgid "relative config include conditionals must come from files"
+msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
+
+#: config.c:720
#, c-format
msgid "bad config line %d in blob %s"
msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
-#: config.c:522
+#: config.c:724
#, c-format
msgid "bad config line %d in file %s"
msgstr "felaktig konfigurationsfil rad %d i filen %s"
-#: config.c:526
+#: config.c:728
#, c-format
msgid "bad config line %d in standard input"
msgstr "felaktig konfigurationsfil rad %d i standard in"
-#: config.c:530
+#: config.c:732
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
-#: config.c:534
+#: config.c:736
#, c-format
msgid "bad config line %d in command line %s"
msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
-#: config.c:538
+#: config.c:740
#, c-format
msgid "bad config line %d in %s"
msgstr "felaktig konfigurationsfil rad %d i %s"
-#: config.c:657
+#: config.c:868
msgid "out of range"
msgstr "utanför intervallet"
-#: config.c:657
+#: config.c:868
msgid "invalid unit"
msgstr "ogiltig enhet"
-#: config.c:663
+#: config.c:874
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
-#: config.c:668
+#: config.c:879
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
-#: config.c:671
+#: config.c:882
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
-#: config.c:674
+#: config.c:885
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
-#: config.c:677
+#: config.c:888
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
"en %s: %s"
-#: config.c:680
+#: config.c:891
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
"%s: %s"
-#: config.c:683
+#: config.c:894
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
-#: config.c:770
+#: config.c:989
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "misslyckades expandera användarkatalog i: \"%s\""
-#: config.c:865 config.c:876
+#: config.c:1084 config.c:1095
#, c-format
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: config.c:993
+#: config.c:1212
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:1149
+#: config.c:1368
#, c-format
msgid "bad pack compression level %d"
msgstr "felaktig paketkomprimeringsgrad %d"
-#: config.c:1339
+#: config.c:1564
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:1389
+#: config.c:1894
msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:1743
+#: config.c:2064
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Felaktigt %s: \"%s\""
+
+#: config.c:2085
+#, c-format
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgstr ""
+"okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\""
+
+#: config.c:2111
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
+
+#: config.c:2122
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
-#: config.c:1745
+#: config.c:2124
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
-#: config.c:1804
+#: config.c:2183
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
-#: config.c:2225 config.c:2450
+#: config.c:2517 config.c:2745
#, c-format
msgid "fstat on %s failed"
msgstr "fstat misslyckades på %s"
-#: config.c:2343
+#: config.c:2635
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "kunde inte ställa in \"%s\" till \"%s\""
-#: config.c:2345
+#: config.c:2637 builtin/remote.c:775
#, c-format
msgid "could not unset '%s'"
msgstr "kunde inte ta bort inställning för \"%s\""
-#: connect.c:49
+#: connect.c:50
msgid "The remote end hung up upon initial contact"
msgstr "Fjärren lade på vid inledande kontakt"
-#: connect.c:51
+#: connect.c:52
msgid ""
"Could not read from remote repository.\n"
"\n"
@@ -1378,7 +1440,7 @@ msgstr ""
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140
+#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
msgid "Checking connectivity"
msgstr "Kontrollerar konnektivitet"
@@ -1394,7 +1456,7 @@ msgstr "kunde inte skriva till rev-list"
msgid "failed to close rev-list's stdin"
msgstr "kunde inte stänga rev-list:s standard in"
-#: convert.c:201
+#: convert.c:205
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
@@ -1403,12 +1465,12 @@ msgstr ""
"CRLF kommer att ersättas av LF i %s.\n"
"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog."
-#: convert.c:205
+#: convert.c:209
#, c-format
msgid "CRLF would be replaced by LF in %s."
msgstr "CRLF skulle ersättas av LF i %s."
-#: convert.c:211
+#: convert.c:215
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
@@ -1417,78 +1479,28 @@ msgstr ""
"LF kommer att ersättas av CRLF i %s.\n"
"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog."
-#: convert.c:215
+#: convert.c:219
#, c-format
msgid "LF would be replaced by CRLF in %s"
-msgstr "LF skulle ersättas av CRLF i %s."
+msgstr "LF skulle ersättas av CRLF i %s"
-#: date.c:97
+#: date.c:116
msgid "in the future"
msgstr "i framtiden"
-#: date.c:103
-#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "%lu sekund sedan"
-msgstr[1] "%lu sekunder sedan"
-
-#: date.c:110
-#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "%lu minut sedan"
-msgstr[1] "%lu minuter sedan"
-
-#: date.c:117
-#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "%lu timme sedan"
-msgstr[1] "%lu timmar sedan"
-
-#: date.c:124
-#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "%lu dag sedan"
-msgstr[1] "%lu dagar sedan"
-
-#: date.c:130
-#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "%lu vecka sedan"
-msgstr[1] "%lu veckor sedan"
-
-#: date.c:137
-#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "%lu månad sedan"
-msgstr[1] "%lu månader sedan"
-
-#: date.c:148
-#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "%lu år"
-msgstr[1] "%lu år"
+#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167
+#: date.c:175 date.c:180
+msgid "%"
+msgid_plural "%"
+msgstr[0] "%"
+msgstr[1] "%"
#. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
-#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "%s, %lu månad sedan"
-msgstr[1] "%s, %lu månader sedan"
-
-#: date.c:156 date.c:161
-#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "%lu år sedan"
-msgstr[1] "%lu år sedan"
+#: date.c:170
+msgid "%s, %"
+msgid_plural "%s, %"
+msgstr[0] "%s. %"
+msgstr[1] "%s. %"
#: diffcore-order.c:24
#, c-format
@@ -1499,27 +1511,27 @@ msgstr "kunde inte läsa orderfilen \"%s\""
msgid "Performing inexact rename detection"
msgstr "Utför onöjaktig namnbytesdetektering"
-#: diff.c:62
+#: diff.c:63
#, c-format
msgid "option '%s' requires a value"
msgstr "flaggan \"%s\" behöver ett värde"
-#: diff.c:124
+#: diff.c:125
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
-#: diff.c:129
+#: diff.c:130
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Okänd dirstat-parameter \"%s\"\n"
-#: diff.c:281
+#: diff.c:282
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
-#: diff.c:344
+#: diff.c:342
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -1528,20 +1540,20 @@ msgstr ""
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:3085
+#: diff.c:3101
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:3411
+#: diff.c:3427
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"
-#: diff.c:3501
+#: diff.c:3517
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:3664
+#: diff.c:3680
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1550,254 +1562,279 @@ msgstr ""
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:3678
+#: diff.c:3694
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
-#: diff.c:4696
+#: diff.c:4716
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-"onöjaktig namnbytesdetektering utfördes inte på grund av för många filer"
+"onöjaktig namnbytesdetektering utfördes inte på grund av för många filer."
-#: diff.c:4699
+#: diff.c:4719
msgid "only found copies from modified paths due to too many files."
msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."
-#: diff.c:4702
+#: diff.c:4722
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
"du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."
-#: dir.c:1862
+#: dir.c:1948
msgid "failed to get kernel name and information"
msgstr "misslyckades hämta kärnans namn och information"
-#: dir.c:1981
+#: dir.c:2067
msgid "Untracked cache is disabled on this system or location."
msgstr "Ospårad cache är inaktiverad på systemet eller platsen."
-#: dir.c:2759
+#: dir.c:2846 dir.c:2851
+#, c-format
+msgid "could not create directories for %s"
+msgstr "kunde inte skapa kataloger för %s"
+
+#: dir.c:2876
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
-#: fetch-pack.c:213
+#: entry.c:281
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "kunde inte ta status på filen \"%s\""
+
+#: fetch-pack.c:251
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: förväntade grund lista"
-#: fetch-pack.c:225
+#: fetch-pack.c:263
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"
-#: fetch-pack.c:243
+#: fetch-pack.c:282 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "fjärrfel: %s"
+
+#: fetch-pack.c:283
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
-#: fetch-pack.c:295
+#: fetch-pack.c:335
msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc kräver \"multi ack detailed\""
+msgstr "--stateless-rpc kräver ”multi_ack_detailed”"
-#: fetch-pack.c:381
+#: fetch-pack.c:421
#, c-format
msgid "invalid shallow line: %s"
msgstr "ogiltig \"shallow\"-rad: %s"
-#: fetch-pack.c:387
+#: fetch-pack.c:427
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ogiltig \"unshallow\"-rad: %s"
-#: fetch-pack.c:389
+#: fetch-pack.c:429
#, c-format
msgid "object not found: %s"
msgstr "objektet hittades inte: %s"
-#: fetch-pack.c:392
+#: fetch-pack.c:432
#, c-format
msgid "error in object: %s"
msgstr "fel i objekt: %s"
-#: fetch-pack.c:394
+#: fetch-pack.c:434
#, c-format
msgid "no shallow found: %s"
msgstr "ingen \"shallow\" hittades: %s"
-#: fetch-pack.c:397
+#: fetch-pack.c:437
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "förväntade shallow/unshallow, fick %s"
-#: fetch-pack.c:436
+#: fetch-pack.c:476
#, c-format
msgid "got %s %d %s"
msgstr "fick %s %d %s"
-#: fetch-pack.c:450
+#: fetch-pack.c:490
#, c-format
msgid "invalid commit %s"
msgstr "ogiltig incheckning %s"
-#: fetch-pack.c:483
+#: fetch-pack.c:523
msgid "giving up"
msgstr "ger upp"
-#: fetch-pack.c:493 progress.c:235
+#: fetch-pack.c:533 progress.c:235
msgid "done"
msgstr "klart"
-#: fetch-pack.c:505
+#: fetch-pack.c:545
#, c-format
msgid "got %s (%d) %s"
msgstr "fick %s (%d) %s"
-#: fetch-pack.c:551
+#: fetch-pack.c:591
#, c-format
msgid "Marking %s as complete"
msgstr "Markerar %s som komplett"
-#: fetch-pack.c:697
+#: fetch-pack.c:775
#, c-format
msgid "already have %s (%s)"
msgstr "har redan %s (%s)"
-#: fetch-pack.c:735
+#: fetch-pack.c:813
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
-#: fetch-pack.c:743
+#: fetch-pack.c:821
msgid "protocol error: bad pack header"
msgstr "protokollfel: felaktigt packhuvud"
-#: fetch-pack.c:799
+#: fetch-pack.c:877
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-patch: kunde inte grena av %s"
-#: fetch-pack.c:815
+#: fetch-pack.c:893
#, c-format
msgid "%s failed"
msgstr "%s misslyckades"
-#: fetch-pack.c:817
+#: fetch-pack.c:895
msgid "error in sideband demultiplexer"
msgstr "fel i sidbands-avmultiplexare"
-#: fetch-pack.c:844
+#: fetch-pack.c:922
msgid "Server does not support shallow clients"
msgstr "Servern stöder inte klienter med grunda arkiv"
-#: fetch-pack.c:848
+#: fetch-pack.c:926
msgid "Server supports multi_ack_detailed"
msgstr "Servern stöder \"multi_ack_detailed\""
-#: fetch-pack.c:851
+#: fetch-pack.c:929
msgid "Server supports no-done"
msgstr "Servern stöder \"no-done\""
-#: fetch-pack.c:857
+#: fetch-pack.c:935
msgid "Server supports multi_ack"
msgstr "Servern stöder \"multi_ack\""
-#: fetch-pack.c:861
+#: fetch-pack.c:939
msgid "Server supports side-band-64k"
msgstr "Servern stöder \"side-band-64k\""
-#: fetch-pack.c:865
+#: fetch-pack.c:943
msgid "Server supports side-band"
msgstr "Servern stöder \"side-band\""
-#: fetch-pack.c:869
+#: fetch-pack.c:947
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Servern stöder \"allow-tip-sha1-in-want\""
-#: fetch-pack.c:873
+#: fetch-pack.c:951
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Servern stöder \"allow-reachable-sha1-in-want\""
-#: fetch-pack.c:883
+#: fetch-pack.c:961
msgid "Server supports ofs-delta"
msgstr "Servern stöder \"ofs-delta\""
-#: fetch-pack.c:890
+#: fetch-pack.c:968
#, c-format
msgid "Server version is %.*s"
msgstr "Serverversionen är %.*s"
-#: fetch-pack.c:896
+#: fetch-pack.c:974
msgid "Server does not support --shallow-since"
msgstr "Servern stöder inte --shallow-since"
-#: fetch-pack.c:900
+#: fetch-pack.c:978
msgid "Server does not support --shallow-exclude"
msgstr "Servern stöder inte --shallow-exclude"
-#: fetch-pack.c:902
+#: fetch-pack.c:980
msgid "Server does not support --deepen"
msgstr "Servern stöder inte --deepen"
-#: fetch-pack.c:913
+#: fetch-pack.c:991
msgid "no common commits"
msgstr "inga gemensamma incheckningar"
-#: fetch-pack.c:925
+#: fetch-pack.c:1003
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-patch: hämtning misslyckades."
-#: fetch-pack.c:1087
+#: fetch-pack.c:1165
msgid "no matching remote head"
msgstr "inget motsvarande fjärrhuvud"
-#: gpg-interface.c:185
+#: fetch-pack.c:1187
+#, c-format
+msgid "no such remote ref %s"
+msgstr "ingen sådan fjärreferens: %s"
+
+#: fetch-pack.c:1190
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"
+
+#: gpg-interface.c:181
msgid "gpg failed to sign the data"
msgstr "gpg misslyckades signera data"
-#: gpg-interface.c:215
+#: gpg-interface.c:211
msgid "could not create temporary file"
msgstr "kunde inte skapa temporära fil"
-#: gpg-interface.c:217
+#: gpg-interface.c:213
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "misslyckades skriva fristående signatur till \"%s\""
-#: graph.c:96
+#: graph.c:97
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"
-#: grep.c:1794
+#: grep.c:1981
#, c-format
msgid "'%s': unable to read %s"
msgstr "\"%s\" kunde inte läsa %s"
-#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133
+#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr "misslyckades ta status på \"%s\""
-#: grep.c:1822
+#: grep.c:2009
#, c-format
msgid "'%s': short read"
msgstr "\"%s\": kort läsning"
-#: help.c:218
+#: help.c:179
#, c-format
msgid "available git commands in '%s'"
msgstr "git-kommandon tillgängliga i \"%s\""
-#: help.c:225
+#: help.c:186
msgid "git commands available from elsewhere on your $PATH"
msgstr "git-kommandon från andra platser i din $PATH"
-#: help.c:256
+#: help.c:217
msgid "These are common Git commands used in various situations:"
msgstr "Dessa vanliga Git-kommandon används i olika situationer:"
-#: help.c:321
+#: help.c:281
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -1806,49 +1843,69 @@ msgstr ""
"\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
"köra det. Kanske git-%s är trasigt?"
-#: help.c:376
+#: help.c:336
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
-#: help.c:398
+#: help.c:358
#, c-format
-msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
-msgstr ""
-"VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n"
-"Fortsätter under förutsättningen att du menade \"%s\""
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns."
-#: help.c:403
+#: help.c:363
#, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "automatiskt om %0.1f sekunder..."
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Fortsätter under förutsättningen att du menade ”%s”."
-#: help.c:410
+#: help.c:368
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr ""
+"Fortsätter om %0.1f sekunder, under förutsättningen att du menade ”%s”."
+
+#: help.c:376
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."
-#: help.c:414 help.c:480
+#: help.c:380
msgid ""
"\n"
-"Did you mean this?"
+"The most similar command is"
msgid_plural ""
"\n"
-"Did you mean one of these?"
+"The most similar commands are"
msgstr[0] ""
"\n"
-"Menade du detta?"
+"Mest likt kommando är"
msgstr[1] ""
"\n"
-"Menade du ett av dessa?"
+"Mest lika kommandon är"
+
+#: help.c:395
+msgid "git version [<options>]"
+msgstr "git version [<flaggor>]"
-#: help.c:476
+#: help.c:456
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: ident.c:334
+#: help.c:460
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Menade du detta?"
+msgstr[1] ""
+"\n"
+"Menade du ett av dessa?"
+
+#: ident.c:342
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -1874,6 +1931,39 @@ msgstr ""
"Kör utan --global för att endast ändra i aktuellt arkiv.\n"
"\n"
+#: ident.c:366
+msgid "no email was given and auto-detection is disabled"
+msgstr "ingen e-post angavs och autodetektering är inaktiverad"
+
+#: ident.c:371
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "kunde inte autodetektera e-postadress (fick \"%s\")"
+
+#: ident.c:381
+msgid "no name was given and auto-detection is disabled"
+msgstr "inget namn angavs och autodetektering är inaktiverad"
+
+#: ident.c:387
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "kunde inte autodetektera namn (fick \"%s\")"
+
+#: ident.c:395
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "tomt ident-namn (för <%s>) ej tillåtet"
+
+#: ident.c:401
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "namnet består enbart av ej tillåtna tecken: %s"
+
+#: ident.c:416 builtin/commit.c:612
+#, c-format
+msgid "invalid date format: %s"
+msgstr "felaktigt datumformat: %s"
+
#: lockfile.c:152
#, c-format
msgid ""
@@ -1897,84 +1987,84 @@ msgstr ""
#: lockfile.c:160
#, c-format
msgid "Unable to create '%s.lock': %s"
-msgstr "kunde inte skapa \"%s.lock\": %s"
+msgstr "Kunde inte skapa \"%s.lock\": %s"
#: merge.c:41
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
-#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
-#: builtin/checkout.c:588 builtin/clone.c:731
+#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
+#: builtin/checkout.c:591 builtin/clone.c:753
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
-#: merge-recursive.c:209
+#: merge-recursive.c:210
msgid "(bad commit)\n"
msgstr "(felaktig incheckning)\n"
-#: merge-recursive.c:231 merge-recursive.c:239
+#: merge-recursive.c:232 merge-recursive.c:240
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "addinfo_cache misslyckades för sökvägen \"%s\""
-#: merge-recursive.c:303
+#: merge-recursive.c:304
msgid "error building trees"
msgstr "fel vid byggande av träd"
-#: merge-recursive.c:727
+#: merge-recursive.c:728
#, c-format
msgid "failed to create path '%s'%s"
msgstr "misslyckades skapa sökvägen \"%s\"%s"
-#: merge-recursive.c:738
+#: merge-recursive.c:739
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Tar bort %s för att göra plats för underkatalog\n"
-#: merge-recursive.c:752 merge-recursive.c:771
+#: merge-recursive.c:753 merge-recursive.c:772
msgid ": perhaps a D/F conflict?"
msgstr ": kanske en K/F-konflikt?"
-#: merge-recursive.c:761
+#: merge-recursive.c:762
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "vägrar förlora ospårad fil vid \"%s\""
-#: merge-recursive.c:803 builtin/cat-file.c:34
+#: merge-recursive.c:804 builtin/cat-file.c:36
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kan inte läsa objektet %s: \"%s\""
-#: merge-recursive.c:805
+#: merge-recursive.c:806
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob förväntades för %s \"%s\""
-#: merge-recursive.c:829
+#: merge-recursive.c:830
#, c-format
msgid "failed to open '%s': %s"
msgstr "misslyckades öppna \"%s\": %s"
-#: merge-recursive.c:840
+#: merge-recursive.c:841
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "misslyckades skapa symboliska länken \"%s\": %s"
-#: merge-recursive.c:845
+#: merge-recursive.c:846
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "vet inte hur %06o %s \"%s\" skall hanteras"
-#: merge-recursive.c:985
+#: merge-recursive.c:986
msgid "Failed to execute internal merge"
msgstr "Misslyckades exekvera intern sammanslagning"
-#: merge-recursive.c:989
+#: merge-recursive.c:990
#, c-format
msgid "Unable to add %s to database"
msgstr "Kunde inte lägga till %s till databasen"
-#: merge-recursive.c:1088 merge-recursive.c:1102
+#: merge-recursive.c:1093
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -1983,7 +2073,16 @@ msgstr ""
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet."
-#: merge-recursive.c:1094 merge-recursive.c:1107
+#: merge-recursive.c:1098
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
+"%s lämnad i trädet."
+
+#: merge-recursive.c:1105
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -1992,20 +2091,29 @@ msgstr ""
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet vid %s."
-#: merge-recursive.c:1150
+#: merge-recursive.c:1110
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree at %s."
+msgstr ""
+"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
+"%s lämnad i trädet vid %s."
+
+#: merge-recursive.c:1144
msgid "rename"
msgstr "namnbyte"
-#: merge-recursive.c:1150
+#: merge-recursive.c:1144
msgid "renamed"
msgstr "namnbytt"
-#: merge-recursive.c:1207
+#: merge-recursive.c:1201
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s är en katalog i %s lägger till som %s istället"
-#: merge-recursive.c:1232
+#: merge-recursive.c:1226
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2014,135 +2122,135 @@ msgstr ""
"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
-#: merge-recursive.c:1237
+#: merge-recursive.c:1231
msgid " (left unresolved)"
msgstr " (lämnad olöst)"
-#: merge-recursive.c:1299
+#: merge-recursive.c:1293
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
-#: merge-recursive.c:1332
+#: merge-recursive.c:1326
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Byter namn på %s till %s och %s till %s istället"
-#: merge-recursive.c:1535
+#: merge-recursive.c:1529
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s"
-#: merge-recursive.c:1550
+#: merge-recursive.c:1544
#, c-format
msgid "Adding merged %s"
msgstr "Lägger till sammanslagen %s"
-#: merge-recursive.c:1557 merge-recursive.c:1771
+#: merge-recursive.c:1551 merge-recursive.c:1781
#, c-format
msgid "Adding as %s instead"
msgstr "Lägger till som %s istället"
-#: merge-recursive.c:1614
+#: merge-recursive.c:1608
#, c-format
msgid "cannot read object %s"
msgstr "kan inte läsa objektet %s"
-#: merge-recursive.c:1617
+#: merge-recursive.c:1611
#, c-format
msgid "object %s is not a blob"
msgstr "objektet %s är inte en blob"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1680
msgid "modify"
msgstr "ändra"
-#: merge-recursive.c:1670
+#: merge-recursive.c:1680
msgid "modified"
msgstr "ändrad"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1690
msgid "content"
msgstr "innehåll"
-#: merge-recursive.c:1687
+#: merge-recursive.c:1697
msgid "add/add"
msgstr "tillägg/tillägg"
-#: merge-recursive.c:1723
+#: merge-recursive.c:1733
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-#: merge-recursive.c:1737
+#: merge-recursive.c:1747
#, c-format
msgid "Auto-merging %s"
msgstr "Slår ihop %s automatiskt"
-#: merge-recursive.c:1741 git-submodule.sh:930
+#: merge-recursive.c:1751 git-submodule.sh:945
msgid "submodule"
msgstr "undermodul"
-#: merge-recursive.c:1742
+#: merge-recursive.c:1752
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-#: merge-recursive.c:1836
+#: merge-recursive.c:1846
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: merge-recursive.c:1862
+#: merge-recursive.c:1872
msgid "file/directory"
msgstr "fil/katalog"
-#: merge-recursive.c:1868
+#: merge-recursive.c:1878
msgid "directory/file"
msgstr "katalog/fil"
-#: merge-recursive.c:1874
+#: merge-recursive.c:1884
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
-#: merge-recursive.c:1883
+#: merge-recursive.c:1893
#, c-format
msgid "Adding %s"
msgstr "Lägger till %s"
-#: merge-recursive.c:1920
+#: merge-recursive.c:1930
msgid "Already up-to-date!"
msgstr "Redan à jour!"
-#: merge-recursive.c:1929
+#: merge-recursive.c:1939
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "sammanslagning av träden %s och %s misslyckades"
-#: merge-recursive.c:2012
+#: merge-recursive.c:2022
msgid "Merging:"
msgstr "Slår ihop:"
-#: merge-recursive.c:2025
+#: merge-recursive.c:2035
#, 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:2064
+#: merge-recursive.c:2074
msgid "merge returned no commit"
msgstr "sammanslagningen returnerade ingen incheckning"
-#: merge-recursive.c:2127
+#: merge-recursive.c:2137
#, c-format
msgid "Could not parse object '%s'"
msgstr "Kunde inte tolka objektet \"%s\""
-#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
@@ -2163,23 +2271,25 @@ msgstr ""
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)."
-#: notes-utils.c:41
+#: notes-utils.c:42
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"
-#: notes-utils.c:100
+#: notes-utils.c:101
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "Felaktigt värde för notes.rewriteMode: '%s'"
-#: notes-utils.c:110
+#: notes-utils.c:111
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:141
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Felaktigt värde på %s: \"%s\""
@@ -2189,28 +2299,29 @@ msgstr "Felaktigt värde på %s: \"%s\""
msgid "unable to parse object: %s"
msgstr "kunde inte tolka objektet: %s"
-#: parse-options.c:572
+#: parse-options.c:573
msgid "..."
msgstr "..."
-#: parse-options.c:590
+#: parse-options.c:591
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:597
#, c-format
msgid " or: %s"
msgstr " eller: %s"
-#: parse-options.c:597
+#: parse-options.c:600
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:631
+#: parse-options.c:634
msgid "-NUM"
msgstr "-TAL"
@@ -2219,17 +2330,34 @@ msgstr "-TAL"
msgid "malformed object name '%s'"
msgstr "felformat objektnamn \"%s\""
-#: path.c:826
+#: path.c:890
#, c-format
msgid "Could not make %s writable by group"
msgstr "Kunde inte göra %s skrivbar för gruppen"
-#: pathspec.c:142
+#: pathspec.c:129
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde"
+
+#: pathspec.c:147
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Endast en \"attr:\"-angivelse tillåten."
+
+#: pathspec.c:150
+msgid "attr spec must not be empty"
+msgstr "attr-angivelse kan inte vara tom"
+
+#: pathspec.c:193
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "ogiltigt attributnamn %s"
+
+#: pathspec.c:258
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
"de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"
-#: pathspec.c:149
+#: pathspec.c:265
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
@@ -2237,51 +2365,46 @@ msgstr ""
"den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra "
"globala sökvägsinställningar"
-#: pathspec.c:188
+#: pathspec.c:305
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""
-#: pathspec.c:201
+#: pathspec.c:326
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "felaktigt sökvägsuttryck \"%.*s\" i \"%s\""
+msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\""
-#: pathspec.c:206
+#: pathspec.c:331
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""
-#: pathspec.c:238
+#: pathspec.c:369
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Tecknet \"%c\" i sökvägsuttrycket i \"%s\" har inte implementerats"
-
-#: pathspec.c:293 pathspec.c:315
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
+msgstr "Ej implementerat sökvägsuttryckmagi ”%c” i ”%s”"
-#: pathspec.c:350
+#: pathspec.c:428
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: \"literal\" och \"glob\" är inkompatibla"
-#: pathspec.c:363
+#: pathspec.c:441
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s: \"%s\" är utanför arkivet"
-#: pathspec.c:451
+#: pathspec.c:515
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "\"%s\" (minnesstöd: \"%c\")"
-#: pathspec.c:461
+#: pathspec.c:525
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s"
-#: pathspec.c:511
+#: pathspec.c:575
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
@@ -2289,24 +2412,16 @@ msgstr ""
"tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande "
"utgåva. använd istället . om du vill träffa alla sökvägar"
-#: pathspec.c:535
+#: pathspec.c:599
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"
-#: pathspec.c:544
-msgid ""
-"There is nothing to exclude from by :(exclude) patterns.\n"
-"Perhaps you forgot to add either ':/' or '.' ?"
-msgstr ""
-"Ingenting att exkludera från med :(exkludera)-mönster.\n"
-"Glömde du kanske att antingen lägga till \":/\" eller \".\"?"
-
-#: pretty.c:982
+#: pretty.c:963
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
-#: read-cache.c:1307
+#: read-cache.c:1443
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2315,7 +2430,7 @@ msgstr ""
"index.version satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1317
+#: read-cache.c:1453
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2324,252 +2439,366 @@ msgstr ""
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: refs.c:576 builtin/merge.c:844
+#: read-cache.c:2308 builtin/merge.c:1019
+#, c-format
+msgid "could not close '%s'"
+msgstr "kunde inte stänga \"%s\""
+
+#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#, c-format
+msgid "could not stat '%s'"
+msgstr "kunde inte ta status på \"%s\""
+
+#: read-cache.c:2396
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "kunde inte öppna git-katalog: %s"
+
+#: read-cache.c:2408
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "misslyckades ta bort länken: %s"
+
+#: refs.c:622
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Kunde inte öppna \"%s\" för skrivning"
-#: refs/files-backend.c:2481
+#: refs.c:1769
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "referensuppdateringar förbjudna i karantänmiljö"
+
+#: refs/files-backend.c:1664
#, c-format
msgid "could not delete reference %s: %s"
msgstr "kunde inte ta bort referensen %s: %s"
-#: refs/files-backend.c:2484
+#: refs/files-backend.c:1667
#, c-format
msgid "could not delete references: %s"
msgstr "kunde inte ta bort referenser: %s"
-#: refs/files-backend.c:2493
+#: refs/files-backend.c:1676
#, c-format
msgid "could not remove reference %s"
msgstr "kunde inte ta bort referensen %s"
-#: ref-filter.c:56
+#: ref-filter.c:35 wt-status.c:1811
+msgid "gone"
+msgstr "försvunnen"
+
+#: ref-filter.c:36
+#, c-format
+msgid "ahead %d"
+msgstr "före %d"
+
+#: ref-filter.c:37
+#, c-format
+msgid "behind %d"
+msgstr "bakom %d"
+
+#: ref-filter.c:38
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "före %d, bakom %d"
+
+#: ref-filter.c:105
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "förväntat format: %%(color:<color>)"
-#: ref-filter.c:58
+#: ref-filter.c:107
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "okänd färg: %%(color:%s)"
-#: ref-filter.c:72
+#: ref-filter.c:121
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Heltalsvärde förväntades refname:lstrip=%s"
+
+#: ref-filter.c:125
#, c-format
-msgid "unrecognized format: %%(%s)"
-msgstr "okänt format: %%(%s)"
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Heltalsvärde förväntades refname:rstrip=%s"
-#: ref-filter.c:78
+#: ref-filter.c:127
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "okänt %%(%s)-argument: %s"
+
+#: ref-filter.c:167
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) tar inte argument"
-#: ref-filter.c:85
+#: ref-filter.c:174
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) tar inte argument"
-#: ref-filter.c:92
+#: ref-filter.c:181
#, c-format
msgid "%%(trailers) does not take arguments"
msgstr "%%(trailers) tar inte argument"
-#: ref-filter.c:111
+#: ref-filter.c:200
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "positivt värde förväntat contents:lines=%s"
-#: ref-filter.c:113
+#: ref-filter.c:202
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "okänt %%(contents)-argument: %s"
-#: ref-filter.c:123
+#: ref-filter.c:215
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "positivt värde förväntat objectname:short=%s"
+
+#: ref-filter.c:219
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "okänt %%(objectname)-argument: %s"
-#: ref-filter.c:145
+#: ref-filter.c:246
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "förväntat format: %%(align:<bredd>,<position>)"
-#: ref-filter.c:157
+#: ref-filter.c:258
#, c-format
msgid "unrecognized position:%s"
msgstr "okänd position:%s"
-#: ref-filter.c:161
+#: ref-filter.c:262
#, c-format
msgid "unrecognized width:%s"
msgstr "okänd bredd:%s"
-#: ref-filter.c:167
+#: ref-filter.c:268
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "okänt %%(align)-argument: %s"
-#: ref-filter.c:171
+#: ref-filter.c:272
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "positiv bredd förväntad med atomen %%(align)"
-#: ref-filter.c:255
+#: ref-filter.c:287
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "okänt %%(if)-argument: %s"
+
+#: ref-filter.c:378
#, c-format
msgid "malformed field name: %.*s"
msgstr "felformat fältnamn: %.*s"
-#: ref-filter.c:281
+#: ref-filter.c:404
#, c-format
msgid "unknown field name: %.*s"
msgstr "okänt fältnamn: %.*s"
-#: ref-filter.c:383
+#: ref-filter.c:508
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
+
+#: ref-filter.c:568
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
+
+#: ref-filter.c:570
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "format: atomen %%(then) använd mer än en gång"
+
+#: ref-filter.c:572
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "format: atomen %%(then) använd efter %%(else)"
+
+#: ref-filter.c:598
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
+
+#: ref-filter.c:600
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
+
+#: ref-filter.c:602
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "format: atomen %%(else) använd mer än en gång"
+
+#: ref-filter.c:615
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format: atomen %%(end) använd utan motsvarande atom"
-#: ref-filter.c:435
+#: ref-filter.c:670
#, c-format
msgid "malformed format string %s"
msgstr "felformad formatsträng %s"
-#: ref-filter.c:898
-msgid ":strip= requires a positive integer argument"
-msgstr ":strip= kräver ett positivt heltalsargument"
+#: ref-filter.c:1254
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(ingen gren, ombaserar %s)"
-#: ref-filter.c:903
+#: ref-filter.c:1257
#, c-format
-msgid "ref '%s' does not have %ld components to :strip"
-msgstr "referensen \"%s\" har inte %ld komponenter för :strip"
+msgid "(no branch, bisect started on %s)"
+msgstr "(ingen gren, \"bisect\" startad på %s)"
+
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1265
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD frånkopplat vid %s)"
-#: ref-filter.c:1066
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1272
#, c-format
-msgid "unknown %.*s format %s"
-msgstr "okänt \"%.*s\"-format %s"
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD frånkopplat från %s)"
+
+#: ref-filter.c:1276
+msgid "(no branch)"
+msgstr "(ingen gren)"
-#: ref-filter.c:1086 ref-filter.c:1117
+#: ref-filter.c:1426 ref-filter.c:1457
#, c-format
msgid "missing object %s for %s"
msgstr "objektet %s saknas för %s"
-#: ref-filter.c:1089 ref-filter.c:1120
+#: ref-filter.c:1429 ref-filter.c:1460
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer misslyckades på %s för %s"
-#: ref-filter.c:1343
+#: ref-filter.c:1760
#, c-format
msgid "malformed object at '%s'"
msgstr "felformat objekt vid \"%s\""
-#: ref-filter.c:1410
+#: ref-filter.c:1827
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorerar referens med trasigt namn %s"
-#: ref-filter.c:1415
+#: ref-filter.c:1832
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorerar trasig referens %s"
-#: ref-filter.c:1670
+#: ref-filter.c:2095
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atomen %%(end) saknas"
-#: ref-filter.c:1734
+#: ref-filter.c:2176
#, c-format
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
-#: remote.c:754
+#: remote.c:747
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Kan inte hämta både %s och %s till %s"
-#: remote.c:758
+#: remote.c:751
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s spårar vanligtvis %s, inte %s"
-#: remote.c:762
+#: remote.c:755
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s spårar både %s och %s"
-#: remote.c:770
+#: remote.c:763
msgid "Internal error"
msgstr "Internt fel"
-#: remote.c:1685 remote.c:1787
+#: remote.c:1680 remote.c:1782
msgid "HEAD does not point to a branch"
msgstr "HEAD pekar inte på en gren"
-#: remote.c:1694
+#: remote.c:1689
#, c-format
msgid "no such branch: '%s'"
msgstr "okänd gren: \"%s\""
-#: remote.c:1697
+#: remote.c:1692
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "ingen standarduppström angiven för grenen \"%s\""
-#: remote.c:1703
+#: remote.c:1698
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"
-#: remote.c:1718
+#: remote.c:1713
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"
-#: remote.c:1730
+#: remote.c:1725
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "grenen \"%s\" har ingen fjärr för \"push\""
-#: remote.c:1741
+#: remote.c:1736
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
-#: remote.c:1754
+#: remote.c:1749
msgid "push has no destination (push.default is 'nothing')"
msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
-#: remote.c:1776
+#: remote.c:1771
msgid "cannot resolve 'simple' push to a single destination"
msgstr "\"enkel push\" motsvarar flera olika mål"
-#: remote.c:2081
+#: remote.c:2076
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"
-#: remote.c:2085
+#: remote.c:2080
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"
-#: remote.c:2088
+#: remote.c:2083
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Din gren är à jour med \"%s\".\n"
-#: remote.c:2092
+#: remote.c:2087
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"
msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
-#: remote.c:2098
+#: remote.c:2093
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n"
-#: remote.c:2101
+#: remote.c:2096
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -2579,11 +2808,11 @@ msgstr[0] ""
msgstr[1] ""
"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
-#: remote.c:2109
+#: remote.c:2104
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n"
-#: remote.c:2112
+#: remote.c:2107
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -2598,41 +2827,46 @@ msgstr[1] ""
"Din gren och \"%s\" har divergerat,\n"
"och har %d respektive %d olika incheckningar.\n"
-#: remote.c:2122
+#: remote.c:2117
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:2158
+#: revision.c:2187
msgid "your current branch appears to be broken"
msgstr "din nuvarande gren verkar vara trasig"
-#: revision.c:2161
+#: revision.c:2190
#, 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:2355
+#: revision.c:2384
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent är inkompatibelt med --bisect"
-#: run-command.c:125
+#: run-command.c:644
msgid "open /dev/null failed"
msgstr "misslyckades öppna /dev/null"
-#: run-command.c:127
+#: send-pack.c:151
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "kunde inte tolka fjärruppackningsstatus: %s"
+
+#: send-pack.c:153
#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "dup2(%d,%d) misslyckades"
+msgid "remote unpack failed: %s"
+msgstr "fjärruppackning misslyckades: %s"
-#: send-pack.c:297
+#: send-pack.c:316
msgid "failed to sign the push certificate"
msgstr "misslyckades underteckna push-certifikatet"
-#: send-pack.c:410
+#: send-pack.c:429
msgid "the receiving end does not support --signed push"
msgstr "mottagarsidan stöder inte push med --signed"
-#: send-pack.c:412
+#: send-pack.c:431
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -2640,32 +2874,32 @@ msgstr ""
"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
"signed"
-#: send-pack.c:424
+#: send-pack.c:443
msgid "the receiving end does not support --atomic push"
msgstr "mottagarsidan stöder inte push med --atomic"
-#: send-pack.c:429
+#: send-pack.c:448
msgid "the receiving end does not support push options"
msgstr "mottagarsidan stöder inte push-flaggor"
-#: sequencer.c:215
+#: sequencer.c:216
msgid "revert"
msgstr "revert"
-#: sequencer.c:217
+#: sequencer.c:218
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:219
+#: sequencer.c:220
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:221
+#: sequencer.c:222
#, c-format
msgid "Unknown action: %d"
msgstr "Okänd funktion: %d"
-#: sequencer.c:278
+#: sequencer.c:279
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -2673,7 +2907,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:281
+#: sequencer.c:282
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -2683,63 +2917,63 @@ msgstr ""
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
"och checka in resultatet med \"git commit\""
-#: sequencer.c:294 sequencer.c:1667
+#: sequencer.c:295 sequencer.c:1685
#, c-format
msgid "could not lock '%s'"
msgstr "kunde inte låsa \"%s\""
-#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686
+#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
#, c-format
msgid "could not write to '%s'"
msgstr "kunde inte skriva till \"%s\""
-#: sequencer.c:301
+#: sequencer.c:302
#, c-format
msgid "could not write eol to '%s'"
msgstr "kunde inte skriva radslut till \"%s\""
-#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674
+#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
#, c-format
msgid "failed to finalize '%s'."
msgstr "misslyckades färdigställa \"%s\"."
-#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259
-#: builtin/commit.c:749 builtin/merge.c:1036
+#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
+#: builtin/commit.c:750 builtin/merge.c:1017
#, c-format
msgid "could not read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: sequencer.c:355
+#: sequencer.c:356
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "dina lokala ändringar skulle skrivas över av %s."
-#: sequencer.c:359
+#: sequencer.c:360
msgid "commit your changes or stash them to proceed."
msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."
-#: sequencer.c:388
+#: sequencer.c:389
#, c-format
msgid "%s: fast-forward"
msgstr "%s: snabbspola"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. * "rebase -i".
+#. "rebase -i".
#.
-#: sequencer.c:470
+#: sequencer.c:472
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Kunde inte skriva ny indexfil"
-#: sequencer.c:489
+#: sequencer.c:491
msgid "could not resolve HEAD commit\n"
msgstr "kunde inte bestämma HEAD:s incheckning\n"
-#: sequencer.c:509
+#: sequencer.c:511
msgid "unable to update cache tree\n"
msgstr "kan inte uppdatera cacheträd\n"
-#: sequencer.c:592
+#: sequencer.c:595
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -2768,17 +3002,17 @@ msgstr ""
"\n"
" git rebase --continue\n"
-#: sequencer.c:688
+#: sequencer.c:697
#, c-format
msgid "could not parse commit %s\n"
msgstr "kunde inte tolka incheckningen %s\n"
-#: sequencer.c:693
+#: sequencer.c:702
#, c-format
msgid "could not parse parent commit %s\n"
msgstr "kunde inte tolka föräldraincheckningen %s\n"
-#: sequencer.c:815
+#: sequencer.c:824
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -2789,7 +3023,7 @@ msgstr ""
"\n"
"\t%.*s"
-#: sequencer.c:821
+#: sequencer.c:830
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -2800,231 +3034,231 @@ msgstr ""
"\n"
"\t%.*s"
-#: sequencer.c:827 sequencer.c:852
+#: sequencer.c:836 sequencer.c:861
#, c-format
msgid "This is a combination of %d commits."
msgstr "Det här är en kombination av %d incheckningar."
-#: sequencer.c:836
+#: sequencer.c:845
msgid "need a HEAD to fixup"
msgstr "behöver en HEAD-incheckning att rätta"
-#: sequencer.c:838
+#: sequencer.c:847
msgid "could not read HEAD"
msgstr "kunde inte läsa HEAD"
-#: sequencer.c:840
+#: sequencer.c:849
msgid "could not read HEAD's commit message"
msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
-#: sequencer.c:846
+#: sequencer.c:855
#, c-format
msgid "cannot write '%s'"
msgstr "kan inte skriva \"%s\""
-#: sequencer.c:855 git-rebase--interactive.sh:445
+#: sequencer.c:864 git-rebase--interactive.sh:445
msgid "This is the 1st commit message:"
msgstr "Det här är 1:a incheckningsmeddelandet:"
-#: sequencer.c:863
+#: sequencer.c:872
#, c-format
msgid "could not read commit message of %s"
msgstr "kunde inte läsa incheckningsmeddelande för %s"
-#: sequencer.c:870
+#: sequencer.c:879
#, c-format
msgid "This is the commit message #%d:"
msgstr "Det här är incheckningsmeddelande %d:"
-#: sequencer.c:875
+#: sequencer.c:884
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Incheckningsmeddelande %d kommer hoppas över:"
-#: sequencer.c:880
+#: sequencer.c:889
#, c-format
msgid "unknown command: %d"
msgstr "okänt kommando: %d"
-#: sequencer.c:946
+#: sequencer.c:955
msgid "your index file is unmerged."
msgstr "din indexfil har inte slagits ihop."
-#: sequencer.c:964
+#: sequencer.c:973
#, 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:972
+#: sequencer.c:981
#, c-format
msgid "commit %s does not have parent %d"
msgstr "incheckning %s har inte förälder %d"
-#: sequencer.c:976
+#: sequencer.c:985
#, c-format
msgid "mainline was specified but commit %s is not a merge."
-msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning"
+msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning."
-#: sequencer.c:982
+#: sequencer.c:991
#, c-format
msgid "cannot get commit message for %s"
msgstr "kan inte hämta incheckningsmeddelande för %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1001
+#: sequencer.c:1012
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:1063 sequencer.c:1812
+#: sequencer.c:1075 sequencer.c:1830
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "kunde inte byta namn på \"%s\" till \"%s\""
-#: sequencer.c:1114
+#: sequencer.c:1126
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:1115
+#: sequencer.c:1127
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:1157
+#: sequencer.c:1169
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:1167
+#: sequencer.c:1179
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:1174
+#: sequencer.c:1186
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:1294
+#: sequencer.c:1306
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ogiltig rad %d: %.*s"
-#: sequencer.c:1302
+#: sequencer.c:1314
#, c-format
msgid "cannot '%s' without a previous commit"
-msgstr "Kan inte utföra \"%s\" utan en föregående incheckning"
+msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
-#: sequencer.c:1334
+#: sequencer.c:1347
#, c-format
msgid "could not read '%s'."
msgstr "kunde inte läsa \"%s\"."
-#: sequencer.c:1341
+#: sequencer.c:1359
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "rätta det med \"git rebase --edit-todo\"."
-#: sequencer.c:1343
+#: sequencer.c:1361
#, c-format
msgid "unusable instruction sheet: '%s'"
-msgstr "oanvändbart manus: %s"
+msgstr "oanvändbart manus: ”%s”"
-#: sequencer.c:1348
+#: sequencer.c:1366
msgid "no commits parsed."
msgstr "inga incheckningar lästes."
-#: sequencer.c:1359
+#: sequencer.c:1377
msgid "cannot cherry-pick during a revert."
msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
-#: sequencer.c:1361
+#: sequencer.c:1379
msgid "cannot revert during a cherry-pick."
msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
-#: sequencer.c:1424
+#: sequencer.c:1442
#, c-format
msgid "invalid key: %s"
msgstr "felaktig nyckel: %s"
-#: sequencer.c:1427
+#: sequencer.c:1445
#, c-format
msgid "invalid value for %s: %s"
msgstr "felaktigt värde för %s: %s"
-#: sequencer.c:1484
+#: sequencer.c:1502
#, c-format
msgid "malformed options sheet: '%s'"
-msgstr "trasigt manus: %s"
+msgstr "trasigt manus: ”%s”"
-#: sequencer.c:1522
+#: sequencer.c:1540
msgid "a cherry-pick or revert is already in progress"
msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
-#: sequencer.c:1523
+#: sequencer.c:1541
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1526
+#: sequencer.c:1544
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:1540
+#: sequencer.c:1558
msgid "could not lock HEAD"
msgstr "kunde inte låsa HEAD"
-#: sequencer.c:1596 sequencer.c:2150
+#: sequencer.c:1614 sequencer.c:2188
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:1598
+#: sequencer.c:1616
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:1600 sequencer.c:1634
+#: sequencer.c:1618 sequencer.c:1652
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:1620 builtin/grep.c:904
+#: sequencer.c:1638 builtin/grep.c:929
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
-#: sequencer.c:1622
+#: sequencer.c:1640
#, c-format
msgid "cannot read '%s': %s"
msgstr "kan inte läsa \"%s\": %s"
-#: sequencer.c:1623
+#: sequencer.c:1641
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:1629
+#: sequencer.c:1647
#, 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:1640
+#: sequencer.c:1658
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:1777 sequencer.c:2049
+#: sequencer.c:1795 sequencer.c:2086
msgid "cannot read HEAD"
msgstr "kan inte läsa HEAD"
-#: sequencer.c:1817 builtin/difftool.c:574
+#: sequencer.c:1835 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "kunde inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:1833
+#: sequencer.c:1851
msgid "could not read index"
-msgstr "Kunde inte läsa indexet"
+msgstr "kunde inte läsa indexet"
-#: sequencer.c:1838
+#: sequencer.c:1856
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3039,11 +3273,11 @@ msgstr ""
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:1844
+#: sequencer.c:1862
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:1850
+#: sequencer.c:1868
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3060,17 +3294,17 @@ msgstr ""
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:1905 git-rebase.sh:168
+#: sequencer.c:1925
#, c-format
-msgid "Applied autostash."
-msgstr "Tillämpade autostash."
+msgid "Applied autostash.\n"
+msgstr "Tillämpade autostash.\n"
-#: sequencer.c:1917
+#: sequencer.c:1937
#, c-format
msgid "cannot store %s"
msgstr "kan inte spara %s"
-#: sequencer.c:1919 git-rebase.sh:172
+#: sequencer.c:1940 git-rebase.sh:173
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3081,57 +3315,57 @@ msgstr ""
"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:2000
+#: sequencer.c:2022
#, c-format
-msgid "stopped at %s... %.*s"
-msgstr "stoppade på %s... %.*s"
+msgid "Stopped at %s... %.*s\n"
+msgstr "Stoppade på %s... %.*s\n"
-#: sequencer.c:2027
+#: sequencer.c:2064
#, c-format
msgid "unknown command %d"
msgstr "okänt kommando %d"
-#: sequencer.c:2057
+#: sequencer.c:2094
msgid "could not read orig-head"
-msgstr "Kunde inte läsa orig-head"
+msgstr "kunde inte läsa orig-head"
-#: sequencer.c:2061
+#: sequencer.c:2099
msgid "could not read 'onto'"
msgstr "kunde inte läsa \"onto\""
-#: sequencer.c:2068
+#: sequencer.c:2106
#, c-format
msgid "could not update %s"
msgstr "kunde inte uppdatera %s"
-#: sequencer.c:2075
+#: sequencer.c:2113
#, c-format
msgid "could not update HEAD to %s"
msgstr "kunde inte uppdatera HEAD till %s"
-#: sequencer.c:2159
+#: sequencer.c:2197
msgid "cannot rebase: You have unstaged changes."
msgstr "kan inte ombasera: Du har oköade ändringar."
-#: sequencer.c:2164
+#: sequencer.c:2202
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
-#: sequencer.c:2173
+#: sequencer.c:2211
msgid "cannot amend non-existing commit"
msgstr "kan inte lägga till incheckning som inte finns"
-#: sequencer.c:2175
+#: sequencer.c:2213
#, c-format
msgid "invalid file: '%s'"
msgstr "ogiltig fil: \"%s\""
-#: sequencer.c:2177
+#: sequencer.c:2215
#, c-format
msgid "invalid contents: '%s'"
msgstr "ogiltigt innehåll: \"%s\""
-#: sequencer.c:2180
+#: sequencer.c:2218
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3141,25 +3375,25 @@ msgstr ""
"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:2190
+#: sequencer.c:2228
msgid "could not commit staged changes."
msgstr "kunde inte checka in köade ändringar."
-#: sequencer.c:2270
+#: sequencer.c:2308
#, c-format
msgid "%s: can't cherry-pick a %s"
-msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
+msgstr "%s: kan inte göra \"cherry-pick\" på typen ”%s”"
-#: sequencer.c:2274
+#: sequencer.c:2312
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:2307
+#: sequencer.c:2345
msgid "can't revert as initial commit"
msgstr "kan inte ångra som första incheckning"
-#: setup.c:160
+#: setup.c:171
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -3169,7 +3403,7 @@ msgstr ""
"Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "
"lokalt."
-#: setup.c:173
+#: setup.c:184
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -3181,7 +3415,7 @@ msgstr ""
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
"\"git <kommando> [<revision>...] -- [<fil>...]\""
-#: setup.c:223
+#: setup.c:252
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -3192,29 +3426,34 @@ msgstr ""
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
"\"git <kommando> [<revision>...] -- [<fil>...]\""
-#: setup.c:470
+#: setup.c:504
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Förväntade git-arkivversion <= %d, hittade %d"
-#: setup.c:478
+#: setup.c:512
msgid "unknown repository extensions found:"
msgstr "okända arkivutökningar hittades:"
-#: setup.c:768
+#: setup.c:810
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "Inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"
-#: setup.c:770 setup.c:922 builtin/index-pack.c:1643
+#: setup.c:812 builtin/index-pack.c:1652
msgid "Cannot come back to cwd"
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: setup.c:852
+#: setup.c:1050
msgid "Unable to read current working directory"
msgstr "Kan inte läsa aktuell arbetskatalog"
-#: setup.c:927
+#: setup.c:1062 setup.c:1068
+#, c-format
+msgid "Cannot change to '%s'"
+msgstr "Kan inte byta till \"%s\""
+
+#: setup.c:1081
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3224,12 +3463,7 @@ msgstr ""
"monteringspunkten %s)\n"
"Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
-#: setup.c:934
-#, c-format
-msgid "Cannot change to '%s/..'"
-msgstr "kan inte byta till \"%s/..\""
-
-#: setup.c:996
+#: setup.c:1173
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3238,55 +3472,55 @@ msgstr ""
"Problem med filläges-värdet i core.sharedRepository (0%.3o).\n"
"Ägaren av filerna måste alltid ha läs- och skrivbehörighet."
-#: sha1_file.c:490
+#: sha1_file.c:560
#, c-format
msgid "path '%s' does not exist"
msgstr "sökvägen \"%s\" finns inte"
-#: sha1_file.c:516
+#: sha1_file.c:586
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."
-#: sha1_file.c:522
+#: sha1_file.c:592
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-#: sha1_file.c:528
+#: sha1_file.c:598
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "referensarkivet \"%s\" är grunt"
-#: sha1_file.c:536
+#: sha1_file.c:606
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "referensarkivet \"%s\" är ympat"
-#: sha1_file.c:1176
+#: sha1_file.c:1245
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset före slutet av packfilen (trasig .idx?)"
-#: sha1_file.c:2637
+#: sha1_file.c:2729
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "offset före slutet av packindex för %s (trasigt index?)"
-#: sha1_file.c:2641
+#: sha1_file.c:2733
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
-#: sha1_name.c:407
+#: sha1_name.c:419
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "kort SHA1 %s är tvetydig"
-#: sha1_name.c:418
+#: sha1_name.c:430
msgid "The candidates are:"
msgstr "Kandidaterna är:"
-#: sha1_name.c:578
+#: sha1_name.c:589
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -3308,46 +3542,66 @@ msgstr ""
"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
"genom att köra \"git config advice.objectNameWarning false\""
-#: submodule.c:65 submodule.c:99
+#: submodule.c:70 submodule.c:104
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "
"sammanslagningskonflikter först"
-#: submodule.c:69 submodule.c:103
+#: submodule.c:74 submodule.c:108
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"
-#: submodule.c:77
+#: submodule.c:82
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Kunde inte uppdatera .gitmodules-posten %s"
-#: submodule.c:110
+#: submodule.c:115
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Kunde inte ta bort .gitmodules-posten för %s"
-#: submodule.c:121
+#: submodule.c:126
msgid "staging updated .gitmodules failed"
msgstr "misslyckades köa uppdaterad .gitmodules"
-#: submodule.c:159
+#: submodule.c:165
msgid "negative values not allowed for submodule.fetchJobs"
msgstr "negativa värden är inte tillåtna för submodule.fetchJobs"
-#: submodule.c:1184
+#: submodule.c:376
#, c-format
-msgid "could not start 'git status in submodule '%s'"
+msgid "in unpopulated submodule '%s'"
+msgstr "i ej utcheckad undermodul \"%s\""
+
+#: submodule.c:407
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
+
+#: submodule.c:1337
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "\"%s\" känns inte igen som ett git-arkiv"
+
+#: submodule.c:1475
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""
-#: submodule.c:1197
+#: submodule.c:1488
#, c-format
-msgid "could not run 'git status in submodule '%s'"
+msgid "could not run 'git status' in submodule '%s'"
msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
-#: submodule.c:1398
+#: submodule.c:1581
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "undermodulen \"%s\" har ett smutsigt index"
+
+#: submodule.c:1845
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3355,18 +3609,18 @@ msgstr ""
"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
"stöds ej"
-#: submodule.c:1410 submodule.c:1471
+#: submodule.c:1857 submodule.c:1913
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
-#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640
-#: builtin/submodule--helper.c:650
+#: submodule.c:1861 builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:688
#, c-format
msgid "could not create directory '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: submodule.c:1420
+#: submodule.c:1864
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3377,81 +3631,94 @@ msgstr ""
"\"%s\" till\n"
"\"%s\"\n"
-#: submodule.c:1512
+#: submodule.c:1948
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "kunde inte rekursera in i undermodulen \"%s\""
-#: submodule-config.c:360
+#: submodule.c:1992
+msgid "could not start ls-files in .."
+msgstr "kunde inte starta ls-files i .."
+
+#: submodule.c:2012
+msgid "BUG: returned path string doesn't match cwd?"
+msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"
+
+#: submodule.c:2031
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree returnerade en oväntad returkod %d"
+
+#: submodule-config.c:420
#, c-format
msgid "invalid value for %s"
msgstr "ogiltigt värde för %s"
-#: trailer.c:240
+#: trailer.c:241
#, c-format
msgid "running trailer command '%s' failed"
msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\""
-#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539
-#: trailer.c:543
+#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
+#: trailer.c:544
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "okänt värde \"%s\" för nyckeln \"%s\""
-#: trailer.c:525 trailer.c:530 builtin/remote.c:289
+#: trailer.c:526 trailer.c:531 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "mer än en %s"
-#: trailer.c:702
+#: trailer.c:703
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "tom släpradssymbol i släpraden \"%.*s\""
-#: trailer.c:722
+#: trailer.c:723
#, c-format
msgid "could not read input file '%s'"
msgstr "kunde inte läsa indatafilen \"%s\""
-#: trailer.c:725
+#: trailer.c:726
msgid "could not read from stdin"
-msgstr "Kunde inte läsa från standard in"
+msgstr "kunde inte läsa från standard in"
-#: trailer.c:949 builtin/am.c:44
+#: trailer.c:950 builtin/am.c:45
#, c-format
msgid "could not stat %s"
msgstr "kunde inte ta status på %s"
-#: trailer.c:951
+#: trailer.c:952
#, c-format
msgid "file %s is not a regular file"
msgstr "filen %s är inte en normal fil"
-#: trailer.c:953
+#: trailer.c:954
#, c-format
msgid "file %s is not writable by user"
msgstr "filen %s är inte skrivbar av användaren"
-#: trailer.c:965
+#: trailer.c:966
msgid "could not open temporary file"
msgstr "kunde inte öppna temporär file"
-#: trailer.c:1001
+#: trailer.c:1002
#, c-format
msgid "could not rename temporary file to %s"
msgstr "kunde inte byta namn på temporär fil till %s"
-#: transport.c:62
+#: transport.c:63
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"
-#: transport.c:151
+#: transport.c:152
#, c-format
msgid "transport: invalid depth option '%s'"
-msgstr "transport: ogiltig flagga för depth: %s"
+msgstr "transport: ogiltig flagga för depth: ”%s”"
-#: transport.c:885
+#: transport.c:890
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -3460,7 +3727,7 @@ msgstr ""
"Följande undermodulsökvägar innehåller ändringar som\n"
"inte kan hittas av fjärrarna:\n"
-#: transport.c:889
+#: transport.c:894
#, c-format
msgid ""
"\n"
@@ -3487,11 +3754,11 @@ msgstr ""
"för att sända dem till fjärren.\n"
"\n"
-#: transport.c:897
+#: transport.c:902
msgid "Aborting."
msgstr "Avbryter."
-#: transport-helper.c:1082
+#: transport-helper.c:1071
#, c-format
msgid "Could not read ref %s"
msgstr "Kunde inte läsa referensen %s"
@@ -3512,7 +3779,7 @@ msgstr "tomt filnamn i trädpost"
msgid "too-short tree file"
msgstr "trädfil för kort"
-#: unpack-trees.c:99
+#: unpack-trees.c:105
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3521,7 +3788,7 @@ msgstr ""
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
-#: unpack-trees.c:101
+#: unpack-trees.c:107
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3530,7 +3797,7 @@ msgstr ""
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
"%%s"
-#: unpack-trees.c:104
+#: unpack-trees.c:110
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3540,7 +3807,7 @@ msgstr ""
"sammanslagning:\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
-#: unpack-trees.c:106
+#: unpack-trees.c:112
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3550,7 +3817,7 @@ msgstr ""
"sammanslagning:\n"
"%%s"
-#: unpack-trees.c:109
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3559,7 +3826,7 @@ msgstr ""
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."
-#: unpack-trees.c:111
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3568,7 +3835,7 @@ msgstr ""
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
"%%s"
-#: unpack-trees.c:116
+#: unpack-trees.c:122
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -3578,7 +3845,7 @@ msgstr ""
"dem:\n"
"%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:126
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3587,7 +3854,7 @@ msgstr ""
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:122
+#: unpack-trees.c:128
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3596,7 +3863,7 @@ msgstr ""
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
"%%s"
-#: unpack-trees.c:125
+#: unpack-trees.c:131
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3606,7 +3873,7 @@ msgstr ""
"sammanslagningen:\n"
"%%sFlytta eller ta bort dem innan du slår samman."
-#: unpack-trees.c:127
+#: unpack-trees.c:133
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3616,7 +3883,7 @@ msgstr ""
"sammanslagningen:\n"
"%%s"
-#: unpack-trees.c:130
+#: unpack-trees.c:136
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3625,7 +3892,7 @@ msgstr ""
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
"%%sFlytta eller ta bort dem innan du \"%s\"."
-#: unpack-trees.c:132
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3634,7 +3901,7 @@ msgstr ""
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
"%%s"
-#: unpack-trees.c:137
+#: unpack-trees.c:143
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3645,7 +3912,7 @@ msgstr ""
"utcheckningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:139
+#: unpack-trees.c:145
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3656,7 +3923,7 @@ msgstr ""
"utcheckningen:\n"
"%%s"
-#: unpack-trees.c:142
+#: unpack-trees.c:148
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3666,7 +3933,7 @@ msgstr ""
"sammanslagningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:144
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3676,7 +3943,7 @@ msgstr ""
"sammanslagningen:\n"
"%%s"
-#: unpack-trees.c:147
+#: unpack-trees.c:153
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3685,7 +3952,7 @@ msgstr ""
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
"%%sFlytta eller ta bort dem innan du \"%s\"."
-#: unpack-trees.c:149
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3694,12 +3961,12 @@ msgstr ""
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
"%%s"
-#: unpack-trees.c:156
+#: unpack-trees.c:162
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
-#: unpack-trees.c:159
+#: unpack-trees.c:165
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
@@ -3708,7 +3975,7 @@ msgstr ""
"Kan inte uppdatera gles utcheckning: följande poster är inte àjour:\n"
"%s"
-#: unpack-trees.c:161
+#: unpack-trees.c:167
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -3719,7 +3986,7 @@ msgstr ""
"utcheckning:\n"
"%s"
-#: unpack-trees.c:163
+#: unpack-trees.c:169
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -3730,227 +3997,247 @@ msgstr ""
"utcheckning:\n"
"%s"
-#: unpack-trees.c:240
+#: unpack-trees.c:171
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Kan inte uppdatera undermodul:\n"
+"%s"
+
+#: unpack-trees.c:248
#, c-format
msgid "Aborting\n"
msgstr "Avbryter\n"
-#: unpack-trees.c:270
+#: unpack-trees.c:277
+#, c-format
+msgid "submodule update strategy not supported for submodule '%s'"
+msgstr "uppdateringsstrategi för undermodul stöds inte för undermodulen \"%s\""
+
+#: unpack-trees.c:346
msgid "Checking out files"
msgstr "Checkar ut filer"
-#: urlmatch.c:120
+#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix"
-#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
msgid "invalid %XX escape sequence"
msgstr "ogiltig %XX-teckensekvens"
-#: urlmatch.c:172
+#: urlmatch.c:215
msgid "missing host and scheme is not 'file:'"
msgstr "värd saknas och schemat är inte \"file:\""
-#: urlmatch.c:189
+#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
msgstr "en \"file:\"-URL kan inte innehålla portnummer"
-#: urlmatch.c:199
+#: urlmatch.c:247
msgid "invalid characters in host name"
msgstr "ogiltiga tecken i värdnamnet"
-#: urlmatch.c:244 urlmatch.c:255
+#: urlmatch.c:292 urlmatch.c:303
msgid "invalid port number"
msgstr "felaktigt portnummer"
-#: urlmatch.c:322
+#: urlmatch.c:371
msgid "invalid '..' path segment"
msgstr "felaktigt \"..\"-sökvägssegment"
-#: worktree.c:282
+#: worktree.c:245
#, c-format
msgid "failed to read '%s'"
msgstr "misslyckades läsa \"%s\""
-#: wrapper.c:222 wrapper.c:392
+#: wrapper.c:223 wrapper.c:393
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
+#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
#, c-format
msgid "could not open '%s' for writing"
msgstr "kunde inte öppna \"%s\" för skrivning"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
-#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033
-#: builtin/pull.c:341
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
+#: builtin/am.c:849 builtin/merge.c:1014
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
-#: wrapper.c:605 wrapper.c:626
+#: wrapper.c:424 wrapper.c:624
#, c-format
msgid "unable to access '%s'"
msgstr "kan inte komma åt \"%s\""
-#: wrapper.c:634
+#: wrapper.c:632
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
-#: wrapper.c:658
+#: wrapper.c:656
#, c-format
msgid "could not write to %s"
msgstr "kunde inte skriva till %s"
-#: wrapper.c:660
+#: wrapper.c:658
#, c-format
msgid "could not close %s"
msgstr "kunde inte stänga %s"
-#: wt-status.c:151
+#: wt-status.c:152
msgid "Unmerged paths:"
msgstr "Ej sammanslagna sökvägar:"
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"
-#: wt-status.c:180 wt-status.c:207
+#: wt-status.c:181 wt-status.c:208
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
-#: wt-status.c:184
+#: wt-status.c:185
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (använd \"git add <fil>...\" för att ange lösning)"
-#: wt-status.c:186 wt-status.c:190
+#: wt-status.c:187 wt-status.c:191
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
-#: wt-status.c:188
+#: wt-status.c:189
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
-#: wt-status.c:199 wt-status.c:945
+#: wt-status.c:200 wt-status.c:981
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
-#: wt-status.c:217 wt-status.c:954
+#: wt-status.c:218 wt-status.c:990
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
-#: wt-status.c:221
+#: wt-status.c:222
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
-#: wt-status.c:223
+#: wt-status.c:224
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"
-#: wt-status.c:224
+#: wt-status.c:225
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "
"arbetskatalogen)"
-#: wt-status.c:226
+#: wt-status.c:227
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
-#: wt-status.c:238
+#: wt-status.c:239
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)"
-#: wt-status.c:253
+#: wt-status.c:254
msgid "both deleted:"
msgstr "borttaget av bägge:"
-#: wt-status.c:255
+#: wt-status.c:256
msgid "added by us:"
msgstr "tillagt av oss:"
-#: wt-status.c:257
+#: wt-status.c:258
msgid "deleted by them:"
msgstr "borttaget av dem:"
-#: wt-status.c:259
+#: wt-status.c:260
msgid "added by them:"
msgstr "tillagt av dem:"
-#: wt-status.c:261
+#: wt-status.c:262
msgid "deleted by us:"
msgstr "borttaget av oss:"
-#: wt-status.c:263
+#: wt-status.c:264
msgid "both added:"
msgstr "tillagt av bägge:"
-#: wt-status.c:265
+#: wt-status.c:266
msgid "both modified:"
msgstr "ändrat av bägge:"
-#: wt-status.c:275
+#: wt-status.c:276
msgid "new file:"
msgstr "ny fil:"
-#: wt-status.c:277
+#: wt-status.c:278
msgid "copied:"
msgstr "kopierad:"
-#: wt-status.c:279
+#: wt-status.c:280
msgid "deleted:"
msgstr "borttagen:"
-#: wt-status.c:281
+#: wt-status.c:282
msgid "modified:"
msgstr "ändrad:"
-#: wt-status.c:283
+#: wt-status.c:284
msgid "renamed:"
msgstr "namnbytt:"
-#: wt-status.c:285
+#: wt-status.c:286
msgid "typechange:"
msgstr "typbyte:"
-#: wt-status.c:287
+#: wt-status.c:288
msgid "unknown:"
msgstr "okänd:"
-#: wt-status.c:289
+#: wt-status.c:290
msgid "unmerged:"
msgstr "osammanslagen:"
-#: wt-status.c:371
+#: wt-status.c:372
msgid "new commits, "
msgstr "nya incheckningar, "
-#: wt-status.c:373
+#: wt-status.c:374
msgid "modified content, "
msgstr "ändrat innehåll, "
-#: wt-status.c:375
+#: wt-status.c:376
msgid "untracked content, "
msgstr "ospårat innehåll, "
-#: wt-status.c:818
+#: wt-status.c:821
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Stashen innehåller just nu %d post"
+msgstr[1] "Stashen innehåller just nu %d poster"
+
+#: wt-status.c:853
msgid "Submodules changed but not updated:"
msgstr "Undermoduler ändrade men inte uppdaterade:"
-#: wt-status.c:820
+#: wt-status.c:855
msgid "Submodule changes to be committed:"
msgstr "Undermodulers ändringar att checka in:"
-#: wt-status.c:901
+#: wt-status.c:937
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
@@ -3958,107 +4245,107 @@ msgstr ""
"Rör inte raden ovan.\n"
"Allt nedan kommer tas bort."
-#: wt-status.c:1013
+#: wt-status.c:1049
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
-#: wt-status.c:1016
+#: wt-status.c:1052
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
-#: wt-status.c:1018
+#: wt-status.c:1054
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"
-#: wt-status.c:1023
+#: wt-status.c:1059
msgid "All conflicts fixed but you are still merging."
msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
-#: wt-status.c:1026
+#: wt-status.c:1062
msgid " (use \"git commit\" to conclude merge)"
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
-#: wt-status.c:1036
+#: wt-status.c:1072
msgid "You are in the middle of an am session."
msgstr "Du är i mitten av en körning av \"git am\"."
-#: wt-status.c:1039
+#: wt-status.c:1075
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
-#: wt-status.c:1043
+#: wt-status.c:1079
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
-#: wt-status.c:1045
+#: wt-status.c:1081
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
-#: wt-status.c:1047
+#: wt-status.c:1083
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
-#: wt-status.c:1176
+#: wt-status.c:1214
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo saknas."
-#: wt-status.c:1178
+#: wt-status.c:1216
msgid "No commands done."
msgstr "Inga kommandon utförda."
-#: wt-status.c:1181
+#: wt-status.c:1219
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Sista kommandot utfört (%d kommando utfört):"
msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"
-#: wt-status.c:1192
+#: wt-status.c:1230
#, c-format
msgid " (see more in file %s)"
msgstr " (se fler i filen %s)"
-#: wt-status.c:1197
+#: wt-status.c:1235
msgid "No commands remaining."
msgstr "Inga kommandon återstår."
-#: wt-status.c:1200
+#: wt-status.c:1238
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"
msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"
-#: wt-status.c:1208
+#: wt-status.c:1246
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"
-#: wt-status.c:1221
+#: wt-status.c:1259
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
-#: wt-status.c:1226
+#: wt-status.c:1264
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
-#: wt-status.c:1240
+#: wt-status.c:1278
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
-#: wt-status.c:1242
+#: wt-status.c:1280
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
-#: wt-status.c:1244
+#: wt-status.c:1282
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
-#: wt-status.c:1250
+#: wt-status.c:1288
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
-#: wt-status.c:1254
+#: wt-status.c:1292
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -4066,122 +4353,126 @@ msgstr ""
"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1259
+#: wt-status.c:1297
msgid "You are currently splitting a commit during a rebase."
msgstr "Du håller på att dela upp en incheckning i en ombasering."
-#: wt-status.c:1262
+#: wt-status.c:1300
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
-#: wt-status.c:1266
+#: wt-status.c:1304
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1271
+#: wt-status.c:1309
msgid "You are currently editing a commit during a rebase."
msgstr "Du håller på att redigera en incheckning under en ombasering."
-#: wt-status.c:1274
+#: wt-status.c:1312
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
-#: wt-status.c:1276
+#: wt-status.c:1314
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
-#: wt-status.c:1286
+#: wt-status.c:1324
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
-#: wt-status.c:1291
+#: wt-status.c:1329
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
-#: wt-status.c:1294
+#: wt-status.c:1332
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"
-#: wt-status.c:1296
+#: wt-status.c:1334
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"
"operationen)"
-#: wt-status.c:1305
+#: wt-status.c:1343
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Du håller på med att ångra incheckningen %s."
-#: wt-status.c:1310
+#: wt-status.c:1348
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
-#: wt-status.c:1313
+#: wt-status.c:1351
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
-#: wt-status.c:1315
+#: wt-status.c:1353
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
-#: wt-status.c:1326
+#: wt-status.c:1364
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
-#: wt-status.c:1330
+#: wt-status.c:1368
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
-#: wt-status.c:1333
+#: wt-status.c:1371
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
-#: wt-status.c:1530
+#: wt-status.c:1568
msgid "On branch "
msgstr "På grenen "
-#: wt-status.c:1536
+#: wt-status.c:1574
msgid "interactive rebase in progress; onto "
-msgstr "interaktiv ombasering pågår; ovanpå"
+msgstr "interaktiv ombasering pågår; ovanpå "
-#: wt-status.c:1538
+#: wt-status.c:1576
msgid "rebase in progress; onto "
-msgstr "ombasering pågår; ovanpå"
+msgstr "ombasering pågår; ovanpå "
-#: wt-status.c:1543
+#: wt-status.c:1581
msgid "HEAD detached at "
msgstr "HEAD frånkopplad vid "
-#: wt-status.c:1545
+#: wt-status.c:1583
msgid "HEAD detached from "
msgstr "HEAD frånkopplad från "
-#: wt-status.c:1548
+#: wt-status.c:1586
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:1566
+#: wt-status.c:1606
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:1580
+#: wt-status.c:1607
+msgid "No commits yet"
+msgstr "Inga incheckningar ännu"
+
+#: wt-status.c:1621
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:1582
+#: wt-status.c:1623
msgid "Ignored files"
msgstr "Ignorerade filer"
-#: wt-status.c:1586
+#: wt-status.c:1627
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4193,32 +4484,32 @@ msgstr ""
"lägga till nya filer själv (se \"git help status\")."
# %s är nästa sträng eller tom.
-#: wt-status.c:1592
+#: wt-status.c:1633
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:1594
+#: wt-status.c:1635
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
-#: wt-status.c:1600
+#: wt-status.c:1641
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:1605
+#: wt-status.c:1646
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
"\")\n"
-#: wt-status.c:1608
+#: wt-status.c:1649
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1611
+#: wt-status.c:1652
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -4227,327 +4518,363 @@ msgstr ""
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
"\")\n"
-#: wt-status.c:1614
+#: wt-status.c:1655
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "inget köat för incheckning, men ospårade filer finns\n"
-#: wt-status.c:1617
+#: wt-status.c:1658
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
-#: wt-status.c:1620 wt-status.c:1625
+#: wt-status.c:1661 wt-status.c:1666
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1623
+#: wt-status.c:1664
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
-#: wt-status.c:1627
+#: wt-status.c:1668
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
-#: wt-status.c:1734
-msgid "Initial commit on "
-msgstr "Första incheckning på "
+#: wt-status.c:1780
+msgid "No commits yet on "
+msgstr "Inga incheckningar ännu på "
-#: wt-status.c:1738
+#: wt-status.c:1784
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:1767
-msgid "gone"
-msgstr "försvunnen"
-
-#: wt-status.c:1769 wt-status.c:1777
+#: wt-status.c:1813 wt-status.c:1821
msgid "behind "
msgstr "efter "
-#: wt-status.c:1772 wt-status.c:1775
+#: wt-status.c:1816 wt-status.c:1819
msgid "ahead "
msgstr "före "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2277
+#: wt-status.c:2311
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "kan inte %s: Du har oköade ändringar."
-#: wt-status.c:2283
+#: wt-status.c:2317
msgid "additionally, your index contains uncommitted changes."
msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
-#: wt-status.c:2285
+#: wt-status.c:2319
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."
-#: compat/precompose_utf8.c:57 builtin/clone.c:414
+#: compat/precompose_utf8.c:58 builtin/clone.c:436
#, c-format
msgid "failed to unlink '%s'"
msgstr "misslyckades ta bort länken \"%s\""
-#: builtin/add.c:22
+#: builtin/add.c:24
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<flaggor>] [--] <sökväg>..."
-#: builtin/add.c:80
+#: builtin/add.c:82
#, c-format
msgid "unexpected diff status %c"
msgstr "diff-status %c förväntades inte"
-#: builtin/add.c:85 builtin/commit.c:291
+#: builtin/add.c:87 builtin/commit.c:292
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
-#: builtin/add.c:95
+#: builtin/add.c:97
#, c-format
msgid "remove '%s'\n"
msgstr "ta bort \"%s\"\n"
-#: builtin/add.c:149
+#: builtin/add.c:151
msgid "Unstaged changes after refreshing the index:"
msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
-#: builtin/add.c:209 builtin/rev-parse.c:845
+#: builtin/add.c:211 builtin/rev-parse.c:873
msgid "Could not read the index"
msgstr "Kunde inte läsa indexet"
-#: builtin/add.c:220
+#: builtin/add.c:222
#, c-format
msgid "Could not open '%s' for writing."
-msgstr "Kunde inte öppna \"%s\" för skrivning"
+msgstr "Kunde inte öppna \"%s\" för skrivning."
-#: builtin/add.c:224
+#: builtin/add.c:226
msgid "Could not write patch"
msgstr "Kunde inte skriva patch"
-#: builtin/add.c:227
+#: builtin/add.c:229
msgid "editing patch failed"
msgstr "redigering av patch misslyckades"
-#: builtin/add.c:230
+#: builtin/add.c:232
#, c-format
msgid "Could not stat '%s'"
msgstr "Kunde inte ta status på \"%s\""
-#: builtin/add.c:232
+#: builtin/add.c:234
msgid "Empty patch. Aborted."
msgstr "Tom patch. Avbryter."
-#: builtin/add.c:237
+#: builtin/add.c:239
#, c-format
msgid "Could not apply '%s'"
msgstr "Kunde inte tillämpa \"%s\""
-#: builtin/add.c:247
+#: builtin/add.c:249
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:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123
-#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524
-#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162
+#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
+#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr "testkörning"
-#: builtin/add.c:269
+#: builtin/add.c:272
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286
+#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
-#: builtin/add.c:271
+#: builtin/add.c:274
msgid "edit current diff and apply"
msgstr "redigera aktuell diff och applicera"
-#: builtin/add.c:272
+#: builtin/add.c:275
msgid "allow adding otherwise ignored files"
msgstr "tillåt lägga till annars ignorerade filer"
-#: builtin/add.c:273
+#: builtin/add.c:276
msgid "update tracked files"
msgstr "uppdatera spårade filer"
-#: builtin/add.c:274
+#: builtin/add.c:277
msgid "record only the fact that the path will be added later"
msgstr "registrera endast att sökvägen kommer läggas till senare"
-#: builtin/add.c:275
+#: builtin/add.c:278
msgid "add changes from all tracked and untracked files"
msgstr "lägg till ändringar från alla spårade och ospårade filer"
-#: builtin/add.c:278
+#: builtin/add.c:281
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)"
-#: builtin/add.c:280
+#: builtin/add.c:283
msgid "don't add, only refresh the index"
msgstr "lägg inte till, uppdatera endast indexet"
-#: builtin/add.c:281
+#: builtin/add.c:284
msgid "just skip files which cannot be added because of errors"
msgstr "hoppa bara över filer som inte kan läggas till på grund av fel"
-#: builtin/add.c:282
+#: builtin/add.c:285
msgid "check if - even missing - files are ignored in dry run"
msgstr "se om - även saknade - filer ignoreras i testkörning"
-#: builtin/add.c:283 builtin/update-index.c:947
+#: builtin/add.c:286 builtin/update-index.c:952
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:283 builtin/update-index.c:948
+#: builtin/add.c:286 builtin/update-index.c:953
msgid "override the executable bit of the listed files"
msgstr "överstyr exekveringsbiten för angivna filer"
-#: builtin/add.c:305
+#: builtin/add.c:288
+msgid "warn when adding an embedded repository"
+msgstr "varna när ett inbyggt arkiv läggs till"
+
+#: builtin/add.c:303
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr ""
+"Du har lagt till ett annat git-arkiv inuti aktuellt arkiv.\n"
+"Kloner av det yttre arkivet kommer inte innehålla innehållet från\n"
+"det inbäddade arkivet eller veta hur man får tag på det.\n"
+"Om du tänkte lägga till en undermodul, skrev:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"Om du lade till sökvägen av misstag tar du bort den från indexet\n"
+"med:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"Se ”git help submodule” för ytterligare information."
+
+#: builtin/add.c:331
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "lägger till inbäddat git-arkiv: %s"
+
+#: builtin/add.c:349
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Använd -f om du verkligen vill lägga till dem.\n"
-#: builtin/add.c:312
+#: builtin/add.c:357
msgid "adding files failed"
msgstr "misslyckades lägga till filer"
-#: builtin/add.c:348
+#: builtin/add.c:394
msgid "-A and -u are mutually incompatible"
msgstr "-A och -u är ömsesidigt inkompatibla"
-#: builtin/add.c:355
+#: builtin/add.c:401
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
-#: builtin/add.c:359
+#: builtin/add.c:405
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"
-#: builtin/add.c:374
+#: builtin/add.c:420
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Inget angivet, inget tillagt.\n"
-#: builtin/add.c:375
+#: builtin/add.c:421
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Kanske menade du att skriva \"git add .\"?\n"
-#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
-#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
-#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271
+#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
+#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
+#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
#: builtin/submodule--helper.c:244
msgid "index file corrupt"
msgstr "indexfilen trasig"
-#: builtin/am.c:414
+#: builtin/am.c:413
msgid "could not parse author script"
msgstr "kunde inte tolka författarskript"
-#: builtin/am.c:491
+#: builtin/am.c:489
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "\"%s\" togs bort av kroken applypatch-msg"
-#: builtin/am.c:532
+#: builtin/am.c:530
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Felaktig indatarad: \"%s\"."
-#: builtin/am.c:569
+#: builtin/am.c:567
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
-#: builtin/am.c:595
+#: builtin/am.c:593
msgid "fseek failed"
msgstr "\"fseek\" misslyckades"
-#: builtin/am.c:775
+#: builtin/am.c:777
#, c-format
msgid "could not parse patch '%s'"
msgstr "kunde inte tolka patchen \"%s\""
-#: builtin/am.c:840
+#: builtin/am.c:842
msgid "Only one StGIT patch series can be applied at once"
msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
-#: builtin/am.c:887
+#: builtin/am.c:889
msgid "invalid timestamp"
msgstr "ogiltig tidsstämpel"
-#: builtin/am.c:890 builtin/am.c:898
+#: builtin/am.c:892 builtin/am.c:900
msgid "invalid Date line"
msgstr "ogiltig \"Date\"-rad"
-#: builtin/am.c:895
+#: builtin/am.c:897
msgid "invalid timezone offset"
msgstr "ogiltig tidszons-offset"
-#: builtin/am.c:984
+#: builtin/am.c:986
msgid "Patch format detection failed."
msgstr "Misslyckades detektera patchformat."
-#: builtin/am.c:989 builtin/clone.c:379
+#: builtin/am.c:991 builtin/clone.c:401
#, c-format
msgid "failed to create directory '%s'"
msgstr "misslyckades skapa katalogen \"%s\""
-#: builtin/am.c:993
+#: builtin/am.c:995
msgid "Failed to split patches."
msgstr "Misslyckades dela patchar."
-#: builtin/am.c:1125 builtin/commit.c:376
+#: builtin/am.c:1120 builtin/commit.c:377
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
-#: builtin/am.c:1176
+#: builtin/am.c:1171
#, 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:1177
+#: builtin/am.c:1172
#, 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:1178
+#: builtin/am.c:1173
#, 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:1316
-msgid "Patch is empty. Was it split wrong?"
-msgstr "Patchen är tom. Delades den upp felaktigt?"
+#: builtin/am.c:1304
+msgid "Patch is empty."
+msgstr "Patchen är tom."
-#: builtin/am.c:1390 builtin/log.c:1550
+#: builtin/am.c:1370
#, c-format
-msgid "invalid ident line: %s"
-msgstr "ogiltig ident-rad: %s"
+msgid "invalid ident line: %.*s"
+msgstr "ogiltig ident-rad: %.*s"
-#: builtin/am.c:1417
+#: builtin/am.c:1392
#, c-format
msgid "unable to parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: builtin/am.c:1610
+#: builtin/am.c:1586
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:1612
+#: builtin/am.c:1588
msgid "Using index info to reconstruct a base tree..."
msgstr "Använder indexinfo för att återskapa ett basträd..."
-#: builtin/am.c:1631
+#: builtin/am.c:1607
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -4555,39 +4882,39 @@ msgstr ""
"Har du handredigerat din patch?\n"
"Den kan inte tillämpas på blobbar som antecknats i dess index."
-#: builtin/am.c:1637
+#: builtin/am.c:1613
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-#: builtin/am.c:1662
+#: builtin/am.c:1638
msgid "Failed to merge in the changes."
msgstr "Misslyckades slå ihop ändringarna."
-#: builtin/am.c:1686 builtin/merge.c:632
+#: builtin/am.c:1662 builtin/merge.c:632
msgid "git write-tree failed to write a tree"
msgstr "git write-tree misslyckades skriva ett träd"
-#: builtin/am.c:1693
+#: builtin/am.c:1669
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
-#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
-#: builtin/merge.c:827
+#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
+#: builtin/merge.c:828
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: builtin/am.c:1739 builtin/am.c:1743
+#: builtin/am.c:1715 builtin/am.c:1719
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "kan inte återuppta: %s finns inte."
-#: builtin/am.c:1759
+#: builtin/am.c:1735
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:1764
+#: builtin/am.c:1740
msgid "Commit Body is:"
msgstr "Incheckningskroppen är:"
@@ -4595,35 +4922,35 @@ msgstr "Incheckningskroppen är:"
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1774
+#: builtin/am.c:1750
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:1824
+#: builtin/am.c:1800
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
-#: builtin/am.c:1861 builtin/am.c:1933
+#: builtin/am.c:1840 builtin/am.c:1912
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
-#: builtin/am.c:1877
+#: builtin/am.c:1856
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/am.c:1885
+#: builtin/am.c:1864
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
-#: builtin/am.c:1891
+#: builtin/am.c:1870
#, 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:1936
+#: builtin/am.c:1915
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -4633,25 +4960,29 @@ msgstr ""
"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:1943
+#: builtin/am.c:1922
msgid ""
"You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
+"You should 'git add' each file with resolved conflicts to mark them as "
+"such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-"Du har fortfarande sökvägar som inte slagits samman i ditt index.\n"
-"Glömde du använda \"git add\"?"
+"Du har fortfarande ej sammanslagna sökvägar i indexet.\n"
+"Du bör köra ”git add” på filer med lösta konflikter för att ange dem som "
+"lösta.\n"
+"Du kan köra ”git rm” för att godta ”borttagen av dem” för den."
-#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
-#: builtin/reset.c:316
+#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
+#: builtin/reset.c:331
#, c-format
msgid "Could not parse object '%s'."
-msgstr "Kan inte tolka objektet \"%s\""
+msgstr "Kan inte tolka objektet ”%s”."
-#: builtin/am.c:2103
+#: builtin/am.c:2083
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
-#: builtin/am.c:2137
+#: builtin/am.c:2117
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -4659,133 +4990,134 @@ msgstr ""
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
-#: builtin/am.c:2200
+#: builtin/am.c:2180
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Felaktigt värde för --patch-format: %s"
-#: builtin/am.c:2233
+#: builtin/am.c:2213
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2234
+#: builtin/am.c:2214
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/am.c:2240
+#: builtin/am.c:2220
msgid "run interactively"
msgstr "kör interaktivt"
-#: builtin/am.c:2242
+#: builtin/am.c:2222
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
-#: builtin/am.c:2244
+#: builtin/am.c:2224
msgid "allow fall back on 3way merging if needed"
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
-#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
-#: builtin/repack.c:178
+#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:180
msgid "be quiet"
msgstr "var tyst"
-#: builtin/am.c:2247
+#: builtin/am.c:2227
msgid "add a Signed-off-by line to the commit message"
msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
-#: builtin/am.c:2250
+#: builtin/am.c:2230
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
-#: builtin/am.c:2252
+#: builtin/am.c:2232
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/am.c:2254
+#: builtin/am.c:2234
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/am.c:2256
+#: builtin/am.c:2236
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/am.c:2258
+#: builtin/am.c:2238
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:2261
+#: builtin/am.c:2241
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:2264
+#: builtin/am.c:2244
msgid "strip everything before a scissors line"
msgstr "ta bort allting före en saxlinje"
-#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:2293
+#: 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
msgid "pass it through git-apply"
msgstr "sänd det genom git-apply"
-#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135
-#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
-#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
+#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
+#: builtin/pull.c:197 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:399 parse-options.h:132 parse-options.h:134
+#: parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
-#: builtin/tag.c:387 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
msgid "format"
msgstr "format"
-#: builtin/am.c:2290
+#: builtin/am.c:2270
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
-#: builtin/am.c:2296
+#: builtin/am.c:2276
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/am.c:2298
+#: builtin/am.c:2278
msgid "continue applying patches after resolving a conflict"
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
-#: builtin/am.c:2301
+#: builtin/am.c:2281
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
-#: builtin/am.c:2304
+#: builtin/am.c:2284
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
-#: builtin/am.c:2307
+#: builtin/am.c:2287
msgid "restore the original branch and abort the patching operation."
msgstr "återställ originalgrenen och avbryt patchningen."
-#: builtin/am.c:2311
+#: builtin/am.c:2291
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
-#: builtin/am.c:2313
+#: builtin/am.c:2293
msgid "use current timestamp for author date"
msgstr "använd nuvarande tidsstämpel för författardatum"
-#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233
-#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370
+#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/am.c:2316
+#: builtin/am.c:2296
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
-#: builtin/am.c:2319
+#: builtin/am.c:2299
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
-#: builtin/am.c:2334
+#: builtin/am.c:2317
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."
@@ -4793,16 +5125,16 @@ msgstr ""
"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:2341
+#: builtin/am.c:2324
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
-#: builtin/am.c:2356
+#: builtin/am.c:2339
#, 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:2380
+#: builtin/am.c:2363
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -4811,7 +5143,7 @@ msgstr ""
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
-#: builtin/am.c:2386
+#: builtin/am.c:2369
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
@@ -4822,7 +5154,7 @@ msgstr "git apply [<flaggor>] [<patch>...]"
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
-msgstr "Kunde inte skapa arkivfilen \"%s\""
+msgstr "kunde inte skapa arkivfilen \"%s\""
#: builtin/archive.c:20
msgid "could not redirect output"
@@ -4841,11 +5173,6 @@ msgstr "git archive: förväntade ACK/NAK, fick EOF"
msgid "git archive: NACK %s"
msgstr "git archive: NACK %s"
-#: builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "fjärrfel: %s"
-
#: builtin/archive.c:64
msgid "git archive: protocol error"
msgstr "git archive: protokollfel"
@@ -4866,191 +5193,166 @@ msgstr "utför 'git bisect next'"
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"
-#: builtin/blame.c:33
+#: builtin/blame.c:27
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"
-#: builtin/blame.c:38
+#: builtin/blame.c:32
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
-#: builtin/blame.c:1786
-msgid "Blaming lines"
-msgstr "Klandra rader"
-
-#: builtin/blame.c:2582
+#: builtin/blame.c:668
msgid "Show blame entries as we find them, incrementally"
msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
-#: builtin/blame.c:2583
+#: builtin/blame.c:669
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
-#: builtin/blame.c:2584
+#: builtin/blame.c:670
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
-#: builtin/blame.c:2585
+#: builtin/blame.c:671
msgid "Show work cost statistics"
msgstr "Visa statistik över arbetskostnad"
-#: builtin/blame.c:2586
+#: builtin/blame.c:672
msgid "Force progress reporting"
msgstr "Tvinga förloppsrapportering"
-#: builtin/blame.c:2587
+#: builtin/blame.c:673
msgid "Show output score for blame entries"
msgstr "Visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:2588
+#: builtin/blame.c:674
msgid "Show original filename (Default: auto)"
msgstr "Visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:2589
+#: builtin/blame.c:675
msgid "Show original linenumber (Default: off)"
msgstr "Visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:2590
+#: builtin/blame.c:676
msgid "Show in a format designed for machine consumption"
msgstr "Visa i ett format avsett för maskinkonsumtion"
-#: builtin/blame.c:2591
+#: builtin/blame.c:677
msgid "Show porcelain format with per-line commit information"
msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:2592
+#: builtin/blame.c:678
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:2593
+#: builtin/blame.c:679
msgid "Show raw timestamp (Default: off)"
msgstr "Visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:2594
+#: builtin/blame.c:680
msgid "Show long commit SHA1 (Default: off)"
msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:2595
+#: builtin/blame.c:681
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:2596
+#: builtin/blame.c:682
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:2597
+#: builtin/blame.c:683
msgid "Ignore whitespace differences"
msgstr "Ignorera ändringar i blanksteg"
-#: builtin/blame.c:2604
+#: builtin/blame.c:690
msgid "Use an experimental heuristic to improve diffs"
msgstr "Använd en experimentell algoritm för att förbättra diffar"
-#: builtin/blame.c:2606
+#: builtin/blame.c:692
msgid "Spend extra cycles to find better match"
msgstr "Slösa extra cykler med att hitta bättre träff"
-#: builtin/blame.c:2607
+#: builtin/blame.c:693
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:2608
+#: builtin/blame.c:694
msgid "Use <file>'s contents as the final image"
msgstr "Använd <fil>s innehåll som slutgiltig bild"
-#: builtin/blame.c:2609 builtin/blame.c:2610
+#: builtin/blame.c:695 builtin/blame.c:696
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:2609
+#: builtin/blame.c:695
msgid "Find line copies within and across files"
msgstr "Hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:2610
+#: builtin/blame.c:696
msgid "Find line movements within and across files"
msgstr "Hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:2611
+#: builtin/blame.c:697
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2611
+#: builtin/blame.c:697
msgid "Process only line range n,m, counting from 1"
msgstr "Behandla endast radintervallet n,m, med början på 1"
-#: builtin/blame.c:2658
+#: builtin/blame.c:744
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress kan inte användas med --incremental eller porslinsformat"
-#. TRANSLATORS: This string is used to tell us the maximum
-#. display width for a relative timestamp in "git blame"
-#. output. For C locale, "4 years, 11 months ago", which
-#. takes 22 places, is the longest among various forms of
-#. relative timestamps, but your language may need more or
-#. fewer display columns.
-#: builtin/blame.c:2706
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output. For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:795
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
-#: builtin/blame.c:2786
-msgid "--contents and --reverse do not blend well."
-msgstr "--contents och --reverse fungerar inte så bra tillsammans."
-
-#: builtin/blame.c:2806
-msgid "cannot use --contents with final commit object name"
-msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"
-
-#: builtin/blame.c:2811
-msgid "--reverse and --first-parent together require specified latest commit"
-msgstr ""
-"--reverse och --first-parent tillsammans kräver att du anger senaste "
-"incheckningen"
-
-#: builtin/blame.c:2838
-msgid ""
-"--reverse --first-parent together require range along first-parent chain"
-msgstr ""
-"--reverse --first-parent tillsammans kräver ett intervall på första-förälder-"
-"kedjan"
-
-#: builtin/blame.c:2849
-#, c-format
-msgid "no such path %s in %s"
-msgstr "sökvägen %s i %s finns inte"
-
-#: builtin/blame.c:2860
-#, c-format
-msgid "cannot read blob %s for path %s"
-msgstr "kan inte läsa objektet %s för sökvägen %s"
-
-#: builtin/blame.c:2879
+#: builtin/blame.c:882
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "filen %s har bara %lu rad"
msgstr[1] "filen %s har bara %lu rader"
-#: builtin/branch.c:26
+#: builtin/blame.c:928
+msgid "Blaming lines"
+msgstr "Klandra rader"
+
+#: builtin/branch.c:27
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]"
-#: builtin/branch.c:27
+#: builtin/branch.c:28
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]"
-#: builtin/branch.c:28
+#: builtin/branch.c:29
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..."
-#: builtin/branch.c:29
+#: builtin/branch.c:30
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>"
-#: builtin/branch.c:30
+#: builtin/branch.c:31
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<flaggor>] [-r | -a] [--points-at]"
-#: builtin/branch.c:143
+#: builtin/branch.c:32
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<flaggor>] [-r | -a] [--format]"
+
+#: builtin/branch.c:145
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -5059,7 +5361,7 @@ msgstr ""
"tar bort grenen \"%s\" som har slagits ihop med\n"
" \"%s\", men ännu inte slagits ihop med HEAD."
-#: builtin/branch.c:147
+#: builtin/branch.c:149
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -5068,12 +5370,12 @@ msgstr ""
"tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
" \"%s\", trots att den har slagits ihop med HEAD."
-#: builtin/branch.c:161
+#: builtin/branch.c:163
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
-#: builtin/branch.c:165
+#: builtin/branch.c:167
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -5082,164 +5384,92 @@ msgstr ""
"Grenen \"%s\" har inte slagits samman i sin helhet.\n"
"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."
-#: builtin/branch.c:178
+#: builtin/branch.c:180
msgid "Update of config-file failed"
msgstr "Misslyckades uppdatera konfigurationsfil"
-#: builtin/branch.c:206
+#: builtin/branch.c:211
msgid "cannot use -a with -d"
msgstr "kan inte ange -a med -d"
-#: builtin/branch.c:212
+#: builtin/branch.c:217
msgid "Couldn't look up commit object for HEAD"
msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
-#: builtin/branch.c:226
+#: builtin/branch.c:231
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\""
-#: builtin/branch.c:241
+#: builtin/branch.c:246
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "fjärrspårande grenen \"%s\" hittades inte."
-#: builtin/branch.c:242
+#: builtin/branch.c:247
#, c-format
msgid "branch '%s' not found."
msgstr "grenen \"%s\" hittades inte."
-#: builtin/branch.c:257
+#: builtin/branch.c:262
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
-#: builtin/branch.c:258
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Fel vid borttagning av grenen \"%s\""
-#: builtin/branch.c:265
+#: builtin/branch.c:270
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"
-#: builtin/branch.c:266
+#: builtin/branch.c:271
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Tog bort grenen %s (var %s).\n"
-#: builtin/branch.c:312
-#, c-format
-msgid "[%s: gone]"
-msgstr "[%s: försvunnen]"
-
-#: builtin/branch.c:317
-#, c-format
-msgid "[%s]"
-msgstr "[%s]"
-
-#: builtin/branch.c:322
-#, c-format
-msgid "[%s: behind %d]"
-msgstr "[%s: bakom %d] "
-
-#: builtin/branch.c:324
-#, c-format
-msgid "[behind %d]"
-msgstr "[bakom %d] "
-
-#: builtin/branch.c:328
-#, c-format
-msgid "[%s: ahead %d]"
-msgstr "[%s: före %d] "
-
-#: builtin/branch.c:330
-#, c-format
-msgid "[ahead %d]"
-msgstr "[före %d] "
-
-#: builtin/branch.c:333
-#, c-format
-msgid "[%s: ahead %d, behind %d]"
-msgstr "[%s: före %d, bakom %d] "
-
-#: builtin/branch.c:336
-#, c-format
-msgid "[ahead %d, behind %d]"
-msgstr "[före %d, bakom %d] "
-
-#: builtin/branch.c:349
-msgid " **** invalid ref ****"
-msgstr " **** ogiltig ref ****"
-
-#: builtin/branch.c:375
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(ingen gren, ombaserar %s)"
-
-#: builtin/branch.c:378
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(ingen gren, \"bisect\" startad på %s)"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: builtin/branch.c:384
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD frånkopplat vid %s)"
-
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: builtin/branch.c:389
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD frånkopplat från %s)"
-
-#: builtin/branch.c:393
-msgid "(no branch)"
-msgstr "(ingen gren)"
-
-#: builtin/branch.c:535
+#: builtin/branch.c:445
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Grenen %s ombaseras på %s"
-#: builtin/branch.c:539
+#: builtin/branch.c:449
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Grenen %s är i en \"bisect\" på %s"
-#: builtin/branch.c:554
+#: builtin/branch.c:464
msgid "cannot rename the current branch while not on any."
msgstr ""
"kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:564
+#: builtin/branch.c:474
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Felaktigt namn på gren: \"%s\""
-#: builtin/branch.c:581
+#: builtin/branch.c:491
msgid "Branch rename failed"
msgstr "Misslyckades byta namn på gren"
-#: builtin/branch.c:585
+#: builtin/branch.c:494
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:588
+#: builtin/branch.c:497
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
-#: builtin/branch.c:595
+#: builtin/branch.c:506
msgid "Branch is renamed, but update of config-file failed"
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:611
+#: builtin/branch.c:522
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5250,208 +5480,217 @@ msgstr ""
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/branch.c:643
+#: builtin/branch.c:555
msgid "Generic options"
msgstr "Allmänna flaggor"
-#: builtin/branch.c:645
+#: builtin/branch.c:557
msgid "show hash and subject, give twice for upstream branch"
msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"
-#: builtin/branch.c:646
+#: builtin/branch.c:558
msgid "suppress informational messages"
msgstr "undertryck informationsmeddelanden"
-#: builtin/branch.c:647
+#: builtin/branch.c:559
msgid "set up tracking mode (see git-pull(1))"
msgstr "ställ in spårningsläge (se git-pull(1))"
-#: builtin/branch.c:649
+#: builtin/branch.c:561
msgid "change upstream info"
msgstr "ändra uppströmsinformation"
-#: builtin/branch.c:651
+#: builtin/branch.c:563
msgid "upstream"
msgstr "uppströms"
-#: builtin/branch.c:651
+#: builtin/branch.c:563
msgid "change the upstream info"
msgstr "ändra uppströmsinformationen"
-#: builtin/branch.c:652
+#: builtin/branch.c:564
msgid "Unset the upstream info"
-msgstr "ta bort uppströmsinformationen"
+msgstr "Ta bort uppströmsinformationen"
-#: builtin/branch.c:653
+#: builtin/branch.c:565
msgid "use colored output"
msgstr "använd färgad utdata"
-#: builtin/branch.c:654
+#: builtin/branch.c:566
msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
-#: builtin/branch.c:656 builtin/branch.c:657
+#: builtin/branch.c:568 builtin/branch.c:570
msgid "print only branches that contain the commit"
msgstr "visa endast grenar som innehåller incheckningen"
-#: builtin/branch.c:660
+#: builtin/branch.c:569 builtin/branch.c:571
+msgid "print only branches that don't contain the commit"
+msgstr "visa endast grenar som inte innehåller incheckningen"
+
+#: builtin/branch.c:574
msgid "Specific git-branch actions:"
msgstr "Specifika git-branch-åtgärder:"
-#: builtin/branch.c:661
+#: builtin/branch.c:575
msgid "list both remote-tracking and local branches"
msgstr "visa både fjärrspårande och lokala grenar"
-#: builtin/branch.c:663
+#: builtin/branch.c:577
msgid "delete fully merged branch"
msgstr "ta bort helt sammanslagen gren"
-#: builtin/branch.c:664
+#: builtin/branch.c:578
msgid "delete branch (even if not merged)"
msgstr "ta bort gren (även om inte helt sammanslagen)"
-#: builtin/branch.c:665
+#: builtin/branch.c:579
msgid "move/rename a branch and its reflog"
msgstr "flytta/ta bort en gren och dess reflogg"
-#: builtin/branch.c:666
+#: builtin/branch.c:580
msgid "move/rename a branch, even if target exists"
msgstr "flytta/ta bort en gren, även om målet finns"
-#: builtin/branch.c:667
+#: builtin/branch.c:581
msgid "list branch names"
msgstr "lista namn på grenar"
-#: builtin/branch.c:668
+#: builtin/branch.c:582
msgid "create the branch's reflog"
msgstr "skapa grenens reflogg"
-#: builtin/branch.c:670
+#: builtin/branch.c:584
msgid "edit the description for the branch"
msgstr "redigera beskrivning för grenen"
-#: builtin/branch.c:671
+#: builtin/branch.c:585
msgid "force creation, move/rename, deletion"
msgstr "tvinga skapande, flytt/namnändring, borttagande"
-#: builtin/branch.c:672
+#: builtin/branch.c:586
msgid "print only branches that are merged"
msgstr "visa endast sammanslagna grenar"
-#: builtin/branch.c:673
+#: builtin/branch.c:587
msgid "print only branches that are not merged"
msgstr "visa endast ej sammanslagna grenar"
-#: builtin/branch.c:674
+#: builtin/branch.c:588
msgid "list branches in columns"
msgstr "visa grenar i spalter"
-#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381
+#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
msgid "key"
msgstr "nyckel"
-#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382
+#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
msgid "field name to sort on"
msgstr "fältnamn att sortera på"
-#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404
-#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
-#: builtin/tag.c:384
+#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
+#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
+#: builtin/tag.c:430
msgid "object"
msgstr "objekt"
-#: builtin/branch.c:679
+#: builtin/branch.c:593
msgid "print only branches of the object"
msgstr "visa endast grenar för objektet"
-#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388
+#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
msgid "sorting and filtering are case insensitive"
msgstr "sortering och filtrering skiljer gemener och VERSALER"
-#: builtin/branch.c:698
+#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/verify-tag.c:39
+msgid "format to use for the output"
+msgstr "format att använda för utdata"
+
+#: builtin/branch.c:615
msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Misslyckades slå upp HEAD som giltig referens"
+msgstr "Misslyckades slå upp HEAD som giltig referens."
-#: builtin/branch.c:702 builtin/clone.c:706
+#: builtin/branch.c:619 builtin/clone.c:728
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
-#: builtin/branch.c:724
+#: builtin/branch.c:642
msgid "--column and --verbose are incompatible"
msgstr "--column och --verbose är inkompatibla"
-#: builtin/branch.c:735 builtin/branch.c:787
+#: builtin/branch.c:653 builtin/branch.c:705
msgid "branch name required"
msgstr "grennamn krävs"
-#: builtin/branch.c:763
+#: builtin/branch.c:681
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
-#: builtin/branch.c:768
+#: builtin/branch.c:686
msgid "cannot edit description of more than one branch"
msgstr "kan inte redigera beskrivning för mer än en gren"
-#: builtin/branch.c:775
+#: builtin/branch.c:693
#, c-format
msgid "No commit on branch '%s' yet."
-msgstr "Inga incheckningar på grenen \"%s\" ännu"
+msgstr "Inga incheckningar på grenen \"%s\" ännu."
-#: builtin/branch.c:778
+#: builtin/branch.c:696
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
-#: builtin/branch.c:793
+#: builtin/branch.c:711
msgid "too many branches for a rename operation"
msgstr "för många grenar för namnbyte"
-#: builtin/branch.c:798
+#: builtin/branch.c:716
msgid "too many branches to set new upstream"
msgstr "för många grenar för att byta uppström"
-#: builtin/branch.c:802
+#: builtin/branch.c:720
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."
-#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848
+#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
-#: builtin/branch.c:809
+#: builtin/branch.c:727
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
-#: builtin/branch.c:821
+#: builtin/branch.c:739
msgid "too many branches to unset upstream"
msgstr "för många grenar för att ta bort uppström"
-#: builtin/branch.c:825
+#: builtin/branch.c:743
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."
-#: builtin/branch.c:831
+#: builtin/branch.c:749
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
-#: builtin/branch.c:845
+#: builtin/branch.c:763
msgid "it does not make sense to create 'HEAD' manually"
msgstr "kan inte skapa \"HEAD\" manuellt"
-#: builtin/branch.c:851
+#: builtin/branch.c:769
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "
"grennamn"
-#: builtin/branch.c:854
+#: builtin/branch.c:772
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -5460,7 +5699,7 @@ msgstr ""
"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
"eller --set-upstream-to\n"
-#: builtin/branch.c:871
+#: builtin/branch.c:789
#, c-format
msgid ""
"\n"
@@ -5471,20 +5710,20 @@ msgstr ""
"Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"
"\n"
-#: builtin/bundle.c:51
+#: builtin/bundle.c:45
#, c-format
msgid "%s is okay\n"
msgstr "%s är okej\n"
-#: builtin/bundle.c:64
+#: builtin/bundle.c:58
msgid "Need a repository to create a bundle."
msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."
-#: builtin/bundle.c:68
+#: builtin/bundle.c:62
msgid "Need a repository to unbundle."
msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
-#: builtin/cat-file.c:513
+#: builtin/cat-file.c:519
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5492,7 +5731,7 @@ msgstr ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>"
-#: builtin/cat-file.c:514
+#: builtin/cat-file.c:520
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -5500,302 +5739,302 @@ msgstr ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:551
+#: builtin/cat-file.c:557
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<typ> kan vara en av: blob, tree, commit, tag"
-#: builtin/cat-file.c:552
+#: builtin/cat-file.c:558
msgid "show object type"
msgstr "visa objekttyp"
-#: builtin/cat-file.c:553
+#: builtin/cat-file.c:559
msgid "show object size"
msgstr "visa objektstorlek"
-#: builtin/cat-file.c:555
+#: builtin/cat-file.c:561
msgid "exit with zero when there's no error"
msgstr "avsluta med noll när det inte uppstått något fel"
-#: builtin/cat-file.c:556
+#: builtin/cat-file.c:562
msgid "pretty-print object's content"
msgstr "visa objektets innehåll snyggt"
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:564
msgid "for blob objects, run textconv on object's content"
msgstr "för blob-objekt, kör filter på objektets innehåll"
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:566
msgid "for blob objects, run filters on object's content"
msgstr "för blob-objekt, kör filger på objektets innehåll"
-#: builtin/cat-file.c:561 git-submodule.sh:929
+#: builtin/cat-file.c:567 git-submodule.sh:944
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:568
msgid "use a specific path for --textconv/--filters"
msgstr "använd specifik sökväg för --textconv/--filters"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:570
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt"
-#: builtin/cat-file.c:565
+#: builtin/cat-file.c:571
msgid "buffer --batch output"
msgstr "buffra utdata från --batch"
-#: builtin/cat-file.c:567
+#: builtin/cat-file.c:573
msgid "show info and content of objects fed from the standard input"
msgstr "visa information och innehåll för objekt som listas på standard in"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:576
msgid "show info about objects fed from the standard input"
msgstr "visa information för objekt som listas på standard in"
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:579
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"följ symboliska länkar i trädet (använd med --batch eller --batch-check)"
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:581
msgid "show all objects with --batch or --batch-check"
msgstr "visa alla objekt med --batch eller --batch-check"
-#: builtin/check-attr.c:11
+#: builtin/check-attr.c:12
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..."
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
-#: builtin/check-attr.c:19
+#: builtin/check-attr.c:20
msgid "report all attributes set on file"
msgstr "visa alla attribut som satts på filen"
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
msgid "use .gitattributes only from the index"
msgstr "använd .gitattributes endast från indexet"
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
msgid "read file names from stdin"
msgstr "läs filnamn från standard in"
-#: builtin/check-attr.c:23 builtin/check-ignore.c:24
+#: builtin/check-attr.c:24 builtin/check-ignore.c:26
msgid "terminate input and output records by a NUL character"
msgstr "avsluta in- och utdataposter med NUL-tecken"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332
+#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
-#: builtin/check-ignore.c:26
+#: builtin/check-ignore.c:28
msgid "show non-matching input paths"
msgstr "visa indatasökvägar som inte träffas"
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:30
msgid "ignore index when checking"
msgstr "ignorera index vid kontroll"
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:158
msgid "cannot specify pathnames with --stdin"
msgstr "kan inte ange sökvägsnamn med --stdin"
-#: builtin/check-ignore.c:157
+#: builtin/check-ignore.c:161
msgid "-z only makes sense with --stdin"
msgstr "-z kan endast användas tillsammans med --stdin"
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:163
msgid "no path specified"
msgstr "ingen sökväg angavs"
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:167
msgid "--quiet is only valid with a single pathname"
msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn"
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:169
msgid "cannot have both --quiet and --verbose"
msgstr "kan inte använda både --quiet och --verbose"
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:172
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching är endast giltig med --verbose"
-#: builtin/check-mailmap.c:8
+#: builtin/check-mailmap.c:9
msgid "git check-mailmap [<options>] <contact>..."
msgstr "git check-mailmap [<flaggor>] <kontakt>..."
-#: builtin/check-mailmap.c:13
+#: builtin/check-mailmap.c:14
msgid "also read contacts from stdin"
msgstr "läs även kontakter från standard in"
-#: builtin/check-mailmap.c:24
+#: builtin/check-mailmap.c:25
#, c-format
msgid "unable to parse contact: %s"
msgstr "kunde inte tolka kontakt: %s"
-#: builtin/check-mailmap.c:47
+#: builtin/check-mailmap.c:48
msgid "no contacts specified"
msgstr "inga kontakter angavs"
-#: builtin/checkout-index.c:127
+#: builtin/checkout-index.c:128
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<flaggor>] [--] [<fil>...]"
-#: builtin/checkout-index.c:144
+#: builtin/checkout-index.c:145
msgid "stage should be between 1 and 3 or all"
msgstr "etapp måste vara mellan 1 och 3 eller \"all\""
-#: builtin/checkout-index.c:160
+#: builtin/checkout-index.c:161
msgid "check out all files in the index"
msgstr "checka ut alla filer i indexet"
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:162
msgid "force overwrite of existing files"
msgstr "tvinga överskrivning av befintliga filer"
-#: builtin/checkout-index.c:163
+#: builtin/checkout-index.c:164
msgid "no warning for existing files and files not in index"
msgstr "ingen varning för existerande filer och filer ej i indexet"
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:166
msgid "don't checkout new files"
msgstr "checka inte ut nya filer"
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:168
msgid "update stat information in the index file"
msgstr "uppdatera stat-information i indexfilen"
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:172
msgid "read list of paths from the standard input"
msgstr "läs listan över sökvägar från standard in"
-#: builtin/checkout-index.c:173
+#: builtin/checkout-index.c:174
msgid "write the content to temporary files"
msgstr "skriv innehåll till temporära filer"
-#: builtin/checkout-index.c:174 builtin/column.c:30
-#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600
-#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967
-#: builtin/worktree.c:471
+#: builtin/checkout-index.c:175 builtin/column.c:31
+#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
+#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
+#: builtin/worktree.c:478
msgid "string"
msgstr "sträng"
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:176
msgid "when creating files, prepend <string>"
msgstr "när filer skapas, lägg till <sträng> först"
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:178
msgid "copy out the files from named stage"
msgstr "kopiera ut filer från namngiven etapp"
-#: builtin/checkout.c:25
+#: builtin/checkout.c:26
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<flaggor>] <gren>"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:27
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..."
-#: builtin/checkout.c:134 builtin/checkout.c:167
+#: builtin/checkout.c:135 builtin/checkout.c:168
#, c-format
msgid "path '%s' does not have our version"
msgstr "sökvägen \"%s\" har inte vår version"
-#: builtin/checkout.c:136 builtin/checkout.c:169
+#: builtin/checkout.c:137 builtin/checkout.c:170
#, c-format
msgid "path '%s' does not have their version"
msgstr "sökvägen \"%s\" har inte deras version"
-#: builtin/checkout.c:152
+#: builtin/checkout.c:153
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"
-#: builtin/checkout.c:196
+#: builtin/checkout.c:197
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"
-#: builtin/checkout.c:213
+#: builtin/checkout.c:214
#, c-format
msgid "path '%s': cannot merge"
msgstr "sökväg \"%s\": kan inte slå ihop"
-#: builtin/checkout.c:230
+#: builtin/checkout.c:231
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
-#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
-#: builtin/checkout.c:259
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"
-#: builtin/checkout.c:262 builtin/checkout.c:265
+#: builtin/checkout.c:265 builtin/checkout.c:268
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "\"%s\" kan inte användas med %s"
-#: builtin/checkout.c:268
+#: builtin/checkout.c:271
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
-#: builtin/checkout.c:339 builtin/checkout.c:346
+#: builtin/checkout.c:342 builtin/checkout.c:349
#, c-format
msgid "path '%s' is unmerged"
msgstr "sökvägen \"%s\" har inte slagits ihop"
-#: builtin/checkout.c:494
+#: builtin/checkout.c:497
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
-#: builtin/checkout.c:625
+#: builtin/checkout.c:628
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
-#: builtin/checkout.c:666
+#: builtin/checkout.c:669
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:670 builtin/clone.c:660
+#: builtin/checkout.c:673 builtin/clone.c:682
msgid "unable to update HEAD"
msgstr "kan inte uppdatera HEAD"
-#: builtin/checkout.c:674
+#: builtin/checkout.c:677
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:680
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:681
+#: builtin/checkout.c:684
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
-#: builtin/checkout.c:683 builtin/checkout.c:1072
+#: builtin/checkout.c:686 builtin/checkout.c:1075
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
-#: builtin/checkout.c:685
+#: builtin/checkout.c:688
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:736
+#: builtin/checkout.c:739
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:742
+#: builtin/checkout.c:745
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -5818,7 +6057,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:761
+#: builtin/checkout.c:764
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5845,165 +6084,161 @@ msgstr[1] ""
" git branch <nytt_grennamn> %s\n"
"\n"
-#: builtin/checkout.c:797
+#: builtin/checkout.c:800
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:804
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:828 builtin/checkout.c:1067
+#: builtin/checkout.c:832 builtin/checkout.c:1070
msgid "You are on a branch yet to be born"
msgstr "Du är på en gren som ännu inte är född"
-#: builtin/checkout.c:973
+#: builtin/checkout.c:976
#, c-format
msgid "only one reference expected, %d given."
msgstr "endast en referens förväntades, %d gavs."
-#: builtin/checkout.c:1013 builtin/worktree.c:214
+#: builtin/checkout.c:1016 builtin/worktree.c:215
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1042
+#: builtin/checkout.c:1045
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1081
+#: builtin/checkout.c:1084
msgid "paths cannot be used with switching branches"
msgstr "sökvägar kan inte användas vid byte av gren"
-#: builtin/checkout.c:1084 builtin/checkout.c:1088
+#: builtin/checkout.c:1087 builtin/checkout.c:1091
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "\"%s\" kan inte användas vid byte av gren"
-#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100
-#: builtin/checkout.c:1103
+#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
+#: builtin/checkout.c:1106
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1108
+#: builtin/checkout.c:1111
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
-#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
-#: builtin/worktree.c:326
+#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
+#: builtin/worktree.c:330
msgid "branch"
msgstr "gren"
-#: builtin/checkout.c:1142
+#: builtin/checkout.c:1145
msgid "create and checkout a new branch"
msgstr "skapa och checka ut en ny gren"
-#: builtin/checkout.c:1144
+#: builtin/checkout.c:1147
msgid "create/reset and checkout a branch"
msgstr "skapa/nollställ och checka ut en gren"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1148
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1146 builtin/worktree.c:328
+#: builtin/checkout.c:1149 builtin/worktree.c:332
msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1150
msgid "set upstream info for new branch"
msgstr "sätt uppströmsinformation för ny gren"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1152
msgid "new-branch"
msgstr "ny-gren"
-#: builtin/checkout.c:1149
+#: builtin/checkout.c:1152
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1153
msgid "checkout our version for unmerged files"
msgstr "checka ut vår version för ej sammanslagna filer"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1155
msgid "checkout their version for unmerged files"
msgstr "checka ut deras version för ej sammanslagna filer"
-#: builtin/checkout.c:1154
+#: builtin/checkout.c:1157
msgid "force checkout (throw away local modifications)"
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1158
msgid "perform a 3-way merge with the new branch"
msgstr "utför en 3-vägssammanslagning för den nya grenen"
-#: builtin/checkout.c:1156 builtin/merge.c:235
+#: builtin/checkout.c:1159 builtin/merge.c:235
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251
+#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1161
msgid "conflict style (merge or diff3)"
msgstr "konfliktstil (merge eller diff3)"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1164
msgid "do not limit pathspecs to sparse entries only"
msgstr "begränsa inte sökvägar till endast glesa poster"
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1166
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "förutspå \"git checkout <gren-saknas>\""
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1168
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"kontrollera inte om en annan arbetskatalog håller den angivna referensen"
-#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119
-#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539
-#: builtin/send-pack.c:168
+#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
+#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
-#: builtin/checkout.c:1197
+#: builtin/checkout.c:1203
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
-#: builtin/checkout.c:1214
+#: builtin/checkout.c:1220
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1219
+#: builtin/checkout.c:1225
msgid "Missing branch name; try -b"
msgstr "Grennamn saknas; försök med -b"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1261
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1262
+#: builtin/checkout.c:1268
#, c-format
-msgid ""
-"Cannot update paths and switch to branch '%s' at the same time.\n"
-"Did you intend to checkout '%s' which can not be resolved as commit?"
-msgstr ""
-"Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"
-"Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr "”%s” är inte en incheckning och grenen ”%s” kan inte skapas från den"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1272
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""
-#: builtin/checkout.c:1271
+#: builtin/checkout.c:1276
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6011,39 +6246,39 @@ msgstr ""
"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
"du checkar ut från indexet."
-#: builtin/clean.c:25
+#: builtin/clean.c:26
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <mönster>] [-x | -X] [--] "
"<sökvägar>..."
-#: builtin/clean.c:29
+#: builtin/clean.c:30
#, c-format
msgid "Removing %s\n"
msgstr "Tar bort %s\n"
-#: builtin/clean.c:30
+#: builtin/clean.c:31
#, c-format
msgid "Would remove %s\n"
msgstr "Skulle ta bort %s\n"
-#: builtin/clean.c:31
+#: builtin/clean.c:32
#, c-format
msgid "Skipping repository %s\n"
msgstr "Hoppar över arkivet %s\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Would skip repository %s\n"
msgstr "Skulle hoppa över arkivet %s\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "failed to remove %s"
msgstr "misslyckades ta bort %s"
-#: builtin/clean.c:291 git-add--interactive.perl:623
+#: builtin/clean.c:298 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
@@ -6056,7 +6291,7 @@ msgstr ""
"foo - markera post baserad på unikt prefix\n"
" - (tomt) markera ingenting\n"
-#: builtin/clean.c:295 git-add--interactive.perl:632
+#: builtin/clean.c:302 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
@@ -6077,38 +6312,38 @@ msgstr ""
"* - välj alla poster\n"
" - (tomt) avsluta markering\n"
-#: builtin/clean.c:511 git-add--interactive.perl:598
-#: git-add--interactive.perl:603
+#: builtin/clean.c:518 git-add--interactive.perl:547
+#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Vadå (%s)?\n"
-#: builtin/clean.c:653
+#: builtin/clean.c:660
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ange ignoreringsmönster>>"
-#: builtin/clean.c:690
+#: builtin/clean.c:697
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "VARNING: Hittar inte poster som motsvarar: %s"
-#: builtin/clean.c:711
+#: builtin/clean.c:718
msgid "Select items to delete"
msgstr "Välj poster att ta bort"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:752
+#: builtin/clean.c:759
#, c-format
msgid "Remove %s [y/N]? "
-msgstr "Ta bort %s [Y=ja / N=nej]?"
+msgstr "Ta bort %s [Y=ja / N=nej]? "
-#: builtin/clean.c:777 git-add--interactive.perl:1669
+#: builtin/clean.c:784 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
msgstr "Hej då.\n"
-#: builtin/clean.c:785
+#: builtin/clean.c:792
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6126,62 +6361,63 @@ msgstr ""
"help - denna skärm\n"
"? - hjälp för kommandoval"
-#: builtin/clean.c:812 git-add--interactive.perl:1745
+#: builtin/clean.c:819 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
-#: builtin/clean.c:813 git-add--interactive.perl:1742
+#: builtin/clean.c:820 git-add--interactive.perl:1689
msgid "What now"
msgstr "Vad nu"
-#: builtin/clean.c:821
+#: builtin/clean.c:828
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Skulle ta bort följande post:"
msgstr[1] "Skulle ta bort följande poster:"
-#: builtin/clean.c:838
+#: builtin/clean.c:844
msgid "No more files to clean, exiting."
msgstr "Inga fler filer att städa, avslutar."
-#: builtin/clean.c:869
+#: builtin/clean.c:906
msgid "do not print names of files removed"
msgstr "skriv inte ut namn på borttagna filer"
-#: builtin/clean.c:871
+#: builtin/clean.c:908
msgid "force"
msgstr "tvinga"
-#: builtin/clean.c:872
+#: builtin/clean.c:909
msgid "interactive cleaning"
msgstr "städa interaktivt"
-#: builtin/clean.c:874
+#: builtin/clean.c:911
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
-#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056
-#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176
+#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
+#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: builtin/name-rev.c:399 builtin/show-ref.c:176
msgid "pattern"
msgstr "mönster"
-#: builtin/clean.c:876
+#: builtin/clean.c:913
msgid "add <pattern> to ignore rules"
msgstr "lägg till <mönster> till ignoreringsregler"
-#: builtin/clean.c:877
+#: builtin/clean.c:914
msgid "remove ignored files, too"
msgstr "ta även bort ignorerade filer"
-#: builtin/clean.c:879
+#: builtin/clean.c:916
msgid "remove only ignored files"
msgstr "ta endast bort ignorerade filer"
-#: builtin/clean.c:897
+#: builtin/clean.c:934
msgid "-x and -X cannot be used together"
msgstr "-x och -X kan inte användas samtidigt"
-#: builtin/clean.c:901
+#: builtin/clean.c:938
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -6189,7 +6425,7 @@ msgstr ""
"clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
"städa"
-#: builtin/clean.c:904
+#: builtin/clean.c:941
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -6197,134 +6433,142 @@ msgstr ""
"clean.requireForce har standardvärdet true och varken -i, -n eller -f "
"angavs; vägrar städa"
-#: builtin/clone.c:37
+#: builtin/clone.c:38
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
-#: builtin/clone.c:65
+#: builtin/clone.c:82
msgid "don't create a checkout"
msgstr "skapa inte någon utcheckning"
-#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
+#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "skapa ett naket (\"bare\") arkiv"
-#: builtin/clone.c:70
+#: builtin/clone.c:87
msgid "create a mirror repository (implies bare)"
msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
-#: builtin/clone.c:72
+#: builtin/clone.c:89
msgid "to clone from a local repository"
msgstr "för att klona från ett lokalt arkiv"
-#: builtin/clone.c:74
+#: builtin/clone.c:91
msgid "don't use local hardlinks, always copy"
msgstr "skapa inte lokala hårda länkar, kopiera alltid"
-#: builtin/clone.c:76
+#: builtin/clone.c:93
msgid "setup as shared repository"
msgstr "skapa som ett delat arkiv"
-#: builtin/clone.c:78 builtin/clone.c:80
+#: builtin/clone.c:95 builtin/clone.c:99
+msgid "pathspec"
+msgstr "sökvägsangivelse"
+
+#: builtin/clone.c:95 builtin/clone.c:99
msgid "initialize submodules in the clone"
msgstr "initiera undermoduler i klonen"
-#: builtin/clone.c:82
+#: builtin/clone.c:102
msgid "number of submodules cloned in parallel"
msgstr "antal undermoduler som klonas parallellt"
-#: builtin/clone.c:83 builtin/init-db.c:475
+#: builtin/clone.c:103 builtin/init-db.c:476
msgid "template-directory"
msgstr "mallkatalog"
-#: builtin/clone.c:84 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
-#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604
-#: builtin/submodule--helper.c:970
+#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
+#: builtin/submodule--helper.c:983
msgid "reference repository"
msgstr "referensarkiv"
-#: builtin/clone.c:90
+#: builtin/clone.c:110
msgid "use --reference only while cloning"
msgstr "använd --reference endast under kloningen"
-#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "namn"
-#: builtin/clone.c:92
+#: builtin/clone.c:112
msgid "use <name> instead of 'origin' to track upstream"
msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"
-#: builtin/clone.c:94
+#: builtin/clone.c:114
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checka ut <gren> istället för fjärrens HEAD"
-#: builtin/clone.c:96
+#: builtin/clone.c:116
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999
-#: builtin/pull.c:202
+#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/pull.c:205
msgid "depth"
msgstr "djup"
-#: builtin/clone.c:98
+#: builtin/clone.c:118
msgid "create a shallow clone of that depth"
msgstr "skapa en grund klon på detta djup"
-#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836
+#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
#: parse-options.h:142
msgid "time"
msgstr "tid"
-#: builtin/clone.c:100
+#: builtin/clone.c:120
msgid "create a shallow clone since a specific time"
msgstr "skapa en grund klon från en angiven tidpunkt"
-#: builtin/clone.c:101 builtin/fetch.c:124
+#: builtin/clone.c:121 builtin/fetch.c:119
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:102 builtin/fetch.c:125
+#: builtin/clone.c:122 builtin/fetch.c:120
msgid "deepen history of shallow clone, excluding rev"
msgstr "fördjupa historik för grund klon, exkludera revisionen"
-#: builtin/clone.c:104
+#: builtin/clone.c:124
msgid "clone only one branch, HEAD or --branch"
msgstr "klona endast en gren, HEAD eller --branch"
-#: builtin/clone.c:106
+#: builtin/clone.c:126
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr "klona inga taggar och gör att senare hämtningar inte följer dem"
+
+#: builtin/clone.c:128
msgid "any cloned submodules will be shallow"
msgstr "klonade undermoduler kommer vara grunda"
-#: builtin/clone.c:107 builtin/init-db.c:484
+#: builtin/clone.c:129 builtin/init-db.c:485
msgid "gitdir"
msgstr "gitkat"
-#: builtin/clone.c:108 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr "separera gitkatalogen från arbetskatalogen"
-#: builtin/clone.c:109
+#: builtin/clone.c:131
msgid "key=value"
msgstr "nyckel=värde"
-#: builtin/clone.c:110
+#: builtin/clone.c:132
msgid "set config inside the new repository"
msgstr "ställ in konfiguration i det nya arkivet"
-#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550
+#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
msgid "use IPv4 addresses only"
msgstr "använd endast IPv4-adresser"
-#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552
+#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
msgid "use IPv6 addresses only"
msgstr "använd endast IPv6-adresser"
-#: builtin/clone.c:250
+#: builtin/clone.c:272
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6332,42 +6576,42 @@ msgstr ""
"Kunde inte gissa katalognamn.\n"
"Ange en katalog på kommandoraden"
-#: builtin/clone.c:303
+#: builtin/clone.c:325
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n"
-#: builtin/clone.c:375
+#: builtin/clone.c:397
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
-#: builtin/clone.c:383
+#: builtin/clone.c:405
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s finns och är ingen katalog"
-#: builtin/clone.c:397
+#: builtin/clone.c:419
#, c-format
msgid "failed to stat %s\n"
msgstr "misslyckades ta status på %s\n"
-#: builtin/clone.c:419
+#: builtin/clone.c:441
#, c-format
msgid "failed to create link '%s'"
msgstr "misslyckades skapa länken \"%s\""
-#: builtin/clone.c:423
+#: builtin/clone.c:445
#, c-format
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:448
+#: builtin/clone.c:470
#, c-format
msgid "done.\n"
msgstr "klart.\n"
-#: builtin/clone.c:460
+#: builtin/clone.c:482
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6377,183 +6621,182 @@ msgstr ""
"Du kan inspektera det som checkades ut med \"git status\"\n"
"och försöka checka ut igen med \"git checkout -f HEAD\"\n"
-#: builtin/clone.c:537
+#: builtin/clone.c:559
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
-#: builtin/clone.c:632
+#: builtin/clone.c:654
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
-#: builtin/clone.c:648
+#: builtin/clone.c:670
#, c-format
msgid "unable to update %s"
msgstr "kan inte uppdatera %s"
-#: builtin/clone.c:697
+#: builtin/clone.c:719
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:728
+#: builtin/clone.c:750
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:768
+#: builtin/clone.c:792
msgid "unable to write parameters to config file"
msgstr "kunde inte skriva parametrar till konfigurationsfilen"
-#: builtin/clone.c:831
+#: builtin/clone.c:855
msgid "cannot repack to clean up"
msgstr "kan inte packa om för att städa upp"
-#: builtin/clone.c:833
+#: builtin/clone.c:857
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
-#: builtin/clone.c:866 builtin/receive-pack.c:1895
+#: builtin/clone.c:890 builtin/receive-pack.c:1945
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:870
+#: builtin/clone.c:894
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:883
+#: builtin/clone.c:907
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "flaggorna --bare och --origin %s är inkompatibla."
-#: builtin/clone.c:886
+#: builtin/clone.c:910
msgid "--bare and --separate-git-dir are incompatible."
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-#: builtin/clone.c:899
+#: builtin/clone.c:923
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:905 builtin/fetch.c:1335
+#: builtin/clone.c:929 builtin/fetch.c:1337
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
-#: builtin/clone.c:915
+#: builtin/clone.c:939
#, 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:925
+#: builtin/clone.c:949
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252
-#: builtin/submodule--helper.c:659 builtin/worktree.c:222
-#: builtin/worktree.c:249
+#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
+#: builtin/worktree.c:222 builtin/worktree.c:252
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/clone.c:943
+#: builtin/clone.c:967
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:955
+#: builtin/clone.c:979
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:957
+#: builtin/clone.c:981
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:963
+#: builtin/clone.c:1005
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
"clone --recursive är inte kompatibel med --reference och --reference-if-able"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1067
msgid "--depth is ignored in local clones; use file:// instead."
-msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"
+msgstr "--depth ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1021
+#: builtin/clone.c:1069
msgid "--shallow-since is ignored in local clones; use file:// instead."
-msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället"
+msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1023
+#: builtin/clone.c:1071
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-"--shallow-exclude ignoreras i lokala kloningar; använd file:// istället"
+"--shallow-exclude ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1026
+#: builtin/clone.c:1074
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
-#: builtin/clone.c:1031
+#: builtin/clone.c:1079
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:1035
+#: builtin/clone.c:1083
#, c-format
msgid "Don't know how to clone %s"
msgstr "Vet inte hur man klonar %s"
-#: builtin/clone.c:1090 builtin/clone.c:1098
+#: builtin/clone.c:1138 builtin/clone.c:1146
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:1101
+#: builtin/clone.c:1149
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
-#: builtin/column.c:9
+#: builtin/column.c:10
msgid "git column [<options>]"
msgstr "git column [<flaggor>]"
-#: builtin/column.c:26
+#: builtin/column.c:27
msgid "lookup config vars"
msgstr "slå upp konfigurationsvariabler"
-#: builtin/column.c:27 builtin/column.c:28
+#: builtin/column.c:28 builtin/column.c:29
msgid "layout to use"
msgstr "utseende att använda"
-#: builtin/column.c:29
+#: builtin/column.c:30
msgid "Maximum width"
msgstr "Maximal bredd"
-#: builtin/column.c:30
+#: builtin/column.c:31
msgid "Padding space on left border"
msgstr "Spaltfyllnad i vänsterkanten"
-#: builtin/column.c:31
+#: builtin/column.c:32
msgid "Padding space on right border"
msgstr "Spaltfyllnad i högerkanten"
-#: builtin/column.c:32
+#: builtin/column.c:33
msgid "Padding space between columns"
msgstr "Spaltfyllnad mellan spalter"
-#: builtin/column.c:51
+#: builtin/column.c:52
msgid "--command must be the first argument"
msgstr "--command måste vara första argument"
-#: builtin/commit.c:38
+#: builtin/commit.c:39
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<flaggor>] [--] <sökväg>..."
-#: builtin/commit.c:43
+#: builtin/commit.c:44
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<flaggor>] [--] <sökväg>..."
-#: builtin/commit.c:48
+#: builtin/commit.c:49
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6580,7 +6823,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:61
+#: builtin/commit.c:62
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6605,7 +6848,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: builtin/commit.c:73
+#: builtin/commit.c:74
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"
@@ -6615,7 +6858,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:78
+#: builtin/commit.c:79
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
@@ -6629,11 +6872,11 @@ msgstr ""
" git commit --allow-empty\n"
"\n"
-#: builtin/commit.c:85
+#: builtin/commit.c:86
msgid "Otherwise, please use 'git reset'\n"
msgstr "Använd annars \"git reset\"\n"
-#: builtin/commit.c:88
+#: builtin/commit.c:89
msgid ""
"If you wish to skip this commit, use:\n"
"\n"
@@ -6649,66 +6892,61 @@ msgstr ""
"\"git cherry-pick --continue\" kommer därefter att återuppta\n"
"cherry-pick för återstående incheckningar.\n"
-#: builtin/commit.c:318
+#: builtin/commit.c:319
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
-#: builtin/commit.c:359
+#: builtin/commit.c:360
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
-#: builtin/commit.c:365
+#: builtin/commit.c:366
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
-#: builtin/commit.c:378
+#: builtin/commit.c:379
msgid "unable to update temporary index"
msgstr "kan inte uppdatera temporärt index"
-#: builtin/commit.c:380
+#: builtin/commit.c:381
msgid "Failed to update main cache tree"
msgstr "Misslyckades uppdatera huvud-cacheträdet"
-#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
+#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
msgid "unable to write new_index file"
msgstr "kunde inte skriva filen new_index"
-#: builtin/commit.c:458
+#: builtin/commit.c:459
msgid "cannot do a partial commit during a merge."
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
-#: builtin/commit.c:460
+#: builtin/commit.c:461
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:469
+#: builtin/commit.c:470
msgid "cannot read the index"
msgstr "kan inte läsa indexet"
-#: builtin/commit.c:488
+#: builtin/commit.c:489
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:582
+#: builtin/commit.c:583
#, c-format
msgid "commit '%s' lacks author header"
msgstr "incheckningen \"%s\" saknar författarhuvud"
-#: builtin/commit.c:584
+#: builtin/commit.c:585
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
-#: builtin/commit.c:603
+#: builtin/commit.c:604
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:611
-#, c-format
-msgid "invalid date format: %s"
-msgstr "felaktigt datumformat: %s"
-
-#: builtin/commit.c:655
+#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -6716,38 +6954,38 @@ msgstr ""
"kunde inte välja ett kommentarstecken som inte använts\n"
"i det befintliga incheckningsmeddelandet"
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
+#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
-#: builtin/commit.c:704 builtin/shortlog.c:295
+#: builtin/commit.c:705 builtin/shortlog.c:295
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:706
+#: builtin/commit.c:707
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
-#: builtin/commit.c:710
+#: builtin/commit.c:711
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
-#: builtin/commit.c:737 builtin/commit.c:745
+#: builtin/commit.c:738 builtin/commit.c:746
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:742
+#: builtin/commit.c:743
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
-#: builtin/commit.c:796
+#: builtin/commit.c:797
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
-#: builtin/commit.c:814
+#: builtin/commit.c:815
#, c-format
msgid ""
"\n"
@@ -6762,7 +7000,7 @@ msgstr ""
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:819
+#: builtin/commit.c:820
#, c-format
msgid ""
"\n"
@@ -6777,7 +7015,7 @@ msgstr ""
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:832
+#: builtin/commit.c:833
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -6787,7 +7025,7 @@ msgstr ""
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
-#: builtin/commit.c:839
+#: builtin/commit.c:840
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -6798,146 +7036,146 @@ msgstr ""
"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
"Ett tomt meddelande avbryter incheckningen.\n"
-#: builtin/commit.c:859
+#: builtin/commit.c:857
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
-#: builtin/commit.c:867
+#: builtin/commit.c:865
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:874
+#: builtin/commit.c:872
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
-#: builtin/commit.c:892
+#: builtin/commit.c:889
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:954
+#: builtin/commit.c:951
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:968 builtin/tag.c:280
+#: builtin/commit.c:965 builtin/tag.c:274
#, 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:1071
+#: builtin/commit.c:1068
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"
-#: builtin/commit.c:1086 builtin/commit.c:1325
+#: builtin/commit.c:1083 builtin/commit.c:1328
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:1124
+#: builtin/commit.c:1121
msgid "--long and -z are incompatible"
msgstr "--long och -z är inkompatibla"
-#: builtin/commit.c:1154
+#: builtin/commit.c:1151
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:1163
+#: builtin/commit.c:1160
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1166
+#: builtin/commit.c:1163
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:1168
+#: builtin/commit.c:1165
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:1171
+#: builtin/commit.c:1168
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
-#: builtin/commit.c:1181
+#: builtin/commit.c:1178
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:1183
+#: builtin/commit.c:1180
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:1191
+#: builtin/commit.c:1188
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:1208
+#: builtin/commit.c:1205
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:1210
+#: builtin/commit.c:1207
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:1212
-msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
-
-#: builtin/commit.c:1224 builtin/tag.c:495
+#: builtin/commit.c:1219 builtin/tag.c:552
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
-#: builtin/commit.c:1229
+#: builtin/commit.c:1224
msgid "Paths with -a does not make sense."
msgstr "Kan inte ange sökvägar med -a."
-#: builtin/commit.c:1339 builtin/commit.c:1612
+#: builtin/commit.c:1342 builtin/commit.c:1617
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1341 builtin/commit.c:1614
+#: builtin/commit.c:1344 builtin/commit.c:1619
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1346
+msgid "show stash information"
+msgstr "visa information om stash"
+
+#: builtin/commit.c:1348
msgid "version"
msgstr "version"
-#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:442
+#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
+#: builtin/worktree.c:449
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1346 builtin/commit.c:1618
+#: builtin/commit.c:1351 builtin/commit.c:1623
msgid "show status in long format (default)"
msgstr "visa status i långt format (standard)"
-#: builtin/commit.c:1349 builtin/commit.c:1621
+#: builtin/commit.c:1354 builtin/commit.c:1626
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:368
+#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
+#: builtin/fast-export.c:986 builtin/tag.c:412
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1352 builtin/commit.c:1624
+#: builtin/commit.c:1357 builtin/commit.c:1629
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:1355
+#: builtin/commit.c:1360
msgid "show ignored files"
msgstr "visa ignorerade filer"
-#: builtin/commit.c:1356 parse-options.h:155
+#: builtin/commit.c:1361 parse-options.h:155
msgid "when"
msgstr "när"
-#: builtin/commit.c:1357
+#: builtin/commit.c:1362
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -6945,201 +7183,201 @@ msgstr ""
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1359
+#: builtin/commit.c:1364
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1435
+#: builtin/commit.c:1440
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: builtin/commit.c:1437
+#: builtin/commit.c:1442
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: builtin/commit.c:1482
+#: builtin/commit.c:1487
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: builtin/commit.c:1485
+#: builtin/commit.c:1490
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: builtin/commit.c:1582
+#: builtin/commit.c:1587
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1588
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1585
+#: builtin/commit.c:1590
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1586 builtin/tag.c:366
+#: builtin/commit.c:1591 builtin/tag.c:410
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1592
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1592
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1588 builtin/gc.c:333
+#: builtin/commit.c:1593 builtin/gc.c:358
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1593
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
-#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:364
+#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
+#: builtin/notes.c:564 builtin/tag.c:408
msgid "message"
msgstr "meddelande"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1594
msgid "commit message"
msgstr "incheckningsmeddelande"
-#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
-#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
msgid "commit"
msgstr "incheckning"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1595
msgid "reuse and edit message from specified commit"
msgstr "återanvänd och redigera meddelande från angiven incheckning"
-#: builtin/commit.c:1591
+#: builtin/commit.c:1596
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1597
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att fixa angiven incheckning"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1598
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att slå ihop med angiven "
"incheckning"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1599
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:1595 builtin/log.c:1413 builtin/revert.c:86
+#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1601
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1602
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1603
msgid "default"
msgstr "standard"
-#: builtin/commit.c:1598 builtin/tag.c:369
+#: builtin/commit.c:1603 builtin/tag.c:413
msgid "how to strip spaces and #comments from message"
msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1604
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166
-#: builtin/revert.c:93
+#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1609
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1605
+#: builtin/commit.c:1610
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1611
msgid "add specified files to index for commit"
msgstr "lägg till angivna filer till indexet för incheckning"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1612
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1608
+#: builtin/commit.c:1613
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1614
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1615
msgid "bypass pre-commit and commit-msg hooks"
msgstr "förbigå pre-commit- och commit-msg-krokar"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1616
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1627
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1623
+#: builtin/commit.c:1628
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1633
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1630
+#: builtin/commit.c:1635
msgid "ok to record a change with an empty message"
msgstr "ok att registrera en ändring med tomt meddelande"
-#: builtin/commit.c:1659
+#: builtin/commit.c:1665
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
-#: builtin/commit.c:1707
+#: builtin/commit.c:1710
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1714
+#: builtin/commit.c:1717
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1733
+#: builtin/commit.c:1736
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1744
+#: builtin/commit.c:1747
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
-#: builtin/commit.c:1749
+#: builtin/commit.c:1752
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
-#: builtin/commit.c:1797
+#: builtin/commit.c:1800
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -7150,135 +7388,135 @@ msgstr ""
"att kvoten inte har överskridits, och kör sedan\n"
"\"git reset HEAD\" för att återställa."
-#: builtin/config.c:9
+#: builtin/config.c:10
msgid "git config [<options>]"
msgstr "git config [<flaggor>]"
-#: builtin/config.c:55
+#: builtin/config.c:57
msgid "Config file location"
msgstr "Konfigurationsfilens plats"
-#: builtin/config.c:56
+#: builtin/config.c:58
msgid "use global config file"
msgstr "använd global konfigurationsfil"
-#: builtin/config.c:57
+#: builtin/config.c:59
msgid "use system config file"
msgstr "använd systemets konfigurationsfil"
-#: builtin/config.c:58
+#: builtin/config.c:60
msgid "use repository config file"
msgstr "använd arkivets konfigurationsfil"
-#: builtin/config.c:59
+#: builtin/config.c:61
msgid "use given config file"
msgstr "använd angiven konfigurationsfil"
-#: builtin/config.c:60
+#: builtin/config.c:62
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:60
+#: builtin/config.c:62
msgid "read config from given blob object"
msgstr "läs konfiguration från givet blob-objekt"
-#: builtin/config.c:61
+#: builtin/config.c:63
msgid "Action"
msgstr "Åtgärd"
-#: builtin/config.c:62
+#: builtin/config.c:64
msgid "get value: name [value-regex]"
msgstr "hämta värde: namn [värde-reguttr]"
-#: builtin/config.c:63
+#: builtin/config.c:65
msgid "get all values: key [value-regex]"
msgstr "hämta alla värden: nyckel [värde-reguttr]"
-#: builtin/config.c:64
+#: builtin/config.c:66
msgid "get values for regexp: name-regex [value-regex]"
msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"
-#: builtin/config.c:65
+#: builtin/config.c:67
msgid "get value specific for the URL: section[.var] URL"
msgstr "hämta värde specifikt URL:en: sektion[.var] URL"
-#: builtin/config.c:66
+#: builtin/config.c:68
msgid "replace all matching variables: name value [value_regex]"
msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"
-#: builtin/config.c:67
+#: builtin/config.c:69
msgid "add a new variable: name value"
msgstr "lägg till en ny variabel: namn värde"
-#: builtin/config.c:68
+#: builtin/config.c:70
msgid "remove a variable: name [value-regex]"
msgstr "ta bort en variabel: namn [värde-reguttr]"
-#: builtin/config.c:69
+#: builtin/config.c:71
msgid "remove all matches: name [value-regex]"
msgstr "ta bort alla träffar: namn [värde-reguttr]"
-#: builtin/config.c:70
+#: builtin/config.c:72
msgid "rename section: old-name new-name"
msgstr "byt namn på sektion: gammalt-namn nytt-namn"
-#: builtin/config.c:71
+#: builtin/config.c:73
msgid "remove a section: name"
msgstr "ta bort en sektion: namn"
-#: builtin/config.c:72
+#: builtin/config.c:74
msgid "list all"
msgstr "visa alla"
-#: builtin/config.c:73
+#: builtin/config.c:75
msgid "open an editor"
msgstr "öppna textredigeringsprogram"
-#: builtin/config.c:74
+#: builtin/config.c:76
msgid "find the color configured: slot [default]"
msgstr "hitta den inställda färgen: slot [default]"
-#: builtin/config.c:75
+#: builtin/config.c:77
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "hitta färginställningen: slot [stdout-is-tty]"
-#: builtin/config.c:76
+#: builtin/config.c:78
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:77
+#: builtin/config.c:79
msgid "value is \"true\" or \"false\""
msgstr "värdet är \"true\" eller \"false\""
-#: builtin/config.c:78
+#: builtin/config.c:80
msgid "value is decimal number"
msgstr "värdet är ett decimalt tal"
-#: builtin/config.c:79
+#: builtin/config.c:81
msgid "value is --bool or --int"
msgstr "värdet är --bool eller --int"
-#: builtin/config.c:80
+#: builtin/config.c:82
msgid "value is a path (file or directory name)"
msgstr "värdet är en sökväg (fil- eller katalognamn)"
-#: builtin/config.c:81
+#: builtin/config.c:83
msgid "Other"
msgstr "Andra"
-#: builtin/config.c:82
+#: builtin/config.c:84
msgid "terminate values with NUL byte"
msgstr "terminera värden med NUL-byte"
-#: builtin/config.c:83
+#: builtin/config.c:85
msgid "show variable names only"
msgstr "visa endast variabelnamn"
-#: builtin/config.c:84
+#: builtin/config.c:86
msgid "respect include directives on lookup"
msgstr "respektera inkluderingsdirektiv vid uppslag"
-#: builtin/config.c:85
+#: builtin/config.c:87
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"
@@ -7301,12 +7539,16 @@ msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:613
+#: builtin/config.c:499
+msgid "--local can only be used inside a git repository"
+msgstr "--local kan bara användas inuti ett git-arkiv"
+
+#: builtin/config.c:621
#, c-format
msgid "cannot create configuration file %s"
msgstr "kan inte skapa konfigurationsfilen \"%s\""
-#: builtin/config.c:625
+#: builtin/config.c:633
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7315,63 +7557,75 @@ msgstr ""
"kan inte skriva över flera värden med ett ensamt värde\n"
" Använd en regexp, --add eller --replace-all för att ändra %s."
-#: builtin/count-objects.c:86
+#: builtin/count-objects.c:87
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:96
+#: builtin/count-objects.c:97
msgid "print sizes in human readable format"
msgstr "skriv storlekar i människoläsbart format"
-#: builtin/describe.c:17
+#: builtin/describe.c:19
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<flaggor>] [<incheckning-igt>...]"
-#: builtin/describe.c:18
+#: builtin/describe.c:20
msgid "git describe [<options>] --dirty"
msgstr "git describe [<flaggor>] --dirty"
-#: builtin/describe.c:217
+#: builtin/describe.c:54
+msgid "head"
+msgstr "huvud"
+
+#: builtin/describe.c:54
+msgid "lightweight"
+msgstr "lättviktig"
+
+#: builtin/describe.c:54
+msgid "annotated"
+msgstr "annoterad"
+
+#: builtin/describe.c:253
#, c-format
msgid "annotated tag %s not available"
msgstr "den annoterade taggen %s inte tillgänglig"
-#: builtin/describe.c:221
+#: builtin/describe.c:257
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "den annoterade taggen %s har inget inbäddat namn"
-#: builtin/describe.c:223
+#: builtin/describe.c:259
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "taggen \"%s\" är i verkligheten \"%s\" här"
-#: builtin/describe.c:250 builtin/log.c:480
+#: builtin/describe.c:286 builtin/log.c:489
#, c-format
msgid "Not a valid object name %s"
msgstr "Objektnamnet är inte giltigt: %s"
-#: builtin/describe.c:253
+#: builtin/describe.c:289
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s är inte ett giltigt \"%s\"-objekt"
-#: builtin/describe.c:270
+#: builtin/describe.c:306
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "ingen tagg motsvarar \"%s\" exakt"
-#: builtin/describe.c:272
+#: builtin/describe.c:308
#, c-format
msgid "searching to describe %s\n"
msgstr "söker för att beskriva %s\n"
-#: builtin/describe.c:319
+#: builtin/describe.c:355
#, c-format
msgid "finished search at %s\n"
msgstr "avslutade sökning på %s\n"
-#: builtin/describe.c:346
+#: builtin/describe.c:382
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7380,7 +7634,7 @@ msgstr ""
"Inga annoterade taggar kan beskriva \"%s\".\n"
"Det finns dock oannoterade taggar: testa --tags."
-#: builtin/describe.c:350
+#: builtin/describe.c:386
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7389,12 +7643,12 @@ msgstr ""
"Inga taggar kan beskriva \"%s\".\n"
"Testa --always, eller skapa några taggar."
-#: builtin/describe.c:371
+#: builtin/describe.c:416
#, c-format
msgid "traversed %lu commits\n"
msgstr "traverserade %lu incheckningar\n"
-#: builtin/describe.c:374
+#: builtin/describe.c:419
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7403,106 +7657,133 @@ msgstr ""
"mer än %i taggar hittades; listar de %i senaste\n"
"gav upp sökningen vid %s\n"
-#: builtin/describe.c:396
+#: builtin/describe.c:441
msgid "find the tag that comes after the commit"
msgstr "hitta taggen som kommer efter incheckningen"
-#: builtin/describe.c:397
+#: builtin/describe.c:442
msgid "debug search strategy on stderr"
msgstr "felsök sökstrategin på standard fel"
-#: builtin/describe.c:398
+#: builtin/describe.c:443
msgid "use any ref"
msgstr "använd alla referenser"
-#: builtin/describe.c:399
+#: builtin/describe.c:444
msgid "use any tag, even unannotated"
msgstr "använd alla taggar, även oannoterade"
-#: builtin/describe.c:400
+#: builtin/describe.c:445
msgid "always use long format"
msgstr "använd alltid långt format"
-#: builtin/describe.c:401
+#: builtin/describe.c:446
msgid "only follow first parent"
msgstr "följ endast första föräldern"
-#: builtin/describe.c:404
+#: builtin/describe.c:449
msgid "only output exact matches"
msgstr "skriv endast ut exakta träffar"
-#: builtin/describe.c:406
+#: builtin/describe.c:451
msgid "consider <n> most recent tags (default: 10)"
msgstr "överväg de <n> nyaste taggarna (standard: 10)"
-#: builtin/describe.c:408
+#: builtin/describe.c:453
msgid "only consider tags matching <pattern>"
msgstr "överväg endast taggar som motsvarar <mönster>"
-#: builtin/describe.c:410 builtin/name-rev.c:320
+#: builtin/describe.c:455
+msgid "do not consider tags matching <pattern>"
+msgstr "överväg inte taggar som motsvarar <mönster>"
+
+#: builtin/describe.c:457 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "visa förkortade incheckningsobjekt som standard"
-#: builtin/describe.c:411
+#: builtin/describe.c:458 builtin/describe.c:461
msgid "mark"
msgstr "märke"
-#: builtin/describe.c:412
+#: builtin/describe.c:459
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"
-#: builtin/describe.c:430
+#: builtin/describe.c:462
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")"
+
+#: builtin/describe.c:480
msgid "--long is incompatible with --abbrev=0"
msgstr "--long är inkompatibel med --abbrev=0"
-#: builtin/describe.c:456
+#: builtin/describe.c:509
msgid "No names found, cannot describe anything."
msgstr "Inga namn hittades, kan inte beskriva något."
-#: builtin/describe.c:476
+#: builtin/describe.c:552
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
+#: builtin/describe.c:554
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"
+
#: builtin/diff.c:83
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "\"%s\": inte en normal fil eller symbolisk länk"
-#: builtin/diff.c:234
+#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr "ogiltig flagga: %s"
-#: builtin/diff.c:358
+#: builtin/diff.c:359
msgid "Not a git repository"
msgstr "Inte ett git-arkiv"
-#: builtin/diff.c:401
+#: builtin/diff.c:402
#, c-format
msgid "invalid object '%s' given."
msgstr "objektet \"%s\" som angavs är felaktigt."
-#: builtin/diff.c:410
+#: builtin/diff.c:411
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "mer än två blobbar angavs: \"%s\""
-#: builtin/diff.c:417
+#: builtin/diff.c:416
#, c-format
msgid "unhandled object '%s' given."
msgstr "ej hanterat objekt \"%s\" angavs."
-#: builtin/difftool.c:28
+#: builtin/difftool.c:29
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
"git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]"
-#: builtin/difftool.c:241
+#: builtin/difftool.c:249
#, c-format
msgid "failed: %d"
msgstr "misslyckades: %d"
-#: builtin/difftool.c:342
+#: builtin/difftool.c:291
+#, c-format
+msgid "could not read symlink %s"
+msgstr "kunde inte läsa symboliska länken %s"
+
+#: builtin/difftool.c:293
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "kunde inte läsa symbolisk länk-fil %s"
+
+#: builtin/difftool.c:301
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "kunde inte läsa objektet %s för symboliska länken %s"
+
+#: builtin/difftool.c:403
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -7510,53 +7791,53 @@ msgstr ""
"kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n"
"katalogdiffläge (\"-d\" och \"--dir-diff\")."
-#: builtin/difftool.c:567
+#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "bägge filerna ändrade: \"%s\" och \"%s\"."
-#: builtin/difftool.c:569
+#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "filen i arbetskatalogen lämnades kvar."
-#: builtin/difftool.c:580
+#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "temporära filer finns i \"%s\"."
-#: builtin/difftool.c:581
+#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "du kanske vill städa eller rädda dem."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:689
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "använd \"diff.guitool\" istället för \"diff.tool\""
-#: builtin/difftool.c:628
+#: builtin/difftool.c:691
msgid "perform a full-directory diff"
msgstr "utför diff för hela katalogen"
-#: builtin/difftool.c:630
+#: builtin/difftool.c:693
msgid "do not prompt before launching a diff tool"
msgstr "fråga inte vid start av diff-verktyg"
-#: builtin/difftool.c:636
+#: builtin/difftool.c:699
msgid "use symlinks in dir-diff mode"
msgstr "använd symboliska länkar i katalogdiffläge"
-#: builtin/difftool.c:637
+#: builtin/difftool.c:700
msgid "<tool>"
msgstr "<verktyg>"
-#: builtin/difftool.c:638
+#: builtin/difftool.c:701
msgid "use the specified diff tool"
msgstr "använd angivet diff-verktyg"
-#: builtin/difftool.c:640
+#: builtin/difftool.c:703
msgid "print a list of diff tools that may be used with `--tool`"
-msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\""
+msgstr "visa en lista över diff-verktyg som kan användas med ”--tool”"
-#: builtin/difftool.c:643
+#: builtin/difftool.c:706
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -7564,249 +7845,253 @@ msgstr ""
"låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde "
"skilt från noll"
-#: builtin/difftool.c:645
+#: builtin/difftool.c:708
msgid "<command>"
msgstr "<kommando>"
-#: builtin/difftool.c:646
+#: builtin/difftool.c:709
msgid "specify a custom command for viewing diffs"
msgstr "ange eget kommando för att visa diffar"
-#: builtin/difftool.c:670
+#: builtin/difftool.c:733
msgid "no <tool> given for --tool=<tool>"
msgstr "inget <verktyg> angavs för --tool=<verktyg>"
-#: builtin/difftool.c:677
+#: builtin/difftool.c:740
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "inget <kommando> angavs för --extcmd=<kommando>"
-#: builtin/fast-export.c:25
+#: builtin/fast-export.c:26
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-flaggor]"
-#: builtin/fast-export.c:980
+#: builtin/fast-export.c:982
msgid "show progress after <n> objects"
msgstr "visa förlopp efter <n> objekt"
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:984
msgid "select handling of signed tags"
msgstr "välj hantering av signerade taggar"
-#: builtin/fast-export.c:985
+#: builtin/fast-export.c:987
msgid "select handling of tags that tag filtered objects"
msgstr "välj hantering av taggar som har taggfiltrerade objekt"
-#: builtin/fast-export.c:988
+#: builtin/fast-export.c:990
msgid "Dump marks to this file"
msgstr "Dump märken till filen"
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:992
msgid "Import marks from this file"
msgstr "Importera märken från filen"
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:994
msgid "Fake a tagger when tags lack one"
msgstr "Fejka taggare när taggen saknar en"
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:996
msgid "Output full tree for each commit"
msgstr "Skriv ut hela trädet för varje incheckning"
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:998
msgid "Use the done feature to terminate the stream"
msgstr "Använd done-funktionen för att avsluta strömmen"
-#: builtin/fast-export.c:997
+#: builtin/fast-export.c:999
msgid "Skip output of blob data"
msgstr "Hoppa över skrivning av blob-data"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1000
msgid "refspec"
msgstr "referensspecifikation"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1001
msgid "Apply refspec to exported refs"
msgstr "Applicera referensspecifikation på exporterade referenser"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1002
msgid "anonymize output"
msgstr "anonymisera utdata"
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<flaggor>] <grupp>"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<flaggor>]"
-#: builtin/fetch.c:95 builtin/pull.c:175
+#: builtin/fetch.c:90 builtin/pull.c:182
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
-#: builtin/fetch.c:97 builtin/pull.c:178
+#: builtin/fetch.c:92 builtin/pull.c:185
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"
-#: builtin/fetch.c:99 builtin/pull.c:181
+#: builtin/fetch.c:94 builtin/pull.c:188
msgid "path to upload pack on remote end"
msgstr "sökväg till upload pack på fjärren"
-#: builtin/fetch.c:100 builtin/pull.c:183
+#: builtin/fetch.c:95 builtin/pull.c:190
msgid "force overwrite of local branch"
msgstr "tvinga överskrivning av lokal gren"
-#: builtin/fetch.c:102
+#: builtin/fetch.c:97
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:104 builtin/pull.c:185
+#: builtin/fetch.c:99 builtin/pull.c:192
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
-#: builtin/fetch.c:106
+#: builtin/fetch.c:101
msgid "do not fetch all tags (--no-tags)"
msgstr "hämta inte alla taggar (--no-tags)"
-#: builtin/fetch.c:108
+#: builtin/fetch.c:103
msgid "number of submodules fetched in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/fetch.c:110 builtin/pull.c:188
+#: builtin/fetch.c:105 builtin/pull.c:195
msgid "prune remote-tracking branches no longer on remote"
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
-#: builtin/fetch.c:111 builtin/pull.c:191
+#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:112 builtin/pull.c:192
+#: builtin/fetch.c:107
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
-#: builtin/fetch.c:116 builtin/pull.c:200
+#: builtin/fetch.c:111 builtin/pull.c:203
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:113
msgid "allow updating of HEAD ref"
msgstr "tillåt uppdatering av HEAD-referens"
-#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
+#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
msgid "deepen history of shallow clone"
msgstr "fördjupa historik för grund klon"
-#: builtin/fetch.c:123
+#: builtin/fetch.c:118
msgid "deepen history of shallow repository based on time"
msgstr "fördjupa historik för grund klon baserad på tid"
-#: builtin/fetch.c:129 builtin/pull.c:206
+#: builtin/fetch.c:124 builtin/pull.c:209
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:131 builtin/log.c:1433
+#: builtin/fetch.c:126 builtin/log.c:1450
msgid "dir"
msgstr "kat"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:127
msgid "prepend this to submodule path output"
msgstr "lägg till i början av undermodulens sökvägsutdata"
-#: builtin/fetch.c:135
-msgid "default mode for recursion"
-msgstr "standardläge för rekursion"
+#: builtin/fetch.c:130
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+"standard för rekursiv hämtning av undermoduler (lägre prioritet än "
+"konfigurationsfiler)"
-#: builtin/fetch.c:137 builtin/pull.c:209
+#: builtin/fetch.c:134 builtin/pull.c:212
msgid "accept refs that update .git/shallow"
msgstr "tar emot referenser som uppdaterar .git/shallow"
-#: builtin/fetch.c:138 builtin/pull.c:211
+#: builtin/fetch.c:135 builtin/pull.c:214
msgid "refmap"
msgstr "referenskarta"
-#: builtin/fetch.c:139 builtin/pull.c:212
+#: builtin/fetch.c:136 builtin/pull.c:215
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
-#: builtin/fetch.c:395
+#: builtin/fetch.c:394
msgid "Couldn't find remote ref HEAD"
msgstr "Kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:511
+#: builtin/fetch.c:512
#, 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:604
+#: builtin/fetch.c:605
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:608
+#: builtin/fetch.c:609
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:621 builtin/fetch.c:701
+#: builtin/fetch.c:622 builtin/fetch.c:702
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:622
+#: builtin/fetch.c:623
msgid "can't fetch in current branch"
msgstr "kan inte hämta i aktuell gren"
-#: builtin/fetch.c:631
+#: builtin/fetch.c:632
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
-#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681
-#: builtin/fetch.c:696
+#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
+#: builtin/fetch.c:697
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:651
+#: builtin/fetch.c:652
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:654
+#: builtin/fetch.c:655
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:657
+#: builtin/fetch.c:658
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:696
+#: builtin/fetch.c:697
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:701
+#: builtin/fetch.c:702
msgid "non-fast-forward"
msgstr "ej snabbspolad"
-#: builtin/fetch.c:746
+#: builtin/fetch.c:747
#, 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:766
+#: builtin/fetch.c:767
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "avvisa %s då grunda rötter inte kan uppdateras"
-#: builtin/fetch.c:853 builtin/fetch.c:949
+#: builtin/fetch.c:855 builtin/fetch.c:951
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:864
+#: builtin/fetch.c:866
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -7815,55 +8100,55 @@ msgstr ""
"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:919
+#: builtin/fetch.c:921
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:922
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:952
+#: builtin/fetch.c:954
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:953 builtin/remote.c:1020
+#: builtin/fetch.c:955 builtin/remote.c:1023
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:976
+#: builtin/fetch.c:978
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
-#: builtin/fetch.c:995
+#: builtin/fetch.c:997
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
-#: builtin/fetch.c:998
+#: builtin/fetch.c:1000
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1076
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Vet inte hur man hämtar från %s"
-#: builtin/fetch.c:1234
+#: builtin/fetch.c:1236
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:1236 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
-#: builtin/fetch.c:1254
+#: builtin/fetch.c:1256
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -7871,125 +8156,126 @@ msgstr ""
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar skall hämtas från."
-#: builtin/fetch.c:1277
+#: builtin/fetch.c:1279
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
-#: builtin/fetch.c:1319
+#: builtin/fetch.c:1321
msgid "Negative depth in --deepen is not supported"
msgstr "Negativa djup stöds inte i --deepen"
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1323
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen och --depth är ömsesidigt uteslutande"
-#: builtin/fetch.c:1326
+#: builtin/fetch.c:1328
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1330
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:1350
+#: builtin/fetch.c:1349
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:1352
+#: builtin/fetch.c:1351
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:1363
+#: builtin/fetch.c:1362
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:1371
+#: builtin/fetch.c:1370
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
-#: builtin/fmt-merge-msg.c:14
+#: builtin/fmt-merge-msg.c:15
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
"git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]"
-#: builtin/fmt-merge-msg.c:663
+#: builtin/fmt-merge-msg.c:664
msgid "populate log with at most <n> entries from shortlog"
msgstr "fyll i loggen med som mest <n> poster från shortlog"
-#: builtin/fmt-merge-msg.c:666
+#: builtin/fmt-merge-msg.c:667
msgid "alias for --log (deprecated)"
msgstr "alias för --log (avråds)"
-#: builtin/fmt-merge-msg.c:669
+#: builtin/fmt-merge-msg.c:670
msgid "text"
msgstr "text"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
msgid "use <text> as start of message"
msgstr "inled meddelande med <text>"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
msgid "file to read from"
msgstr "fil att läsa från"
-#: builtin/for-each-ref.c:9
+#: builtin/for-each-ref.c:10
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr "git for-each-ref [<flaggor>] [<mönster>]"
-#: builtin/for-each-ref.c:10
+#: builtin/for-each-ref.c:11
msgid "git for-each-ref [--points-at <object>]"
msgstr "git for-each-ref [--points-at <objekt>]"
-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<objekt>]]"
-
#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [--contains [<object>]]"
-msgstr "git for-each-ref [--contains [<objekt>]]"
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --no-merged) [<incheckning>]]"
-#: builtin/for-each-ref.c:27
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr ""
+"git for-each-ref [--contains [<incheckning>]] [--no-contains [<incheckning>]]"
+
+#: builtin/for-each-ref.c:28
msgid "quote placeholders suitably for shells"
msgstr "citera platshållare passande för skal"
-#: builtin/for-each-ref.c:29
+#: builtin/for-each-ref.c:30
msgid "quote placeholders suitably for perl"
msgstr "citera platshållare passande för perl"
-#: builtin/for-each-ref.c:31
+#: builtin/for-each-ref.c:32
msgid "quote placeholders suitably for python"
msgstr "citera platshållare passande för python"
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:34
msgid "quote placeholders suitably for Tcl"
msgstr "citera platshållare passande för Tcl"
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
msgid "show only <n> matched refs"
msgstr "visa endast <n> träffade refs"
-#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38
-msgid "format to use for the output"
-msgstr "format att använda för utdata"
-
-#: builtin/for-each-ref.c:41
+#: builtin/for-each-ref.c:42
msgid "print only refs which points at the given object"
msgstr "visa endast referenser som pekar på objektet"
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:44
msgid "print only refs that are merged"
msgstr "visa endast referenser som slagits samman"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are not merged"
msgstr "visa endast referenser som ej slagits samman"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
msgstr "visa endast referenser som innehåller incheckningen"
+#: builtin/for-each-ref.c:47
+msgid "print only refs which don't contain the commit"
+msgstr "visa endast referenser som inte innehåller incheckningen"
+
#: builtin/fsck.c:554
msgid "Checking object directories"
msgstr "Kontrollerar objektkataloger"
@@ -8052,21 +8338,21 @@ msgstr "visa ordrika namn för nåbara objekt"
msgid "Checking objects"
msgstr "Kontrollerar objekt"
-#: builtin/gc.c:25
+#: builtin/gc.c:26
msgid "git gc [<options>]"
msgstr "git gc [<flaggor>]"
-#: builtin/gc.c:72
+#: builtin/gc.c:79
#, c-format
-msgid "Invalid %s: '%s'"
-msgstr "Felaktigt %s: \"%s\""
+msgid "Failed to fstat %s: %s"
+msgstr "Misslyckades ta status (fstat) på %s: %s"
-#: builtin/gc.c:139
+#: builtin/gc.c:311
#, c-format
-msgid "insanely long object directory %.*s"
-msgstr "tokigt lång objektkatalog %.*s"
+msgid "Can't stat %s"
+msgstr "Kan inte ta status på %s"
-#: builtin/gc.c:297
+#: builtin/gc.c:320
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8081,38 +8367,43 @@ msgstr ""
"\n"
"%s"
-#: builtin/gc.c:334
+#: builtin/gc.c:359
msgid "prune unreferenced objects"
msgstr "rensa ej refererade objekt"
-#: builtin/gc.c:336
+#: builtin/gc.c:361
msgid "be more thorough (increased runtime)"
msgstr "var mer grundlig (ökar körtiden)"
-#: builtin/gc.c:337
+#: builtin/gc.c:362
msgid "enable auto-gc mode"
msgstr "aktivera auto-gc-läge"
-#: builtin/gc.c:338
+#: builtin/gc.c:363
msgid "force running gc even if there may be another gc running"
msgstr "tvinga gc-körning även om en annan gc kanske körs"
#: builtin/gc.c:380
#, c-format
+msgid "Failed to parse gc.logexpiry value %s"
+msgstr "Kan inte tolka värdet %s för gc.logexpiry"
+
+#: builtin/gc.c:408
+#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"
-#: builtin/gc.c:382
+#: builtin/gc.c:410
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
-#: builtin/gc.c:383
+#: builtin/gc.c:411
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Se \"git help gc\" för manuell hushållning.\n"
-#: builtin/gc.c:404
+#: builtin/gc.c:432
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8120,260 +8411,278 @@ msgstr ""
"gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
"är fallet)"
-#: builtin/gc.c:448
+#: builtin/gc.c:476
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort "
"dem."
-#: builtin/grep.c:25
+#: builtin/grep.c:27
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
-#: builtin/grep.c:232
+#: builtin/grep.c:235
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: misslyckades skapa tråd. %s"
-#: builtin/grep.c:290
+#: builtin/grep.c:293
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "felaktigt antal trådar angivet (%d) för %s"
-#: builtin/grep.c:763 builtin/grep.c:804
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "trådstöd saknas, ignorerar %s"
+
+#: builtin/grep.c:788 builtin/grep.c:829
#, c-format
msgid "unable to read tree (%s)"
msgstr "kunde inte läsa träd (%s)"
-#: builtin/grep.c:823
+#: builtin/grep.c:848
#, c-format
msgid "unable to grep from object of type %s"
-msgstr "Kunde inte \"grep\" från objekt av typen %s"
+msgstr "kunde inte \"grep\" från objekt av typen %s"
-#: builtin/grep.c:887
+#: builtin/grep.c:912
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "flaggan \"%c\" antar ett numeriskt värde"
-#: builtin/grep.c:973
+#: builtin/grep.c:999
msgid "search in index instead of in the work tree"
msgstr "sök i indexet istället för i arbetskatalogen"
-#: builtin/grep.c:975
+#: builtin/grep.c:1001
msgid "find in contents not managed by git"
msgstr "sök i innehåll som inte hanteras av git"
-#: builtin/grep.c:977
+#: builtin/grep.c:1003
msgid "search in both tracked and untracked files"
msgstr "sök i både spårade och ospårade filer"
-#: builtin/grep.c:979
+#: builtin/grep.c:1005
msgid "ignore files specified via '.gitignore'"
msgstr "ignorera filer angivna i \".gitignore\""
-#: builtin/grep.c:981
-msgid "recursivley search in each submodule"
+#: builtin/grep.c:1007
+msgid "recursively search in each submodule"
msgstr "sök varje undermodul rekursivt"
-#: builtin/grep.c:983
+#: builtin/grep.c:1009
msgid "basename"
msgstr "basnamn"
-#: builtin/grep.c:984
+#: builtin/grep.c:1010
msgid "prepend parent project's basename to output"
msgstr "lägg till föräldraprojektets basnamn i utdata"
-#: builtin/grep.c:987
+#: builtin/grep.c:1013
msgid "show non-matching lines"
msgstr "visa rader som inte träffas"
-#: builtin/grep.c:989
+#: builtin/grep.c:1015
msgid "case insensitive matching"
msgstr "skiftlägesokänslig sökning"
-#: builtin/grep.c:991
+#: builtin/grep.c:1017
msgid "match patterns only at word boundaries"
msgstr "matcha endast mönster vid ordgränser"
-#: builtin/grep.c:993
+#: builtin/grep.c:1019
msgid "process binary files as text"
msgstr "hantera binärfiler som text"
-#: builtin/grep.c:995
+#: builtin/grep.c:1021
msgid "don't match patterns in binary files"
msgstr "träffa inte mönster i binärfiler"
-#: builtin/grep.c:998
+#: builtin/grep.c:1024
msgid "process binary files with textconv filters"
msgstr "hantera binärfiler med textconv-filter"
-#: builtin/grep.c:1000
+#: builtin/grep.c:1026
msgid "descend at most <depth> levels"
msgstr "gå som mest ned <djup> nivåer"
-#: builtin/grep.c:1004
+#: builtin/grep.c:1030
msgid "use extended POSIX regular expressions"
msgstr "använd utökade POSIX-reguljära uttryck"
-#: builtin/grep.c:1007
+#: builtin/grep.c:1033
msgid "use basic POSIX regular expressions (default)"
msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
-#: builtin/grep.c:1010
+#: builtin/grep.c:1036
msgid "interpret patterns as fixed strings"
msgstr "tolka mönster som fixerade strängar"
-#: builtin/grep.c:1013
+#: builtin/grep.c:1039
msgid "use Perl-compatible regular expressions"
msgstr "använd Perlkompatibla reguljära uttryck"
-#: builtin/grep.c:1016
+#: builtin/grep.c:1042
msgid "show line numbers"
msgstr "visa radnummer"
-#: builtin/grep.c:1017
+#: builtin/grep.c:1043
msgid "don't show filenames"
msgstr "visa inte filnamn"
-#: builtin/grep.c:1018
+#: builtin/grep.c:1044
msgid "show filenames"
msgstr "visa filnamn"
-#: builtin/grep.c:1020
+#: builtin/grep.c:1046
msgid "show filenames relative to top directory"
msgstr "visa filnamn relativa till toppkatalogen"
-#: builtin/grep.c:1022
+#: builtin/grep.c:1048
msgid "show only filenames instead of matching lines"
msgstr "visa endast filnamn istället för träffade rader"
-#: builtin/grep.c:1024
+#: builtin/grep.c:1050
msgid "synonym for --files-with-matches"
msgstr "synonym för --files-with-matches"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1053
msgid "show only the names of files without match"
msgstr "visa endast namn på filer utan träffar"
-#: builtin/grep.c:1029
+#: builtin/grep.c:1055
msgid "print NUL after filenames"
msgstr "skriv NUL efter filnamn"
-#: builtin/grep.c:1031
+#: builtin/grep.c:1057
msgid "show the number of matches instead of matching lines"
msgstr "visa antal träffar istället för träffade rader"
-#: builtin/grep.c:1032
+#: builtin/grep.c:1058
msgid "highlight matches"
msgstr "ljusmarkera träffar"
-#: builtin/grep.c:1034
+#: builtin/grep.c:1060
msgid "print empty line between matches from different files"
msgstr "skriv tomma rader mellan träffar från olika filer"
-#: builtin/grep.c:1036
+#: builtin/grep.c:1062
msgid "show filename only once above matches from same file"
msgstr "visa filnamn endast en gång ovanför träffar från samma fil"
-#: builtin/grep.c:1039
+#: builtin/grep.c:1065
msgid "show <n> context lines before and after matches"
msgstr "visa <n> rader sammanhang före och efter träffar"
-#: builtin/grep.c:1042
+#: builtin/grep.c:1068
msgid "show <n> context lines before matches"
msgstr "visa <n> rader sammanhang före träffar"
-#: builtin/grep.c:1044
+#: builtin/grep.c:1070
msgid "show <n> context lines after matches"
msgstr "visa <n> rader sammanhang efter träffar"
-#: builtin/grep.c:1046
+#: builtin/grep.c:1072
msgid "use <n> worker threads"
msgstr "använd <n> jobbtrådar"
-#: builtin/grep.c:1047
+#: builtin/grep.c:1073
msgid "shortcut for -C NUM"
msgstr "genväg för -C NUM"
-#: builtin/grep.c:1050
+#: builtin/grep.c:1076
msgid "show a line with the function name before matches"
msgstr "visa en rad med funktionsnamnet före träffen"
-#: builtin/grep.c:1052
+#: builtin/grep.c:1078
msgid "show the surrounding function"
msgstr "visa den omkringliggande funktionen"
-#: builtin/grep.c:1055
+#: builtin/grep.c:1081
msgid "read patterns from file"
msgstr "läs mönster från fil"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1083
msgid "match <pattern>"
msgstr "träffa <mönster>"
-#: builtin/grep.c:1059
+#: builtin/grep.c:1085
msgid "combine patterns specified with -e"
msgstr "kombinera mönster som anges med -e"
-#: builtin/grep.c:1071
+#: builtin/grep.c:1097
msgid "indicate hit with exit status without output"
msgstr "ange träff med slutstatuskod utan utdata"
-#: builtin/grep.c:1073
+#: builtin/grep.c:1099
msgid "show only matches from files that match all patterns"
msgstr "visa endast träffar från filer som träffar alla mönster"
-#: builtin/grep.c:1075
+#: builtin/grep.c:1101
msgid "show parse tree for grep expression"
msgstr "visa analysträd för grep-uttryck"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1105
msgid "pager"
msgstr "bläddrare"
-#: builtin/grep.c:1079
+#: builtin/grep.c:1105
msgid "show matching files in the pager"
msgstr "visa träffade filer i filbläddraren"
-#: builtin/grep.c:1082
+#: builtin/grep.c:1108
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
-#: builtin/grep.c:1146
+#: builtin/grep.c:1172
msgid "no pattern given."
msgstr "inget mönster angavs."
-#: builtin/grep.c:1178 builtin/index-pack.c:1482
+#: builtin/grep.c:1204
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index och --untracked kan inte användas med revisioner"
+
+#: builtin/grep.c:1211
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "kan inte slå upp revision: %s"
+
+#: builtin/grep.c:1245 builtin/index-pack.c:1490
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
-#: builtin/grep.c:1215
+#: builtin/grep.c:1250
+msgid "no threads support, ignoring --threads"
+msgstr "trådstöd saknas, ignorerar --threads"
+
+#: builtin/grep.c:1281
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
-#: builtin/grep.c:1238
+#: builtin/grep.c:1304
msgid "option not supported with --recurse-submodules."
msgstr "flaggan stöds inte med --recurse-submodules."
-#: builtin/grep.c:1244
+#: builtin/grep.c:1310
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached och --untracked kan inte användas med --no-index."
-#: builtin/grep.c:1249
-msgid "--no-index or --untracked cannot be used with revs."
-msgstr "--no-index och --untracked kan inte användas med revisioner."
-
-#: builtin/grep.c:1252
+#: builtin/grep.c:1316
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."
-#: builtin/grep.c:1260
+#: builtin/grep.c:1324
msgid "both --cached and trees are given."
msgstr "både --cached och träd angavs."
-#: builtin/hash-object.c:81
+#: builtin/hash-object.c:82
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
@@ -8381,92 +8690,92 @@ msgstr ""
"git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] "
"<fil>..."
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "type"
msgstr "typ"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
msgid "object type"
msgstr "objekttyp"
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
msgid "write the object into the object database"
msgstr "skriv objektet till objektdatabasen"
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
msgid "read the object from stdin"
msgstr "läs objektet från standard in"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
msgid "store file as is without filters"
msgstr "spara filen som den är utan filer"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr ""
"hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git"
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
msgid "process file as it were from this path"
msgstr "hantera filen som om den kom från sökvägen"
-#: builtin/help.c:42
+#: builtin/help.c:43
msgid "print all available commands"
msgstr "visa alla tillgängliga kommandon"
-#: builtin/help.c:43
+#: builtin/help.c:44
msgid "exclude guides"
msgstr "uteslut vägledningar"
-#: builtin/help.c:44
+#: builtin/help.c:45
msgid "print list of useful guides"
msgstr "lista användbara vägledningar"
-#: builtin/help.c:45
+#: builtin/help.c:46
msgid "show man page"
msgstr "visa manualsida"
-#: builtin/help.c:46
+#: builtin/help.c:47
msgid "show manual in web browser"
msgstr "visa manual i webbläsare"
-#: builtin/help.c:48
+#: builtin/help.c:49
msgid "show info page"
msgstr "visa info-sida"
-#: builtin/help.c:54
+#: builtin/help.c:55
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]"
-#: builtin/help.c:66
+#: builtin/help.c:67
#, c-format
msgid "unrecognized help format '%s'"
-msgstr "okänt hjälpformat: %s"
+msgstr "okänt hjälpformat: ”%s”"
-#: builtin/help.c:93
+#: builtin/help.c:94
msgid "Failed to start emacsclient."
msgstr "Misslyckades starta emacsclient."
-#: builtin/help.c:106
+#: builtin/help.c:107
msgid "Failed to parse emacsclient version."
msgstr "Kunde inte tolka emacsclient-version."
-#: builtin/help.c:114
+#: builtin/help.c:115
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient version \"%d\" för gammal (< 22)."
-#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
+#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
#, c-format
msgid "failed to exec '%s'"
msgstr "exec misslyckades för \"%s\""
-#: builtin/help.c:207
+#: builtin/help.c:208
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -8475,7 +8784,7 @@ msgstr ""
"\"%s\": sökväg för man-visare som ej stöds.\n"
"Använd \"man.<verktyg>.cmd\" istället."
-#: builtin/help.c:219
+#: builtin/help.c:220
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -8484,435 +8793,435 @@ msgstr ""
"\"%s\": kommando för man-visare som stöds.\n"
"Använd \"man.<verktyg>.path\" istället."
-#: builtin/help.c:336
+#: builtin/help.c:337
#, c-format
msgid "'%s': unknown man viewer."
msgstr "\"%s\": okänd man-visare."
-#: builtin/help.c:353
+#: builtin/help.c:354
msgid "no man viewer handled the request"
msgstr "ingen man-visare hanterade förfrågan"
-#: builtin/help.c:361
+#: builtin/help.c:362
msgid "no info viewer handled the request"
msgstr "ingen info-visare hanterade förfrågan"
-#: builtin/help.c:403
+#: builtin/help.c:404
msgid "Defining attributes per path"
msgstr "Definierar attribut per sökväg"
-#: builtin/help.c:404
+#: builtin/help.c:405
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git för dagligt bruk i ungefär 20 kommandon"
-#: builtin/help.c:405
+#: builtin/help.c:406
msgid "A Git glossary"
msgstr "En Git-ordlista"
-#: builtin/help.c:406
+#: builtin/help.c:407
msgid "Specifies intentionally untracked files to ignore"
msgstr "Ange avsiktligen ospårade filer att ignorera"
-#: builtin/help.c:407
+#: builtin/help.c:408
msgid "Defining submodule properties"
msgstr "Ange egenskaper för undermoduler"
-#: builtin/help.c:408
+#: builtin/help.c:409
msgid "Specifying revisions and ranges for Git"
msgstr "Ange versioner och intervall i Git"
-#: builtin/help.c:409
+#: builtin/help.c:410
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Introduktion till Git (för version 1.5.1 och senare)"
-#: builtin/help.c:410
+#: builtin/help.c:411
msgid "An overview of recommended workflows with Git"
msgstr "Översikt över rekommenderade arbetsflöden med Git"
-#: builtin/help.c:422
+#: builtin/help.c:423
msgid "The common Git guides are:\n"
msgstr "De vanliga Git-vägledningarna är:\n"
-#: builtin/help.c:440
+#: builtin/help.c:441
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "\"git %s\" är ett alias för \"%s\""
-#: builtin/help.c:462 builtin/help.c:479
+#: builtin/help.c:463 builtin/help.c:480
#, c-format
msgid "usage: %s%s"
msgstr "användning: %s%s"
-#: builtin/index-pack.c:154
+#: builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "kunde inte öppna %s"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
#, c-format
msgid "object type mismatch at %s"
msgstr "objekttyp stämmer inte överens vid %s"
-#: builtin/index-pack.c:224
+#: builtin/index-pack.c:225
#, c-format
msgid "did not receive expected object %s"
msgstr "emottog inte det förväntade objektet %s"
-#: builtin/index-pack.c:227
+#: builtin/index-pack.c:228
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objektet %s: förväntad typ %s, såg %s"
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:270
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "kan inte fylla %d byte"
msgstr[1] "kan inte fylla %d byte"
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
msgid "early EOF"
msgstr "tidigt filslut"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "read error on input"
msgstr "indataläsfel"
-#: builtin/index-pack.c:292
+#: builtin/index-pack.c:293
msgid "used more bytes than were available"
msgstr "använde fler byte än tillgängligt"
-#: builtin/index-pack.c:299
+#: builtin/index-pack.c:300
msgid "pack too large for current definition of off_t"
msgstr "paket för stort för nuvarande definition av off_t"
-#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "paket är större än tillåten maximal storlek"
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:318
#, c-format
msgid "unable to create '%s'"
msgstr "kunde inte skapa \"%s\""
-#: builtin/index-pack.c:322
+#: builtin/index-pack.c:324
#, c-format
msgid "cannot open packfile '%s'"
msgstr "kan inte öppna paketfilen \"%s\""
-#: builtin/index-pack.c:336
+#: builtin/index-pack.c:338
msgid "pack signature mismatch"
msgstr "paketsignatur stämmer inte överens"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:340
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "paketversion %<PRIu32> stöds ej"
-#: builtin/index-pack.c:356
+#: builtin/index-pack.c:358
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s"
-#: builtin/index-pack.c:478
+#: builtin/index-pack.c:479
#, c-format
msgid "inflate returned %d"
msgstr "inflate returnerade %d"
-#: builtin/index-pack.c:527
+#: builtin/index-pack.c:528
msgid "offset value overflow for delta base object"
msgstr "indexvärdespill för deltabasobjekt"
-#: builtin/index-pack.c:535
+#: builtin/index-pack.c:536
msgid "delta base offset is out of bound"
msgstr "deltabasindex utanför gränsen"
-#: builtin/index-pack.c:543
+#: builtin/index-pack.c:544
#, c-format
msgid "unknown object type %d"
msgstr "okänd objekttyp %d"
-#: builtin/index-pack.c:574
+#: builtin/index-pack.c:575
msgid "cannot pread pack file"
msgstr "kan inte utföra \"pread\" på paketfil"
-#: builtin/index-pack.c:576
+#: builtin/index-pack.c:577
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
-#: builtin/index-pack.c:602
+#: builtin/index-pack.c:603
msgid "serious inflate inconsistency"
msgstr "allvarlig inflate-inkonsekvens"
#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:813 builtin/index-pack.c:822
+#: builtin/index-pack.c:816 builtin/index-pack.c:825
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:751 builtin/pack-objects.c:167
+#: builtin/pack-objects.c:261
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
-#: builtin/index-pack.c:819
+#: builtin/index-pack.c:814
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "kan inte läsa information om befintligt objekt %s"
+
+#: builtin/index-pack.c:822
#, c-format
msgid "cannot read existing object %s"
msgstr "kan inte läsa befintligt objekt %s"
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:836
#, c-format
msgid "invalid blob object %s"
msgstr "ogiltigt blob-objekt %s"
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:851
#, c-format
msgid "invalid %s"
msgstr "ogiltigt %s"
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:854
msgid "Error in object"
msgstr "Fel i objekt"
-#: builtin/index-pack.c:852
+#: builtin/index-pack.c:856
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Inte alla barnobjekt för %s kan nås"
-#: builtin/index-pack.c:924 builtin/index-pack.c:955
+#: builtin/index-pack.c:928 builtin/index-pack.c:959
msgid "failed to apply delta"
msgstr "misslyckades tillämpa delta"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1130
msgid "Receiving objects"
msgstr "Tar emot objekt"
-#: builtin/index-pack.c:1125
+#: builtin/index-pack.c:1130
msgid "Indexing objects"
msgstr "Skapar index för objekt"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1164
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paketet är trasigt (SHA1 stämmer inte)"
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1169
msgid "cannot fstat packfile"
msgstr "kan inte utföra \"fstat\" på paketfil"
-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1172
msgid "pack has junk at the end"
msgstr "paket har skräp i slutet"
-#: builtin/index-pack.c:1176
+#: builtin/index-pack.c:1184
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "förvirrad bortom vanvett i parse_pack_objects()"
-#: builtin/index-pack.c:1199
+#: builtin/index-pack.c:1207
msgid "Resolving deltas"
msgstr "Analyserar delta"
-#: builtin/index-pack.c:1210
+#: builtin/index-pack.c:1218
#, c-format
msgid "unable to create thread: %s"
msgstr "kunde inte skapa tråd: %s"
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1260
msgid "confusion beyond insanity"
msgstr "förvirrad bortom vanvett"
-#: builtin/index-pack.c:1258
+#: builtin/index-pack.c:1266
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "slutfördes med %d lokalt objekt"
msgstr[1] "slutfördes med %d lokala objekt"
-#: builtin/index-pack.c:1270
+#: builtin/index-pack.c:1278
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Oväntad svanschecksumma för %s (trasig disk?)"
-#: builtin/index-pack.c:1274
+#: builtin/index-pack.c:1282
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paketet har %d oanalyserat delta"
msgstr[1] "paketet har %d oanalyserade delta"
-#: builtin/index-pack.c:1298
+#: builtin/index-pack.c:1306
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
-#: builtin/index-pack.c:1374
+#: builtin/index-pack.c:1382
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:1398
+#: builtin/index-pack.c:1408
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:1411
+#: builtin/index-pack.c:1420
#, c-format
msgid "cannot write keep file '%s'"
msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1419
+#: builtin/index-pack.c:1428
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1432
+#: builtin/index-pack.c:1438
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
-#: builtin/index-pack.c:1443
+#: builtin/index-pack.c:1446
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
-#: builtin/index-pack.c:1476
+#: builtin/index-pack.c:1484
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1486 builtin/index-pack.c:1683
-#, c-format
-msgid "no threads support, ignoring %s"
-msgstr "trådstöd saknas, ignorerar %s"
-
-#: builtin/index-pack.c:1544
+#: builtin/index-pack.c:1552
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
-#: builtin/index-pack.c:1546
+#: builtin/index-pack.c:1554
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1602
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "icke-delta: %d objekt"
msgstr[1] "icke-delta: %d objekt"
-#: builtin/index-pack.c:1600
+#: builtin/index-pack.c:1609
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "kedjelängd = %d: %lu objekt"
msgstr[1] "kedjelängd = %d: %lu objekt"
-#: builtin/index-pack.c:1613
+#: builtin/index-pack.c:1622
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
-#: builtin/index-pack.c:1695 builtin/index-pack.c:1698
-#: builtin/index-pack.c:1714 builtin/index-pack.c:1718
+#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
+#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1734
+#: builtin/index-pack.c:1743
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
-#: builtin/index-pack.c:1736
+#: builtin/index-pack.c:1745
msgid "--stdin requires a git repository"
msgstr "--stdin kräver ett git-arkiv"
-#: builtin/index-pack.c:1744
+#: builtin/index-pack.c:1753
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
-#: builtin/init-db.c:54
+#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "kan inte ta status på \"%s\""
-#: builtin/init-db.c:60
+#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr "kan inte ta status på mallen \"%s\""
-#: builtin/init-db.c:65
+#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr "kan inte öppna katalogen (opendir) \"%s\""
-#: builtin/init-db.c:76
+#: builtin/init-db.c:77
#, c-format
msgid "cannot readlink '%s'"
msgstr "kan inte läsa länk (readlink) \"%s\""
-#: builtin/init-db.c:78
+#: builtin/init-db.c:79
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\""
-#: builtin/init-db.c:84
+#: builtin/init-db.c:85
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "kan inte kopiera \"%s\" till \"%s\""
-#: builtin/init-db.c:88
+#: builtin/init-db.c:89
#, c-format
msgid "ignoring template %s"
msgstr "ignorerar mallen %s"
-#: builtin/init-db.c:119
+#: builtin/init-db.c:120
#, c-format
msgid "templates not found %s"
msgstr "mallarna hittades inte %s"
-#: builtin/init-db.c:134
+#: builtin/init-db.c:135
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "kopierade inte mallar från \"%s\": %s"
-#: builtin/init-db.c:327
+#: builtin/init-db.c:328
#, c-format
msgid "unable to handle file type %d"
msgstr "kan inte hantera filtyp %d"
-#: builtin/init-db.c:330
+#: builtin/init-db.c:331
#, c-format
msgid "unable to move %s to %s"
msgstr "kan inte flytta %s till %s"
-#: builtin/init-db.c:347 builtin/init-db.c:350
+#: builtin/init-db.c:348 builtin/init-db.c:351
#, c-format
msgid "%s already exists"
msgstr "%s finns redan"
-#: builtin/init-db.c:403
+#: builtin/init-db.c:404
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n"
-#: builtin/init-db.c:404
+#: builtin/init-db.c:405
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "Ominitierade befintligt Git-arkiv i %s%s\n"
-#: builtin/init-db.c:408
+#: builtin/init-db.c:409
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "Initierade tomt delat Git-arkiv i %s%s\n"
-#: builtin/init-db.c:409
+#: builtin/init-db.c:410
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "Initierade tomt Git-arkiv i %s%s\n"
-#: builtin/init-db.c:457
+#: builtin/init-db.c:458
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -8920,25 +9229,25 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
"shared[=<behörigheter>]] [<katalog>]"
-#: builtin/init-db.c:480
+#: builtin/init-db.c:481
msgid "permissions"
msgstr "behörigheter"
-#: builtin/init-db.c:481
+#: builtin/init-db.c:482
msgid "specify that the git repository is to be shared amongst several users"
msgstr "ange att git-arkivet skall delas bland flera användare"
-#: builtin/init-db.c:515 builtin/init-db.c:520
+#: builtin/init-db.c:516 builtin/init-db.c:521
#, c-format
msgid "cannot mkdir %s"
msgstr "kan inte skapa katalogen (mkdir) %s"
-#: builtin/init-db.c:524
+#: builtin/init-db.c:525
#, c-format
msgid "cannot chdir to %s"
msgstr "kan inte byta katalog (chdir) till %s"
-#: builtin/init-db.c:545
+#: builtin/init-db.c:546
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -8947,7 +9256,7 @@ msgstr ""
"%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"
"dir=<katalog>)"
-#: builtin/init-db.c:573
+#: builtin/init-db.c:574
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kan inte komma åt arbetskatalogen \"%s\""
@@ -8980,112 +9289,112 @@ msgstr "släprad(er) att lägga till"
msgid "no input file given for in-place editing"
msgstr "ingen indatafil angiven för redigering på plats"
-#: builtin/log.c:44
+#: builtin/log.c:45
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
-#: builtin/log.c:45
+#: builtin/log.c:46
msgid "git show [<options>] <object>..."
msgstr "git show [<flaggor>] <objekt>..."
-#: builtin/log.c:84
+#: builtin/log.c:90
#, c-format
msgid "invalid --decorate option: %s"
msgstr "ogiltig flagga för --decorate: %s"
-#: builtin/log.c:139
+#: builtin/log.c:147
msgid "suppress diff output"
msgstr "undertryck diff-utdata"
-#: builtin/log.c:140
+#: builtin/log.c:148
msgid "show source"
msgstr "visa källkod"
-#: builtin/log.c:141
+#: builtin/log.c:149
msgid "Use mail map file"
msgstr "Använd e-postmappningsfil"
-#: builtin/log.c:142
+#: builtin/log.c:150
msgid "decorate options"
msgstr "dekoreringsflaggor"
-#: builtin/log.c:145
+#: builtin/log.c:153
msgid "Process line range n,m in file, counting from 1"
msgstr "Behandla radintervallet n,m i filen, med början på 1"
-#: builtin/log.c:241
+#: builtin/log.c:249
#, c-format
msgid "Final output: %d %s\n"
msgstr "Slututdata: %d %s\n"
-#: builtin/log.c:486
+#: builtin/log.c:497
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: felaktig fil"
-#: builtin/log.c:500 builtin/log.c:594
+#: builtin/log.c:512 builtin/log.c:606
#, c-format
msgid "Could not read object %s"
msgstr "Kunde inte läsa objektet %s"
-#: builtin/log.c:618
+#: builtin/log.c:630
#, c-format
msgid "Unknown type: %d"
msgstr "Okänd typ: %d"
-#: builtin/log.c:739
+#: builtin/log.c:751
msgid "format.headers without value"
msgstr "format.headers utan värde"
-#: builtin/log.c:839
+#: builtin/log.c:852
msgid "name of output directory is too long"
msgstr "namnet på utdatakatalogen är för långt"
-#: builtin/log.c:854
+#: builtin/log.c:868
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kan inte öppna patchfilen %s"
-#: builtin/log.c:868
+#: builtin/log.c:885
msgid "Need exactly one range."
msgstr "Behöver precis ett intervall."
-#: builtin/log.c:878
+#: builtin/log.c:895
msgid "Not a range."
msgstr "Inte ett intervall."
-#: builtin/log.c:984
+#: builtin/log.c:1001
msgid "Cover letter needs email format"
msgstr "Omslagsbrevet behöver e-postformat"
-#: builtin/log.c:1063
+#: builtin/log.c:1081
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:1091
+#: builtin/log.c:1108
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
-#: builtin/log.c:1141
+#: builtin/log.c:1158
msgid "Two output directories?"
msgstr "Två utdatakataloger?"
-#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
+#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
#, c-format
msgid "Unknown commit %s"
msgstr "Okänd incheckning %s"
-#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476
+#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
-#: builtin/log.c:1263
+#: builtin/log.c:1280
msgid "Could not find exact merge base."
msgstr "Kunde inte hitta exakt sammanslagningsbas."
-#: builtin/log.c:1267
+#: builtin/log.c:1284
msgid ""
"Failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -9096,315 +9405,320 @@ msgstr ""
"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> "
"manuellt."
-#: builtin/log.c:1287
+#: builtin/log.c:1304
msgid "Failed to find exact merge base"
msgstr "Kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1298
+#: builtin/log.c:1315
msgid "base commit should be the ancestor of revision list"
msgstr "basincheckningen bör vara förfader till revisionslistan"
-#: builtin/log.c:1302
+#: builtin/log.c:1319
msgid "base commit shouldn't be in revision list"
msgstr "basincheckningen bör inte vara i revisionslistan"
-#: builtin/log.c:1351
+#: builtin/log.c:1368
msgid "cannot get patch id"
msgstr "kan inte hämta patch-id"
-#: builtin/log.c:1408
+#: builtin/log.c:1425
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:1411
+#: builtin/log.c:1428
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
-#: builtin/log.c:1415
+#: builtin/log.c:1432
msgid "print patches to standard out"
msgstr "skriv patcharna på standard ut"
-#: builtin/log.c:1417
+#: builtin/log.c:1434
msgid "generate a cover letter"
msgstr "generera ett följebrev"
-#: builtin/log.c:1419
+#: builtin/log.c:1436
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
-#: builtin/log.c:1420
+#: builtin/log.c:1437
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1421
+#: builtin/log.c:1438
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
-#: builtin/log.c:1423
+#: builtin/log.c:1440
msgid "start numbering patches at <n> instead of 1"
msgstr "börja numrera patchar på <n> istället för 1"
-#: builtin/log.c:1425
+#: builtin/log.c:1442
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
-#: builtin/log.c:1427
+#: builtin/log.c:1444
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Använd [RFC PATCH] istället för [PATCH]"
-#: builtin/log.c:1430
+#: builtin/log.c:1447
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Använd [<prefix>] istället för [PATCH]"
-#: builtin/log.c:1433
+#: builtin/log.c:1450
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
-#: builtin/log.c:1436
+#: builtin/log.c:1453
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
-#: builtin/log.c:1439
+#: builtin/log.c:1456
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
-#: builtin/log.c:1441
+#: builtin/log.c:1458
msgid "output all-zero hash in From header"
msgstr "använd hashvärde med nollor i From-huvud"
-#: builtin/log.c:1443
+#: builtin/log.c:1460
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
-#: builtin/log.c:1445
+#: builtin/log.c:1462
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
-#: builtin/log.c:1447
+#: builtin/log.c:1464
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:1448
+#: builtin/log.c:1465
msgid "header"
msgstr "huvud"
-#: builtin/log.c:1449
+#: builtin/log.c:1466
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:1450 builtin/log.c:1452
+#: builtin/log.c:1467 builtin/log.c:1469
msgid "email"
msgstr "epost"
-#: builtin/log.c:1450
+#: builtin/log.c:1467
msgid "add To: header"
-msgstr "Lägg till mottagarhuvud (\"To:\")"
+msgstr "lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:1452
+#: builtin/log.c:1469
msgid "add Cc: header"
-msgstr "Lägg till kopiehuvud (\"Cc:\")"
+msgstr "lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:1454
+#: builtin/log.c:1471
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1455
+#: builtin/log.c:1472
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"
-#: builtin/log.c:1457
+#: builtin/log.c:1474
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:1458
+#: builtin/log.c:1475
msgid "make first mail a reply to <message-id>"
-msgstr "Gör det första brevet ett svar till <meddelande-id>"
+msgstr "gör det första brevet ett svar till <meddelande-id>"
-#: builtin/log.c:1459 builtin/log.c:1462
+#: builtin/log.c:1476 builtin/log.c:1479
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:1460
+#: builtin/log.c:1477
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:1463
+#: builtin/log.c:1480
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:1467
+#: builtin/log.c:1484
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:1469
+#: builtin/log.c:1486
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:1470
+#: builtin/log.c:1487
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:1471
+#: builtin/log.c:1488
msgid "base-commit"
msgstr "basincheckning"
-#: builtin/log.c:1472
+#: builtin/log.c:1489
msgid "add prerequisite tree info to the patch series"
msgstr "lägg till förhandskrävd trädinfo i patchserien"
-#: builtin/log.c:1474
+#: builtin/log.c:1491
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
-#: builtin/log.c:1475
+#: builtin/log.c:1492
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:1565
+#: builtin/log.c:1567
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "ogiltig ident-rad: %s"
+
+#: builtin/log.c:1582
msgid "-n and -k are mutually exclusive."
msgstr "-n och -k kan inte användas samtidigt."
-#: builtin/log.c:1567
+#: builtin/log.c:1584
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt."
-#: builtin/log.c:1575
+#: builtin/log.c:1592
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1577
+#: builtin/log.c:1594
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1579
+#: builtin/log.c:1596
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1609
+#: builtin/log.c:1626
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken skall det vara?"
-#: builtin/log.c:1611
+#: builtin/log.c:1628
#, c-format
msgid "Could not create directory '%s'"
msgstr "Kunde inte skapa katalogen \"%s\""
-#: builtin/log.c:1705
+#: builtin/log.c:1722
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
-#: builtin/log.c:1777
+#: builtin/log.c:1794
msgid "Failed to create output files"
msgstr "Misslyckades skapa utdatafiler"
-#: builtin/log.c:1826
+#: builtin/log.c:1843
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:1880
+#: builtin/log.c:1897
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:468
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<flaggor>] [<fil>...]"
-#: builtin/ls-files.c:509
+#: builtin/ls-files.c:517
msgid "identify the file status with tags"
msgstr "identifiera filstatus med taggar"
-#: builtin/ls-files.c:511
+#: builtin/ls-files.c:519
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "använd små bokstäver för \"anta oförändrade\"-filer"
-#: builtin/ls-files.c:513
+#: builtin/ls-files.c:521
msgid "show cached files in the output (default)"
msgstr "visa cachade filer i utdata (standard)"
-#: builtin/ls-files.c:515
+#: builtin/ls-files.c:523
msgid "show deleted files in the output"
msgstr "visa borttagna filer i utdata"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:525
msgid "show modified files in the output"
msgstr "visa modifierade filer i utdata"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:527
msgid "show other files in the output"
msgstr "visa andra filer i utdata"
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:529
msgid "show ignored files in the output"
msgstr "visa ignorerade filer i utdata"
-#: builtin/ls-files.c:524
+#: builtin/ls-files.c:532
msgid "show staged contents' object name in the output"
msgstr "visa köat innehålls objektnamn i utdata"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:534
msgid "show files on the filesystem that need to be removed"
msgstr "visa filer i filsystemet som behöver tas bort"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:536
msgid "show 'other' directories' names only"
msgstr "visa endast namn för \"andra\" kataloger"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:538
msgid "show line endings of files"
msgstr "visa radslut i filer"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:540
msgid "don't show empty directories"
msgstr "visa inte tomma kataloger"
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:543
msgid "show unmerged files in the output"
msgstr "visa ej sammanslagna filer i utdata"
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:545
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:547
msgid "skip files matching pattern"
msgstr "hoppa över filer som motsvarar mönster"
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:550
msgid "exclude patterns are read from <file>"
msgstr "exkludera mönster som läses från <fil>"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:553
msgid "read additional per-directory exclude patterns in <file>"
msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:555
msgid "add the standard git exclusions"
msgstr "lägg till git:s standardexkluderingar"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:558
msgid "make the output relative to the project top directory"
msgstr "gör utdata relativ till projektets toppkatalog"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:561
msgid "recurse through submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:563
msgid "if any <file> is not in the index, treat this as an error"
msgstr "om en <fil> inte är indexet, betrakta det som ett fel"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:564
msgid "tree-ish"
msgstr "träd-igt"
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:565
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:567
msgid "show debugging data"
msgstr "visa felsökningsutdata"
@@ -9418,85 +9732,86 @@ msgstr ""
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<arkiv> [<referenser>...]]"
-#: builtin/ls-remote.c:50
+#: builtin/ls-remote.c:52
msgid "do not print remote URL"
msgstr "visa inte fjärr-URL"
-#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
+#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
msgid "exec"
msgstr "exec"
-#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
+#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
msgid "path of git-upload-pack on the remote host"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/ls-remote.c:56
+#: builtin/ls-remote.c:58
msgid "limit to tags"
msgstr "begränsa till taggar"
-#: builtin/ls-remote.c:57
+#: builtin/ls-remote.c:59
msgid "limit to heads"
msgstr "begränsa till huvuden"
-#: builtin/ls-remote.c:58
+#: builtin/ls-remote.c:60
msgid "do not show peeled tags"
msgstr "visa inte avskalade taggar"
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:62
msgid "take url.<base>.insteadOf into account"
msgstr "ta hänsyn till url.<bas>.insteadOf"
-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:64
msgid "exit with exit code 2 if no matching refs are found"
msgstr "avsluta med felkod 2 om motsvarande referenser inte hittas"
-#: builtin/ls-remote.c:64
+#: builtin/ls-remote.c:66
msgid "show underlying ref in addition to the object pointed by it"
msgstr "visa underliggande referens och objektet det pekar på"
-#: builtin/ls-tree.c:28
+#: builtin/ls-tree.c:29
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]"
-#: builtin/ls-tree.c:126
+#: builtin/ls-tree.c:127
msgid "only show trees"
msgstr "visa endast träd"
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:129
msgid "recurse into subtrees"
msgstr "rekursera ner i underträd"
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:131
msgid "show trees when recursing"
msgstr "visa träd medan rekursering"
-#: builtin/ls-tree.c:133
+#: builtin/ls-tree.c:134
msgid "terminate entries with NUL byte"
msgstr "terminera poster med NUL-byte"
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
msgid "include object size"
msgstr "inkludera objektstorlek"
-#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
+#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
msgid "list only filenames"
msgstr "visa endast filnamn"
-#: builtin/ls-tree.c:141
+#: builtin/ls-tree.c:142
msgid "use full path names"
msgstr "använd fullständiga sökvägsnamn"
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:144
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"
-#: builtin/merge.c:46
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<flaggor>] [<incheckning>...]"
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "tom mbox: ”%s”"
#: builtin/merge.c:47
-msgid "git merge [<options>] <msg> HEAD <commit>"
-msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>"
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<flaggor>] [<incheckning>...]"
#: builtin/merge.c:48
msgid "git merge --abort"
@@ -9525,32 +9840,32 @@ msgstr "Tillgängliga strategier är:"
msgid "Available custom strategies are:"
msgstr "Tillgängliga skräddarsydda strategier är:"
-#: builtin/merge.c:197 builtin/pull.c:127
+#: builtin/merge.c:197 builtin/pull.c:134
msgid "do not show a diffstat at the end of the merge"
msgstr "visa inte en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:200 builtin/pull.c:130
+#: builtin/merge.c:200 builtin/pull.c:137
msgid "show a diffstat at the end of the merge"
msgstr "visa en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:201 builtin/pull.c:133
+#: builtin/merge.c:201 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(synonym till --stat)"
-#: builtin/merge.c:203 builtin/pull.c:136
+#: builtin/merge.c:203 builtin/pull.c:143
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"
-#: builtin/merge.c:206 builtin/pull.c:139
+#: builtin/merge.c:206 builtin/pull.c:146
msgid "create a single commit instead of doing a merge"
msgstr "skapa en ensam incheckning istället för en sammanslagning"
-#: builtin/merge.c:208 builtin/pull.c:142
+#: builtin/merge.c:208 builtin/pull.c:149
msgid "perform a commit if the merge succeeds (default)"
msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
-#: builtin/merge.c:210 builtin/pull.c:145
+#: builtin/merge.c:210 builtin/pull.c:152
msgid "edit message before committing"
msgstr "redigera meddelande innan incheckning"
@@ -9558,28 +9873,28 @@ msgstr "redigera meddelande innan incheckning"
msgid "allow fast-forward (default)"
msgstr "tillåt snabbspolning (standard)"
-#: builtin/merge.c:213 builtin/pull.c:151
+#: builtin/merge.c:213 builtin/pull.c:158
msgid "abort if fast-forward is not possible"
msgstr "avbryt om snabbspolning inte är möjlig"
-#: builtin/merge.c:217 builtin/pull.c:154
+#: builtin/merge.c:217 builtin/pull.c:161
msgid "verify that the named commit has a valid GPG signature"
msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
-#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158
-#: builtin/revert.c:89
+#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/revert.c:109
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:219 builtin/pull.c:159
+#: builtin/merge.c:219 builtin/pull.c:166
msgid "merge strategy to use"
msgstr "sammanslagningsstrategi att använda"
-#: builtin/merge.c:220 builtin/pull.c:162
+#: builtin/merge.c:220 builtin/pull.c:169
msgid "option=value"
msgstr "alternativ=värde"
-#: builtin/merge.c:221 builtin/pull.c:163
+#: builtin/merge.c:221 builtin/pull.c:170
msgid "option for selected merge strategy"
msgstr "alternativ för vald sammanslagningsstrategi"
@@ -9595,7 +9910,7 @@ msgstr "avbryt den pågående sammanslagningen"
msgid "continue the current in-progress merge"
msgstr "fortsätt den pågående sammanslagningen"
-#: builtin/merge.c:231 builtin/pull.c:170
+#: builtin/merge.c:231 builtin/pull.c:177
msgid "allow merging unrelated histories"
msgstr "tillåt sammanslagning av orelaterade historier"
@@ -9640,33 +9955,33 @@ msgstr "\"%s\" verkar inte peka på en incheckning"
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
-#: builtin/merge.c:656
+#: builtin/merge.c:657
msgid "Not handling anything other than two heads merge."
msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
-#: builtin/merge.c:670
+#: builtin/merge.c:671
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Felaktig flagga för merge-recursive: -X%s"
-#: builtin/merge.c:685
+#: builtin/merge.c:686
#, c-format
msgid "unable to write %s"
msgstr "kunde inte skriva %s"
-#: builtin/merge.c:737
+#: builtin/merge.c:738
#, c-format
msgid "Could not read from '%s'"
msgstr "Kunde inte läsa från \"%s\""
-#: builtin/merge.c:746
+#: builtin/merge.c:747
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "
"den.\n"
-#: builtin/merge.c:752
+#: builtin/merge.c:753
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -9682,79 +9997,69 @@ msgstr ""
"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
"avbryter incheckningen.\n"
-#: builtin/merge.c:776
+#: builtin/merge.c:777
msgid "Empty commit message."
msgstr "Tomt incheckningsmeddelande."
-#: builtin/merge.c:796
+#: builtin/merge.c:797
#, c-format
msgid "Wonderful.\n"
msgstr "Underbart.\n"
-#: builtin/merge.c:851
+#: builtin/merge.c:850
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
-#: builtin/merge.c:867
-#, c-format
-msgid "'%s' is not a commit"
-msgstr "\"%s\" är inte en incheckning"
-
-#: builtin/merge.c:908
+#: builtin/merge.c:889
msgid "No current branch."
msgstr "Inte på någon gren."
-#: builtin/merge.c:910
+#: builtin/merge.c:891
msgid "No remote for the current branch."
msgstr "Ingen fjärr för aktuell gren."
-#: builtin/merge.c:912
+#: builtin/merge.c:893
msgid "No default upstream defined for the current branch."
msgstr "Ingen standarduppström angiven för aktuell gren."
-#: builtin/merge.c:917
+#: builtin/merge.c:898
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Ingen fjärrspårande gren för %s från %s"
-#: builtin/merge.c:964
+#: builtin/merge.c:945
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
-#: builtin/merge.c:1038
-#, c-format
-msgid "could not close '%s'"
-msgstr "kunde inte stänga \"%s\""
-
-#: builtin/merge.c:1065
+#: builtin/merge.c:1046
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "inte något vi kan slå ihop med %s: %s"
-#: builtin/merge.c:1099
+#: builtin/merge.c:1080
msgid "not something we can merge"
msgstr "inte något vi kan slå ihop"
-#: builtin/merge.c:1167
+#: builtin/merge.c:1145
msgid "--abort expects no arguments"
msgstr "--abort tar inga argument"
-#: builtin/merge.c:1171
+#: builtin/merge.c:1149
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
-#: builtin/merge.c:1183
+#: builtin/merge.c:1161
msgid "--continue expects no arguments"
msgstr "--continue tar inga argument"
-#: builtin/merge.c:1187
+#: builtin/merge.c:1165
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
-#: builtin/merge.c:1203
+#: builtin/merge.c:1181
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9762,7 +10067,7 @@ msgstr ""
"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1210
+#: builtin/merge.c:1188
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -9770,160 +10075,160 @@ msgstr ""
"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1213
+#: builtin/merge.c:1191
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
-#: builtin/merge.c:1222
+#: builtin/merge.c:1200
msgid "You cannot combine --squash with --no-ff."
msgstr "Du kan inte kombinera --squash med --no-ff."
-#: builtin/merge.c:1230
+#: builtin/merge.c:1208
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
-#: builtin/merge.c:1247
+#: builtin/merge.c:1225
msgid "Squash commit into empty head not supported yet"
msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
-#: builtin/merge.c:1249
+#: builtin/merge.c:1227
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
-#: builtin/merge.c:1254
+#: builtin/merge.c:1232
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - inte något vi kan slå ihop"
-#: builtin/merge.c:1256
+#: builtin/merge.c:1234
msgid "Can merge only exactly one commit into empty head"
-msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."
+msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud"
-#: builtin/merge.c:1312
+#: builtin/merge.c:1268
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."
-#: builtin/merge.c:1315
+#: builtin/merge.c:1271
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."
-#: builtin/merge.c:1318
+#: builtin/merge.c:1274
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Incheckning %s har inte någon GPG-signatur."
-#: builtin/merge.c:1321
+#: builtin/merge.c:1277
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
-#: builtin/merge.c:1383
+#: builtin/merge.c:1339
msgid "refusing to merge unrelated histories"
msgstr "vägrar slå samman orelaterad historik"
-#: builtin/merge.c:1392
+#: builtin/merge.c:1348
msgid "Already up-to-date."
msgstr "Redan à jour."
-#: builtin/merge.c:1402
+#: builtin/merge.c:1358
#, c-format
msgid "Updating %s..%s\n"
msgstr "Uppdaterar %s..%s\n"
-#: builtin/merge.c:1443
+#: builtin/merge.c:1399
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
-#: builtin/merge.c:1450
+#: builtin/merge.c:1406
#, c-format
msgid "Nope.\n"
msgstr "Nej.\n"
-#: builtin/merge.c:1475
+#: builtin/merge.c:1431
msgid "Already up-to-date. Yeeah!"
msgstr "Redan à jour. Toppen!"
-#: builtin/merge.c:1481
+#: builtin/merge.c:1437
msgid "Not possible to fast-forward, aborting."
msgstr "Kan inte snabbspola, avbryter."
-#: builtin/merge.c:1504 builtin/merge.c:1583
+#: builtin/merge.c:1460 builtin/merge.c:1539
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Återspolar trädet till orört...\n"
-#: builtin/merge.c:1508
+#: builtin/merge.c:1464
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Försöker sammanslagningsstrategin %s...\n"
-#: builtin/merge.c:1574
+#: builtin/merge.c:1530
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
-#: builtin/merge.c:1576
+#: builtin/merge.c:1532
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Sammanslagning med strategin %s misslyckades.\n"
-#: builtin/merge.c:1585
+#: builtin/merge.c:1541
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Använder %s för att förbereda lösning för hand.\n"
-#: builtin/merge.c:1597
+#: builtin/merge.c:1553
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
"Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n"
-#: builtin/merge-base.c:29
+#: builtin/merge-base.c:30
msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr "git merge-base [-a | --all] <incheckning> <incheckning>..."
-#: builtin/merge-base.c:30
+#: builtin/merge-base.c:31
msgid "git merge-base [-a | --all] --octopus <commit>..."
msgstr "git merge-base [-a | --all] --octopus <incheckning>..."
-#: builtin/merge-base.c:31
+#: builtin/merge-base.c:32
msgid "git merge-base --independent <commit>..."
msgstr "git merge-base --independent <incheckning>..."
-#: builtin/merge-base.c:32
+#: builtin/merge-base.c:33
msgid "git merge-base --is-ancestor <commit> <commit>"
msgstr "git merge-base --is-ancestor <incheckning> <incheckning>"
-#: builtin/merge-base.c:33
+#: builtin/merge-base.c:34
msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <ref> <incheckning>"
+msgstr "git merge-base --fork-point <ref> [<incheckning>]"
-#: builtin/merge-base.c:217
+#: builtin/merge-base.c:218
msgid "output all common ancestors"
msgstr "skriv ut alla gemensamma anfäder"
-#: builtin/merge-base.c:219
+#: builtin/merge-base.c:220
msgid "find ancestors for a single n-way merge"
msgstr "hitta anfader för enkel n-vägssammanslagning"
-#: builtin/merge-base.c:221
+#: builtin/merge-base.c:222
msgid "list revs not reachable from others"
msgstr "visa revisioner som inte kan nås från andra"
-#: builtin/merge-base.c:223
+#: builtin/merge-base.c:224
msgid "is the first one ancestor of the other?"
msgstr "är den första anfader till den andra?"
-#: builtin/merge-base.c:225
+#: builtin/merge-base.c:226
msgid "find where <commit> forked from reflog of <ref>"
msgstr "se var <incheckning> grenades av från referensloggen från <ref>"
-#: builtin/merge-file.c:8
+#: builtin/merge-file.c:9
msgid ""
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
"<orig-file> <file2>"
@@ -9987,7 +10292,7 @@ msgstr "hanterar inte något annat än en sammanslagning av två huvuden."
#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
#, c-format
msgid "could not resolve ref '%s'"
-msgstr "kunde inte bestämma referensen %s"
+msgstr "kunde inte bestämma referensen ”%s”"
#: builtin/merge-recursive.c:77
#, c-format
@@ -9998,156 +10303,160 @@ msgstr "Slår ihop %s med %s\n"
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
-#: builtin/mktree.c:152
+#: builtin/mktree.c:153
msgid "input is NUL terminated"
msgstr "indata är NUL-terminerad"
-#: builtin/mktree.c:153 builtin/write-tree.c:24
+#: builtin/mktree.c:154 builtin/write-tree.c:25
msgid "allow missing objects"
msgstr "tillåt saknade objekt"
-#: builtin/mktree.c:154
+#: builtin/mktree.c:155
msgid "allow creation of more than one tree"
msgstr "tillåt skapa mer än ett träd"
-#: builtin/mv.c:16
+#: builtin/mv.c:17
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<flaggor>] <källa>... <mål>"
-#: builtin/mv.c:82
+#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "Katalogen %s är i indexet och inte en undermodul?"
-#: builtin/mv.c:84 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:290
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
-#: builtin/mv.c:102
+#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
msgstr "%.*s är i indexet"
-#: builtin/mv.c:124
+#: builtin/mv.c:125
msgid "force move/rename even if target exists"
msgstr "tvinga flytta/ändra namn även om målet finns"
-#: builtin/mv.c:125
+#: builtin/mv.c:126
msgid "skip move/rename errors"
msgstr "hoppa över fel vid flytt/namnändring"
-#: builtin/mv.c:167
+#: builtin/mv.c:168
#, c-format
msgid "destination '%s' is not a directory"
msgstr "destinationen \"%s\" är ingen katalog"
-#: builtin/mv.c:178
+#: builtin/mv.c:179
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"
-#: builtin/mv.c:182
+#: builtin/mv.c:183
msgid "bad source"
msgstr "felaktig källa"
-#: builtin/mv.c:185
+#: builtin/mv.c:186
msgid "can not move directory into itself"
msgstr "kan inte flytta katalog till sig själv"
-#: builtin/mv.c:188
+#: builtin/mv.c:189
msgid "cannot move directory over file"
msgstr "kan inte flytta katalog över fil"
-#: builtin/mv.c:197
+#: builtin/mv.c:198
msgid "source directory is empty"
msgstr "källkatalogen är tom"
-#: builtin/mv.c:222
+#: builtin/mv.c:223
msgid "not under version control"
msgstr "inte versionshanterad"
-#: builtin/mv.c:225
+#: builtin/mv.c:226
msgid "destination exists"
msgstr "destinationen finns"
-#: builtin/mv.c:233
+#: builtin/mv.c:234
#, c-format
msgid "overwriting '%s'"
msgstr "skriver över \"%s\""
-#: builtin/mv.c:236
+#: builtin/mv.c:237
msgid "Cannot overwrite"
msgstr "Kan inte skriva över"
-#: builtin/mv.c:239
+#: builtin/mv.c:240
msgid "multiple sources for the same target"
msgstr "flera källor för samma mål"
-#: builtin/mv.c:241
+#: builtin/mv.c:242
msgid "destination directory does not exist"
msgstr "destinationskatalogen finns inte"
-#: builtin/mv.c:248
+#: builtin/mv.c:249
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, källa=%s, mål=%s"
-#: builtin/mv.c:269
+#: builtin/mv.c:270
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
-#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384
+#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
-#: builtin/name-rev.c:257
+#: builtin/name-rev.c:338
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<flaggor>] <incheckning>..."
-#: builtin/name-rev.c:258
+#: builtin/name-rev.c:339
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<flaggor>] --all"
-#: builtin/name-rev.c:259
+#: builtin/name-rev.c:340
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<flaggor>] --stdin"
-#: builtin/name-rev.c:311
+#: builtin/name-rev.c:395
msgid "print only names (no SHA-1)"
msgstr "skriv endast namn (ingen SHA-1)"
-#: builtin/name-rev.c:312
+#: builtin/name-rev.c:396
msgid "only use tags to name the commits"
msgstr "använd endast taggar för att namnge incheckningar"
-#: builtin/name-rev.c:314
+#: builtin/name-rev.c:398
msgid "only use refs matching <pattern>"
msgstr "använd endast referenser som motsvarar <mönster>"
-#: builtin/name-rev.c:316
+#: builtin/name-rev.c:400
+msgid "ignore refs matching <pattern>"
+msgstr "ignorera referenser som motsvarar <mönster>"
+
+#: builtin/name-rev.c:402
msgid "list all commits reachable from all refs"
msgstr "lista alla incheckningar som kan nås alla referenser"
-#: builtin/name-rev.c:317
+#: builtin/name-rev.c:403
msgid "read from stdin"
msgstr "läs från standard in"
-#: builtin/name-rev.c:318
+#: builtin/name-rev.c:404
msgid "allow to print `undefined` names (default)"
msgstr "tillåt att skriva \"odefinierade\" namn (standard)"
-#: builtin/name-rev.c:324
+#: builtin/name-rev.c:410
msgid "dereference tags in the input (internal use)"
msgstr "avreferera taggar i indata (används internt)"
-#: builtin/notes.c:25
+#: builtin/notes.c:26
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]"
-#: builtin/notes.c:26
+#: builtin/notes.c:27
msgid ""
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
"| (-c | -C) <object>] [<object>]"
@@ -10155,12 +10464,12 @@ msgstr ""
"git notes [--ref <anteckningsref>] add [-f] [--allow-empty] [-m <medd> | -F "
"<fil> | (-c | -C) <objekt>] [<objekt>]"
-#: builtin/notes.c:27
+#: builtin/notes.c:28
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr ""
"git notes [--ref <anteckningsref>] copy [-f] <från-objekt> <till-objekt>"
-#: builtin/notes.c:28
+#: builtin/notes.c:29
msgid ""
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
"(-c | -C) <object>] [<object>]"
@@ -10168,204 +10477,205 @@ msgstr ""
"git notes [--ref <anteckningsref>] append [--allow-empty] [-m <medd> | -F "
"<fil> | (-c | -C) <objekt>] [<objekt>]"
-#: builtin/notes.c:29
+#: builtin/notes.c:30
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr "git notes [--ref <anteckningsref>] edit [--allow-empty] [<objekt>]"
-#: builtin/notes.c:30
+#: builtin/notes.c:31
msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr "git notes [--ref <anteckningsref>] show [<objekt>]"
-#: builtin/notes.c:31
+#: builtin/notes.c:32
msgid ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi>] "
"<anteckningsref>"
-#: builtin/notes.c:32
+#: builtin/notes.c:33
msgid "git notes merge --commit [-v | -q]"
msgstr "git notes merge --commit [-v | -q]"
-#: builtin/notes.c:33
+#: builtin/notes.c:34
msgid "git notes merge --abort [-v | -q]"
msgstr "git notes merge --abort [-v | -q]"
-#: builtin/notes.c:34
+#: builtin/notes.c:35
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]"
-#: builtin/notes.c:35
+#: builtin/notes.c:36
msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
msgstr "git notes [--ref <anteckningsref>] prune [-n | -v]"
-#: builtin/notes.c:36
+#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] get-ref"
msgstr "git notes [--ref <anteckningsref>] get-ref"
-#: builtin/notes.c:41
+#: builtin/notes.c:42
msgid "git notes [list [<object>]]"
msgstr "git notes [list [<objekt>]]"
-#: builtin/notes.c:46
+#: builtin/notes.c:47
msgid "git notes add [<options>] [<object>]"
msgstr "git notes add [<flaggor>] [<objekt>]"
-#: builtin/notes.c:51
+#: builtin/notes.c:52
msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr "git notes copy [<flaggor>] <från-objekt> <till-objekt>"
-#: builtin/notes.c:52
+#: builtin/notes.c:53
msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr "git notes copy --stdin [<från-objekt> <till-objekt>]..."
-#: builtin/notes.c:57
+#: builtin/notes.c:58
msgid "git notes append [<options>] [<object>]"
msgstr "git notes append [<flaggor>] [<objekt>]"
-#: builtin/notes.c:62
+#: builtin/notes.c:63
msgid "git notes edit [<object>]"
msgstr "git notes edit [<objekt>]"
-#: builtin/notes.c:67
+#: builtin/notes.c:68
msgid "git notes show [<object>]"
msgstr "git notes show [<objekt>]"
-#: builtin/notes.c:72
+#: builtin/notes.c:73
msgid "git notes merge [<options>] <notes-ref>"
msgstr "git notes merge [<flaggor>] <anteckningsref>"
-#: builtin/notes.c:73
+#: builtin/notes.c:74
msgid "git notes merge --commit [<options>]"
msgstr "git notes merge --commit [<flaggor>]"
-#: builtin/notes.c:74
+#: builtin/notes.c:75
msgid "git notes merge --abort [<options>]"
msgstr "git notes merge --abort [<flaggor>]"
-#: builtin/notes.c:79
+#: builtin/notes.c:80
msgid "git notes remove [<object>]"
msgstr "git notes remove [<objekt>]"
-#: builtin/notes.c:84
+#: builtin/notes.c:85
msgid "git notes prune [<options>]"
msgstr "git notes prune [<flaggor>]"
-#: builtin/notes.c:89
+#: builtin/notes.c:90
msgid "git notes get-ref"
msgstr "git notes get-ref"
-#: builtin/notes.c:94
+#: builtin/notes.c:95
msgid "Write/edit the notes for the following object:"
msgstr "Skriv/redigera anteckningar för följande objekt:"
-#: builtin/notes.c:147
+#: builtin/notes.c:148
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "kunde inte starta \"show\" för objektet \"%s\""
-#: builtin/notes.c:151
+#: builtin/notes.c:152
msgid "could not read 'show' output"
msgstr "kunde inte läsa utdata från \"show\""
-#: builtin/notes.c:159
+#: builtin/notes.c:160
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "kunde inte avsluta \"show\" för objektet \"%s\""
-#: builtin/notes.c:194
+#: builtin/notes.c:195
msgid "please supply the note contents using either -m or -F option"
msgstr "ange innehåll för anteckningen med antingen -m eller -F"
-#: builtin/notes.c:203
+#: builtin/notes.c:204
msgid "unable to write note object"
msgstr "kunde inte skriva anteckningsobjekt"
-#: builtin/notes.c:205
+#: builtin/notes.c:206
#, c-format
msgid "the note contents have been left in %s"
msgstr "anteckningens innehåll har lämnats kvar i %s"
-#: builtin/notes.c:233 builtin/tag.c:460
+#: builtin/notes.c:234 builtin/tag.c:517
#, c-format
msgid "cannot read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: builtin/notes.c:235 builtin/tag.c:463
+#: builtin/notes.c:236 builtin/tag.c:520
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%s\""
-#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
-#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
-#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
+#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
+#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
+#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "kunde inte slå upp \"%s\" som en giltig referens."
-#: builtin/notes.c:257
+#: builtin/notes.c:258
#, c-format
msgid "failed to read object '%s'."
msgstr "kunde inte läsa objektet \"%s\"."
-#: builtin/notes.c:261
+#: builtin/notes.c:262
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"."
-#: builtin/notes.c:301
+#: builtin/notes.c:302
#, c-format
msgid "malformed input line: '%s'."
msgstr "felaktig indatarad: \"%s\"."
-#: builtin/notes.c:316
+#: builtin/notes.c:317
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\""
-#. TRANSLATORS: the first %s will be replaced by a
-#. git notes command: 'add', 'merge', 'remove', etc.
-#: builtin/notes.c:345
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:348
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)"
-#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
-#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
-#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
+#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
+#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
+#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
msgid "too many parameters"
msgstr "för många parametrar"
-#: builtin/notes.c:378 builtin/notes.c:665
+#: builtin/notes.c:381 builtin/notes.c:667
#, c-format
msgid "no note found for object %s."
msgstr "inga anteckningar hittades för objektet %s."
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "note contents as a string"
msgstr "anteckningsinnehåll som sträng"
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "note contents in a file"
msgstr "anteckningsinnehåll i en fil"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:408 builtin/notes.c:571
msgid "reuse and edit specified note object"
msgstr "återanvänd och redigera angivet anteckningsobjekt"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:411 builtin/notes.c:574
msgid "reuse specified note object"
msgstr "återanvänd angivet anteckningsobjekt"
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:414 builtin/notes.c:577
msgid "allow storing empty note"
msgstr "tillåt lagra tom anteckning"
-#: builtin/notes.c:412 builtin/notes.c:483
+#: builtin/notes.c:415 builtin/notes.c:486
msgid "replace existing notes"
msgstr "ersätt befintliga anteckningar"
-#: builtin/notes.c:437
+#: builtin/notes.c:440
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10374,29 +10684,29 @@ msgstr ""
"Kan inte lägga till anteckningar. Hittade befintliga anteckningar för "
"objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar"
-#: builtin/notes.c:452 builtin/notes.c:531
+#: builtin/notes.c:455 builtin/notes.c:534
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Skriver över befintliga anteckningar för objektet %s\n"
-#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
+#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
#, c-format
msgid "Removing note for object %s\n"
msgstr "Tar bort anteckning för objektet %s\n"
-#: builtin/notes.c:484
+#: builtin/notes.c:487
msgid "read objects from stdin"
msgstr "läs objekt från standard in"
-#: builtin/notes.c:486
+#: builtin/notes.c:489
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"
-#: builtin/notes.c:504
+#: builtin/notes.c:507
msgid "too few parameters"
msgstr "för få parametrar"
-#: builtin/notes.c:525
+#: builtin/notes.c:528
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10405,12 +10715,12 @@ msgstr ""
"Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "
"%s. Använd \"-f\" för att skriva över befintliga anteckningar"
-#: builtin/notes.c:537
+#: builtin/notes.c:540
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "anteckningar på källobjektet %s saknas. Kan inte kopiera."
-#: builtin/notes.c:589
+#: builtin/notes.c:592
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -10419,52 +10729,52 @@ msgstr ""
"Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"
"Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"
-#: builtin/notes.c:685
+#: builtin/notes.c:687
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:687
+#: builtin/notes.c:689
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "misslyckades ta bort referensen NOTES_MERGE_REF"
-#: builtin/notes.c:689
+#: builtin/notes.c:691
msgid "failed to remove 'git notes merge' worktree"
msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\""
-#: builtin/notes.c:709
+#: builtin/notes.c:711
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:711
+#: builtin/notes.c:713
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:713
+#: builtin/notes.c:715
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:726
+#: builtin/notes.c:728
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "misslyckades bestämma NOTES_MERGE_REF"
-#: builtin/notes.c:729
+#: builtin/notes.c:731
msgid "failed to finalize notes merge"
msgstr "misslyckades färdigställa sammanslagning av anteckningar"
-#: builtin/notes.c:755
+#: builtin/notes.c:757
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "okänd sammanslagningsstrategi för anteckningar: %s"
-#: builtin/notes.c:771
+#: builtin/notes.c:773
msgid "General options"
msgstr "Allmänna flaggor"
-#: builtin/notes.c:773
+#: builtin/notes.c:775
msgid "Merge options"
msgstr "Flaggor för sammanslagning"
-#: builtin/notes.c:775
+#: builtin/notes.c:777
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -10472,48 +10782,48 @@ msgstr ""
"läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:777
+#: builtin/notes.c:779
msgid "Committing unmerged notes"
msgstr "Checkar in ej sammanslagna anteckningar"
-#: builtin/notes.c:779
+#: builtin/notes.c:781
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
"färdigställ sammanslagning av anteckningar genom att checka in ej "
"sammanslagna anteckningar"
-#: builtin/notes.c:781
+#: builtin/notes.c:783
msgid "Aborting notes merge resolution"
msgstr "Avbryt lösning av sammanslagning av anteckningar"
-#: builtin/notes.c:783
+#: builtin/notes.c:785
msgid "abort notes merge"
msgstr "avbryt sammanslagning av anteckningar"
-#: builtin/notes.c:794
+#: builtin/notes.c:796
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "kan inte blanda --commit, --abort eller -s/--strategy"
-#: builtin/notes.c:799
+#: builtin/notes.c:801
msgid "must specify a notes ref to merge"
msgstr "måste ange en antecknings-referens att slå ihop"
-#: builtin/notes.c:823
+#: builtin/notes.c:825
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "okänd -s/--strategy: %s"
-#: builtin/notes.c:860
+#: builtin/notes.c:862
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "sammanslagning av anteckningar till %s är redan igångsatt på %s"
-#: builtin/notes.c:863
+#: builtin/notes.c:865
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)"
-#: builtin/notes.c:865
+#: builtin/notes.c:867
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10524,221 +10834,221 @@ msgstr ""
"%s och checka in resultatet med \"git notes merge --commit\", eller avbryt "
"sammanslagningen med \"git notes merge --abort\".\n"
-#: builtin/notes.c:887
+#: builtin/notes.c:889
#, c-format
msgid "Object %s has no note\n"
msgstr "Objektet %s har ingen anteckning\n"
-#: builtin/notes.c:899
+#: builtin/notes.c:901
msgid "attempt to remove non-existent note is not an error"
msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"
-#: builtin/notes.c:902
+#: builtin/notes.c:904
msgid "read object names from the standard input"
msgstr "läs objektnamn från standard in"
-#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
msgid "do not remove, show only"
msgstr "ta inte bort, bara visa"
-#: builtin/notes.c:941
+#: builtin/notes.c:943
msgid "report pruned notes"
msgstr "rapportera borttagna anteckningar"
-#: builtin/notes.c:983
+#: builtin/notes.c:985
msgid "notes-ref"
msgstr "anteckningar-ref"
-#: builtin/notes.c:984
+#: builtin/notes.c:986
msgid "use notes from <notes-ref>"
msgstr "använd anteckningar från <anteckningsref>"
-#: builtin/notes.c:1019
+#: builtin/notes.c:1021
#, c-format
msgid "unknown subcommand: %s"
msgstr "okänt underkommando: %s"
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]"
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]"
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
#, c-format
msgid "deflate error (%d)"
msgstr "fel i deflate (%d)"
-#: builtin/pack-objects.c:766
+#: builtin/pack-objects.c:776
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit"
-#: builtin/pack-objects.c:779
+#: builtin/pack-objects.c:789
msgid "Writing objects"
msgstr "Skriver objekt"
-#: builtin/pack-objects.c:1068
+#: builtin/pack-objects.c:1069
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"
-#: builtin/pack-objects.c:2344
+#: builtin/pack-objects.c:2434
msgid "Compressing objects"
msgstr "Komprimerar objekt"
-#: builtin/pack-objects.c:2747
+#: builtin/pack-objects.c:2843
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:2751
+#: builtin/pack-objects.c:2847
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:2781
+#: builtin/pack-objects.c:2877
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/pack-objects.c:2783
+#: builtin/pack-objects.c:2879
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/pack-objects.c:2785
+#: builtin/pack-objects.c:2881
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
-#: builtin/pack-objects.c:2788
+#: builtin/pack-objects.c:2884
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsindikatorn visas"
-#: builtin/pack-objects.c:2789
+#: builtin/pack-objects.c:2885
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2790
+#: builtin/pack-objects.c:2886
msgid "write the pack index file in the specified idx format version"
msgstr "skriv paketindexfilen i angiven indexformatversion"
-#: builtin/pack-objects.c:2793
+#: builtin/pack-objects.c:2889
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:2795
+#: builtin/pack-objects.c:2891
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorera lånade objekt från alternativa objektlager"
-#: builtin/pack-objects.c:2797
+#: builtin/pack-objects.c:2893
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:2799
+#: builtin/pack-objects.c:2895
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2897
msgid "limit pack window by memory in addition to object limit"
msgstr "begränsa paketfönster efter minne förutom objektgräns"
-#: builtin/pack-objects.c:2803
+#: builtin/pack-objects.c:2899
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "maximal längd på deltakedja tillåten i slutligt paket"
-#: builtin/pack-objects.c:2805
+#: builtin/pack-objects.c:2901
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2903
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:2809
+#: builtin/pack-objects.c:2905
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:2811
+#: builtin/pack-objects.c:2907
msgid "use threads when searching for best delta matches"
msgstr "använd trådar vid sökning efter bästa deltaträffar"
-#: builtin/pack-objects.c:2813
+#: builtin/pack-objects.c:2909
msgid "do not create an empty pack output"
msgstr "försök inte skapa tom paketutdata"
-#: builtin/pack-objects.c:2815
+#: builtin/pack-objects.c:2911
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:2817
+#: builtin/pack-objects.c:2913
msgid "limit the objects to those that are not yet packed"
msgstr "begränsa objekt till de som ännu inte packats"
-#: builtin/pack-objects.c:2820
+#: builtin/pack-objects.c:2916
msgid "include objects reachable from any reference"
msgstr "inkludera objekt som kan nås från någon referens"
-#: builtin/pack-objects.c:2823
+#: builtin/pack-objects.c:2919
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:2826
+#: builtin/pack-objects.c:2922
msgid "include objects referred to by the index"
msgstr "inkludera objekt som refereras från indexet"
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2925
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:2831
+#: builtin/pack-objects.c:2927
msgid "include tag objects that refer to objects to be packed"
msgstr "inkludera taggobjekt som refererar objekt som skall packas"
-#: builtin/pack-objects.c:2833
+#: builtin/pack-objects.c:2929
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:2835
+#: builtin/pack-objects.c:2931
msgid "pack loose unreachable objects"
msgstr "packa lösa onåbara objekt"
-#: builtin/pack-objects.c:2837
+#: builtin/pack-objects.c:2933
msgid "unpack unreachable objects newer than <time>"
msgstr "packa upp onåbara objekt nyare än <tid>"
-#: builtin/pack-objects.c:2840
+#: builtin/pack-objects.c:2936
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:2842
+#: builtin/pack-objects.c:2938
msgid "create packs suitable for shallow fetches"
msgstr "skapa packfiler lämpade för grunda hämtningar"
-#: builtin/pack-objects.c:2844
+#: builtin/pack-objects.c:2940
msgid "ignore packs that have companion .keep file"
msgstr "ignorera paket som har tillhörande .keep-fil"
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:2942
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:2848
+#: builtin/pack-objects.c:2944
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
-#: builtin/pack-objects.c:2850
+#: builtin/pack-objects.c:2946
msgid "use a bitmap index if available to speed up counting objects"
msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"
-#: builtin/pack-objects.c:2852
+#: builtin/pack-objects.c:2948
msgid "write a bitmap index together with the pack index"
msgstr "använd bitkartindex tillsammans med packindexet"
-#: builtin/pack-objects.c:2979
+#: builtin/pack-objects.c:3075
msgid "Counting objects"
msgstr "Räknar objekt"
@@ -10778,45 +11088,49 @@ msgstr "låt tid gå ut för objekt äldre än <tid>"
msgid "cannot prune in a precious-objects repo"
msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
-#: builtin/pull.c:51 builtin/pull.c:53
+#: builtin/pull.c:54 builtin/pull.c:56
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Felaktigt värde för %s: %s"
-#: builtin/pull.c:73
+#: builtin/pull.c:76
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/pull.c:121
+#: builtin/pull.c:124
+msgid "control for recursive fetching of submodules"
+msgstr "styrning för rekursiv hämtning av undermoduler"
+
+#: builtin/pull.c:128
msgid "Options related to merging"
msgstr "Alternativ gällande sammanslagning"
-#: builtin/pull.c:124
+#: builtin/pull.c:131
msgid "incorporate changes by rebasing rather than merging"
msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
-#: builtin/pull.c:148 builtin/revert.c:101
+#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "tillåt snabbspolning"
-#: builtin/pull.c:157
+#: builtin/pull.c:164
msgid "automatically stash/stash pop before and after rebase"
msgstr "utför automatiskt stash/stash pop före och efter ombasering"
-#: builtin/pull.c:173
+#: builtin/pull.c:180
msgid "Options related to fetching"
msgstr "Alternativ gällande hämtningar"
-#: builtin/pull.c:195
+#: builtin/pull.c:198
msgid "number of submodules pulled in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/pull.c:284
+#: builtin/pull.c:287
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Felaktigt värde för pull.ff: %s"
-#: builtin/pull.c:397
+#: builtin/pull.c:399
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -10824,14 +11138,14 @@ msgstr ""
"Det finns ingen kandidat för ombasering bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:399
+#: builtin/pull.c:401
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Det finns ingen kandidat för sammanslagning bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:400
+#: builtin/pull.c:402
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -10839,7 +11153,7 @@ msgstr ""
"Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
"motsvarade något i fjärränden."
-#: builtin/pull.c:403
+#: builtin/pull.c:405
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -10850,42 +11164,42 @@ msgstr ""
"gren. Eftersom det inte är den fjärr som är konfigurerad som\n"
"standard för aktuell gren måste du ange en gren på kommandoraden."
-#: builtin/pull.c:408 git-parse-remote.sh:73
+#: builtin/pull.c:410 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Du är inte på någon gren för närvarande."
-#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Ange vilken gren du vill ombasera mot."
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
+#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Ange vilken gren du vill slå samman med."
-#: builtin/pull.c:413 builtin/pull.c:428
+#: builtin/pull.c:415 builtin/pull.c:430
msgid "See git-pull(1) for details."
msgstr "Se git-pull(1) för detaljer."
-#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
+#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<fjärr>"
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
+#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<gren>"
-#: builtin/pull.c:423 git-parse-remote.sh:75
+#: builtin/pull.c:425 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Det finns ingen spårningsinformation för aktuell gren."
-#: builtin/pull.c:432 git-parse-remote.sh:95
+#: builtin/pull.c:434 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:"
-#: builtin/pull.c:437
+#: builtin/pull.c:439
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -10894,27 +11208,27 @@ msgstr ""
"Dina inställningar anger sammanslagning med referensen \"%s\"\n"
"från fjärren, men någon sådan referens togs inte emot."
-#: builtin/pull.c:754
+#: builtin/pull.c:792
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorera --verify-signatures för ombasering"
-#: builtin/pull.c:801
+#: builtin/pull.c:840
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash är endast giltig med --rebase."
-#: builtin/pull.c:809
+#: builtin/pull.c:848
msgid "Updating an unborn branch with changes added to the index."
msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet."
-#: builtin/pull.c:812
+#: builtin/pull.c:851
msgid "pull with rebase"
msgstr "pull med ombasering"
-#: builtin/pull.c:813
+#: builtin/pull.c:852
msgid "please commit or stash them."
msgstr "checka in eller använd \"stash\" på dem."
-#: builtin/pull.c:838
+#: builtin/pull.c:877
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -10925,7 +11239,7 @@ msgstr ""
"snabbspolar din arbetskatalog från\n"
"incheckningen %s."
-#: builtin/pull.c:843
+#: builtin/pull.c:882
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -10942,27 +11256,31 @@ msgstr ""
"$ git reset --hard\n"
"för att återgå."
-#: builtin/pull.c:858
+#: builtin/pull.c:897
msgid "Cannot merge multiple branches into empty head."
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
-#: builtin/pull.c:862
+#: builtin/pull.c:901
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
-#: builtin/push.c:16
+#: builtin/pull.c:908
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
+
+#: builtin/push.c:17
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/push.c:89
+#: builtin/push.c:90
msgid "tag shorthand without <tag>"
msgstr "taggförkortning utan <tagg>"
-#: builtin/push.c:99
+#: builtin/push.c:100
msgid "--delete only accepts plain target ref names"
msgstr "--delete godtar endast enkla målreferensnamn"
-#: builtin/push.c:143
+#: builtin/push.c:144
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -10971,7 +11289,7 @@ msgstr ""
"För att välja ett av alternativen permanent, se push.default i \"git help "
"config\"."
-#: builtin/push.c:146
+#: builtin/push.c:147
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -10996,7 +11314,7 @@ msgstr ""
" git push %s %s\n"
"%s"
-#: builtin/push.c:161
+#: builtin/push.c:162
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -11011,7 +11329,7 @@ msgstr ""
"\n"
" git push %s HEAD:<namn-på-fjärrgren>\n"
-#: builtin/push.c:175
+#: builtin/push.c:176
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -11024,12 +11342,12 @@ msgstr ""
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:183
+#: builtin/push.c:184
#, 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:186
+#: builtin/push.c:187
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -11040,14 +11358,14 @@ 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:245
+#: builtin/push.c:246
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:252
+#: builtin/push.c:253
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -11059,7 +11377,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:258
+#: builtin/push.c:259
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"
@@ -11071,7 +11389,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:264
+#: builtin/push.c:265
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"
@@ -11085,11 +11403,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:271
+#: builtin/push.c:272
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:274
+#: builtin/push.c:275
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"
@@ -11100,22 +11418,22 @@ msgstr ""
"pekar på något som inte är en incheckning, utan att använda flaggan\n"
"\"--force\".\n"
-#: builtin/push.c:334
+#: builtin/push.c:335
#, c-format
msgid "Pushing to %s\n"
msgstr "Sänder till %s\n"
-#: builtin/push.c:338
+#: builtin/push.c:339
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "misslyckades sända vissa referenser till \"%s\""
-#: builtin/push.c:369
+#: builtin/push.c:370
#, c-format
msgid "bad repository '%s'"
msgstr "felaktigt arkiv \"%s\""
-#: builtin/push.c:370
+#: builtin/push.c:371
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -11136,118 +11454,118 @@ msgstr ""
"\n"
" git push <namn>\n"
-#: builtin/push.c:388
+#: builtin/push.c:389
msgid "--all and --tags are incompatible"
msgstr "--all och --tags är inkompatibla"
-#: builtin/push.c:389
+#: builtin/push.c:390
msgid "--all can't be combined with refspecs"
msgstr "--all kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:394
+#: builtin/push.c:395
msgid "--mirror and --tags are incompatible"
msgstr "--mirror och --tags är inkompatibla"
-#: builtin/push.c:395
+#: builtin/push.c:396
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:400
+#: builtin/push.c:401
msgid "--all and --mirror are incompatible"
msgstr "--all och --mirror är inkompatibla"
-#: builtin/push.c:518
+#: builtin/push.c:523
msgid "repository"
msgstr "arkiv"
-#: builtin/push.c:519 builtin/send-pack.c:161
+#: builtin/push.c:524 builtin/send-pack.c:163
msgid "push all refs"
msgstr "sänd alla referenser"
-#: builtin/push.c:520 builtin/send-pack.c:163
+#: builtin/push.c:525 builtin/send-pack.c:165
msgid "mirror all refs"
msgstr "spegla alla referenser"
-#: builtin/push.c:522
+#: builtin/push.c:527
msgid "delete refs"
msgstr "ta bort referenser"
-#: builtin/push.c:523
+#: builtin/push.c:528
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:526 builtin/send-pack.c:164
+#: builtin/push.c:531 builtin/send-pack.c:166
msgid "force updates"
msgstr "tvinga uppdateringar"
-#: builtin/push.c:528 builtin/send-pack.c:175
+#: builtin/push.c:533 builtin/send-pack.c:180
msgid "refname>:<expect"
msgstr "refnamn>:<förvänta"
-#: builtin/push.c:529 builtin/send-pack.c:176
+#: builtin/push.c:534 builtin/send-pack.c:181
msgid "require old value of ref to be at this value"
msgstr "kräv att ref:s tidigare värde är detta"
-#: builtin/push.c:532
+#: builtin/push.c:537
msgid "control recursive pushing of submodules"
msgstr "styr rekursiv insändning av undermoduler"
-#: builtin/push.c:534 builtin/send-pack.c:169
+#: builtin/push.c:539 builtin/send-pack.c:174
msgid "use thin pack"
msgstr "använd tunna paket"
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158
-#: builtin/send-pack.c:159
+#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/send-pack.c:161
msgid "receive pack program"
msgstr "program för att ta emot paket"
-#: builtin/push.c:537
+#: builtin/push.c:542
msgid "set upstream for git pull/status"
msgstr "ställ in uppström för git pull/status"
-#: builtin/push.c:540
+#: builtin/push.c:545
msgid "prune locally removed refs"
msgstr "ta bort lokalt borttagna referenser"
-#: builtin/push.c:542
+#: builtin/push.c:547
msgid "bypass pre-push hook"
msgstr "förbigå pre-push-krok"
-#: builtin/push.c:543
+#: builtin/push.c:548
msgid "push missing but relevant tags"
msgstr "sänd in saknade men relevanta taggar"
-#: builtin/push.c:546 builtin/send-pack.c:166
+#: builtin/push.c:551 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr "GPG-signera insändningen"
-#: builtin/push.c:548 builtin/send-pack.c:170
+#: builtin/push.c:553 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr "begär atomiska transaktioner på fjärrsidan"
-#: builtin/push.c:549
+#: builtin/push.c:554 builtin/send-pack.c:171
msgid "server-specific"
msgstr "serverspecifik"
-#: builtin/push.c:549
+#: builtin/push.c:554 builtin/send-pack.c:172
msgid "option to transmit"
msgstr ""
"inget att checka in\n"
"flagga att sända"
-#: builtin/push.c:563
+#: builtin/push.c:568
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete är inkompatibel med --all, --mirror och --tags"
-#: builtin/push.c:565
+#: builtin/push.c:570
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kan inte användas utan referenser"
-#: builtin/push.c:584
+#: builtin/push.c:589
msgid "push options must not have new line characters"
msgstr "push-flaggor kan inte innehålla radbrytning"
-#: builtin/read-tree.c:37
+#: builtin/read-tree.c:40
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -11257,75 +11575,87 @@ msgstr ""
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])"
-#: builtin/read-tree.c:110
+#: builtin/read-tree.c:121
msgid "write resulting index to <file>"
msgstr "skriv resulterande index till <fil>"
-#: builtin/read-tree.c:113
+#: builtin/read-tree.c:124
msgid "only empty the index"
msgstr "töm bara indexet"
-#: builtin/read-tree.c:115
+#: builtin/read-tree.c:126
msgid "Merging"
msgstr "Sammanslagning"
-#: builtin/read-tree.c:117
+#: builtin/read-tree.c:128
msgid "perform a merge in addition to a read"
msgstr "utför en sammanslagning i tillägg till en läsning"
-#: builtin/read-tree.c:119
+#: builtin/read-tree.c:130
msgid "3-way merge if no file level merging required"
msgstr "3-vägssammanslagning om sammanslagning på filnivå ej krävs"
-#: builtin/read-tree.c:121
+#: builtin/read-tree.c:132
msgid "3-way merge in presence of adds and removes"
msgstr "3-vägssammanslagning när det finns tillägg och borttagningar"
-#: builtin/read-tree.c:123
+#: builtin/read-tree.c:134
msgid "same as -m, but discard unmerged entries"
msgstr "som -m, men kasta bort ej sammanslagna poster"
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:135
msgid "<subdirectory>/"
msgstr "<underkatalog>/"
-#: builtin/read-tree.c:125
+#: builtin/read-tree.c:136
msgid "read the tree into the index under <subdirectory>/"
msgstr "läs in trädet i indexet under <underkatalog>/"
-#: builtin/read-tree.c:128
+#: builtin/read-tree.c:139
msgid "update working tree with merge result"
msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen"
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:141
msgid "gitignore"
msgstr "gitignore"
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:142
msgid "allow explicitly ignored files to be overwritten"
msgstr "tillåt explicit ignorerade filer att skrivas över"
-#: builtin/read-tree.c:134
+#: builtin/read-tree.c:145
msgid "don't check the working tree after merging"
msgstr "kontrollera inte arbetskatalogen efter sammanslagning"
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:146
msgid "don't update the index or the work tree"
msgstr "uppdatera inte indexet eller arbetskatalogen"
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:148
msgid "skip applying sparse checkout filter"
msgstr "hoppa över att applicera filter för gles utcheckning"
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:150
msgid "debug unpack-trees"
msgstr "felsök unpack-trees"
-#: builtin/receive-pack.c:26
+#: builtin/rebase--helper.c:8
+msgid "git rebase--helper [<options>]"
+msgstr "git rebase--helper [<flaggor>]"
+
+#: builtin/rebase--helper.c:20
+msgid "continue rebase"
+msgstr "fortsätt ombasering"
+
+#: builtin/rebase--helper.c:22
+msgid "abort rebase"
+msgstr "avbryt ombasering"
+
+#: builtin/receive-pack.c:28
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-katalog>"
-#: builtin/receive-pack.c:793
+#: builtin/receive-pack.c:838
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -11355,7 +11685,7 @@ msgstr ""
"För att undvika detta meddelande och fortfarande behålla det\n"
"normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"."
-#: builtin/receive-pack.c:813
+#: builtin/receive-pack.c:858
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -11376,29 +11706,29 @@ msgstr ""
"\n"
"För att undvika detta meddelande kan du sätta det till \"refuse\"."
-#: builtin/receive-pack.c:1883
+#: builtin/receive-pack.c:1933
msgid "quiet"
msgstr "tyst"
-#: builtin/receive-pack.c:1897
+#: builtin/receive-pack.c:1947
msgid "You must specify a directory."
msgstr "Du måste ange en katalog."
-#: builtin/reflog.c:423
+#: builtin/reflog.c:424
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
-#: builtin/reflog.c:540 builtin/reflog.c:545
+#: builtin/reflog.c:541 builtin/reflog.c:546
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "\"%s\" är inte en giltig tidsstämpel"
-#: builtin/remote.c:12
+#: builtin/remote.c:13
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
-#: builtin/remote.c:13
+#: builtin/remote.c:14
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
@@ -11406,82 +11736,82 @@ msgstr ""
"git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <namn> <url>"
-#: builtin/remote.c:14 builtin/remote.c:34
+#: builtin/remote.c:15 builtin/remote.c:35
msgid "git remote rename <old> <new>"
msgstr "git remote rename <gammal> <ny>"
-#: builtin/remote.c:15 builtin/remote.c:39
+#: builtin/remote.c:16 builtin/remote.c:40
msgid "git remote remove <name>"
msgstr "git remote remove <namn>"
-#: builtin/remote.c:16 builtin/remote.c:44
+#: builtin/remote.c:17 builtin/remote.c:45
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
-#: builtin/remote.c:17
+#: builtin/remote.c:18
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <namn>"
-#: builtin/remote.c:18
+#: builtin/remote.c:19
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <namn>"
-#: builtin/remote.c:19
+#: builtin/remote.c:20
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr ""
"git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjärr>)...]"
-#: builtin/remote.c:20
+#: builtin/remote.c:21
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <namn> <gren>..."
-#: builtin/remote.c:21 builtin/remote.c:70
+#: builtin/remote.c:22 builtin/remote.c:71
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <namn>"
-#: builtin/remote.c:22 builtin/remote.c:75
+#: builtin/remote.c:23 builtin/remote.c:76
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]"
-#: builtin/remote.c:23 builtin/remote.c:76
+#: builtin/remote.c:24 builtin/remote.c:77
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <namn> <nyurl>"
-#: builtin/remote.c:24 builtin/remote.c:77
+#: builtin/remote.c:25 builtin/remote.c:78
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <namn> <url>"
-#: builtin/remote.c:29
+#: builtin/remote.c:30
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<flaggor>] <namn> <url>"
-#: builtin/remote.c:49
+#: builtin/remote.c:50
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <namn> <gren>..."
-#: builtin/remote.c:50
+#: builtin/remote.c:51
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <namn> <gren>..."
-#: builtin/remote.c:55
+#: builtin/remote.c:56
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<flaggor>] <namn>"
-#: builtin/remote.c:60
+#: builtin/remote.c:61
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<flaggor>] <namn>"
-#: builtin/remote.c:65
+#: builtin/remote.c:66
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..."
-#: builtin/remote.c:94
+#: builtin/remote.c:95
#, c-format
msgid "Updating %s"
msgstr "Uppdaterar %s"
-#: builtin/remote.c:126
+#: builtin/remote.c:127
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
@@ -11489,86 +11819,86 @@ msgstr ""
"--mirror är farlig och föråldrad; använd\n"
"\t --mirror=fetch eller --mirror=push istället"
-#: builtin/remote.c:143
+#: builtin/remote.c:144
#, c-format
msgid "unknown mirror argument: %s"
msgstr "okänt argument till mirror: %s"
-#: builtin/remote.c:159
+#: builtin/remote.c:160
msgid "fetch the remote branches"
msgstr "hämta fjärrgrenarna"
-#: builtin/remote.c:161
+#: builtin/remote.c:162
msgid "import all tags and associated objects when fetching"
msgstr "importera alla taggar och associerade objekt vid hämtning"
-#: builtin/remote.c:164
+#: builtin/remote.c:165
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "eller hämta inte några taggar alls (--no-tags)"
-#: builtin/remote.c:166
+#: builtin/remote.c:167
msgid "branch(es) to track"
msgstr "gren(ar) att spåra"
-#: builtin/remote.c:167
+#: builtin/remote.c:168
msgid "master branch"
msgstr "huvudgren"
-#: builtin/remote.c:168
+#: builtin/remote.c:169
msgid "push|fetch"
msgstr "push|fetch"
-#: builtin/remote.c:169
+#: builtin/remote.c:170
msgid "set up remote as a mirror to push to or fetch from"
msgstr "ställ in arkiv som spegel att sända eller ta emot från"
-#: builtin/remote.c:181
+#: builtin/remote.c:182
msgid "specifying a master branch makes no sense with --mirror"
msgstr "att ange en master-gren ger ingen mening med --mirror"
-#: builtin/remote.c:183
+#: builtin/remote.c:184
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar"
-#: builtin/remote.c:190 builtin/remote.c:629
+#: builtin/remote.c:191 builtin/remote.c:630
#, c-format
msgid "remote %s already exists."
msgstr "fjärrarkivet %s finns redan."
-#: builtin/remote.c:194 builtin/remote.c:633
+#: builtin/remote.c:195 builtin/remote.c:634
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
-#: builtin/remote.c:234
+#: builtin/remote.c:235
#, c-format
msgid "Could not setup master '%s'"
msgstr "Kunde inte skapa master \"%s\""
-#: builtin/remote.c:336
+#: builtin/remote.c:337
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Kunde inte hämta mappning för referensspecifikation %s"
-#: builtin/remote.c:437 builtin/remote.c:445
+#: builtin/remote.c:438 builtin/remote.c:446
msgid "(matching)"
msgstr "(matchande)"
-#: builtin/remote.c:449
+#: builtin/remote.c:450
msgid "(delete)"
msgstr "(ta bort)"
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
+#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
#, c-format
msgid "No such remote: %s"
msgstr "Inget sådant fjärrarkiv: %s"
-#: builtin/remote.c:639
+#: builtin/remote.c:640
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\""
-#: builtin/remote.c:659
+#: builtin/remote.c:660
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -11579,17 +11909,17 @@ msgstr ""
"\t%s\n"
"\tUppdatera konfigurationen manuellt om nödvändigt."
-#: builtin/remote.c:695
+#: builtin/remote.c:696
#, c-format
msgid "deleting '%s' failed"
msgstr "misslyckades ta bort \"%s\""
-#: builtin/remote.c:729
+#: builtin/remote.c:730
#, c-format
msgid "creating '%s' failed"
msgstr "misslyckades skapa \"%s\""
-#: builtin/remote.c:792
+#: builtin/remote.c:795
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -11603,305 +11933,307 @@ msgstr[1] ""
"Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"
"för att ta bort dem, använd:"
-#: builtin/remote.c:806
+#: builtin/remote.c:809
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
-#: builtin/remote.c:907
+#: builtin/remote.c:910
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " ny (nästa hämtning sparar i remotes/%s)"
-#: builtin/remote.c:910
+#: builtin/remote.c:913
msgid " tracked"
msgstr " spårad"
-#: builtin/remote.c:912
+#: builtin/remote.c:915
msgid " stale (use 'git remote prune' to remove)"
msgstr " förlegad (använd \"git remote prune\" för att ta bort)"
-#: builtin/remote.c:914
+#: builtin/remote.c:917
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:955
+#: builtin/remote.c:958
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren"
-#: builtin/remote.c:963
+#: builtin/remote.c:966
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "ombaseras interaktivt på fjärren %s"
-#: builtin/remote.c:964
+#: builtin/remote.c:967
#, c-format
msgid "rebases onto remote %s"
msgstr "ombaseras på fjärren %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:970
#, c-format
msgid " merges with remote %s"
msgstr " sammanslås med fjärren %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:973
#, c-format
msgid "merges with remote %s"
msgstr "sammanslås med fjärren %s"
-#: builtin/remote.c:973
+#: builtin/remote.c:976
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s och med fjärren %s\n"
-#: builtin/remote.c:1016
+#: builtin/remote.c:1019
msgid "create"
msgstr "skapa"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1022
msgid "delete"
msgstr "ta bort"
-#: builtin/remote.c:1023
+#: builtin/remote.c:1026
msgid "up to date"
msgstr "àjour"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1029
msgid "fast-forwardable"
msgstr "kan snabbspolas"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1032
msgid "local out of date"
msgstr "lokal föråldrad"
-#: builtin/remote.c:1036
+#: builtin/remote.c:1039
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s tvingar till %-*s (%s)"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1042
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s sänder till %-*s (%s)"
-#: builtin/remote.c:1043
+#: builtin/remote.c:1046
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s tvingar till %s"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1049
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s sänder till %s"
-#: builtin/remote.c:1114
+#: builtin/remote.c:1117
msgid "do not query remotes"
msgstr "fråga inte fjärrar"
-#: builtin/remote.c:1141
+#: builtin/remote.c:1144
#, c-format
msgid "* remote %s"
msgstr "* fjärr %s"
-#: builtin/remote.c:1142
+#: builtin/remote.c:1145
#, c-format
msgid " Fetch URL: %s"
msgstr " Hämt-URL: %s"
-#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
+#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
msgid "(no URL)"
msgstr "(ingen URL)"
-#. TRANSLATORS: the colon ':' should align with
-#. the one in " Fetch URL: %s" translation
-#: builtin/remote.c:1154 builtin/remote.c:1156
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1160 builtin/remote.c:1162
#, c-format
msgid " Push URL: %s"
msgstr " Sänd-URL: %s"
-#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD-gren: %s"
-#: builtin/remote.c:1158
+#: builtin/remote.c:1164
msgid "(not queried)"
msgstr "(inte förfrågad)"
-#: builtin/remote.c:1160
+#: builtin/remote.c:1166
msgid "(unknown)"
msgstr "(okänd)"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1170
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1182
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Fjärrgren:%s"
msgstr[1] " Fjärrgrenar:%s"
-#: builtin/remote.c:1179 builtin/remote.c:1205
+#: builtin/remote.c:1185 builtin/remote.c:1211
msgid " (status not queried)"
msgstr " (status inte förfrågad)"
-#: builtin/remote.c:1188
+#: builtin/remote.c:1194
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Lokal gren konfigurerad för \"git pull\":"
msgstr[1] " Lokala grenar konfigurerade för \"git pull\":"
-#: builtin/remote.c:1196
+#: builtin/remote.c:1202
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokala referenser speglas av \"git push\""
-#: builtin/remote.c:1202
+#: builtin/remote.c:1208
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:"
msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:"
-#: builtin/remote.c:1223
+#: builtin/remote.c:1229
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
-#: builtin/remote.c:1225
+#: builtin/remote.c:1231
msgid "delete refs/remotes/<name>/HEAD"
msgstr "ta bort refs/remotes/<namn>/HEAD"
-#: builtin/remote.c:1240
+#: builtin/remote.c:1246
msgid "Cannot determine remote HEAD"
msgstr "Kan inte bestämma HEAD på fjärren"
-#: builtin/remote.c:1242
+#: builtin/remote.c:1248
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:"
-#: builtin/remote.c:1252
+#: builtin/remote.c:1258
#, c-format
msgid "Could not delete %s"
msgstr "Kunde inte ta bort %s"
-#: builtin/remote.c:1260
+#: builtin/remote.c:1266
#, c-format
msgid "Not a valid ref: %s"
msgstr "Inte en giltig referens: %s"
-#: builtin/remote.c:1262
+#: builtin/remote.c:1268
#, c-format
msgid "Could not setup %s"
msgstr "Kunde inte ställa in %s"
-#: builtin/remote.c:1280
+#: builtin/remote.c:1286
#, c-format
msgid " %s will become dangling!"
msgstr " %s kommer bli dinglande!"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1287
#, c-format
msgid " %s has become dangling!"
msgstr " %s har blivit dinglande!"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1297
#, c-format
msgid "Pruning %s"
msgstr "Rensar %s"
-#: builtin/remote.c:1292
+#: builtin/remote.c:1298
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1308
+#: builtin/remote.c:1314
#, c-format
msgid " * [would prune] %s"
msgstr " * [skulle rensa] %s"
-#: builtin/remote.c:1311
+#: builtin/remote.c:1317
#, c-format
msgid " * [pruned] %s"
msgstr " * [rensad] %s"
-#: builtin/remote.c:1356
+#: builtin/remote.c:1362
msgid "prune remotes after fetching"
msgstr "rensa fjärrar efter hämtning"
-#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
#, c-format
msgid "No such remote '%s'"
msgstr "Ingen sådan fjärr \"%s\""
-#: builtin/remote.c:1435
+#: builtin/remote.c:1441
msgid "add branch"
msgstr "lägg till gren"
-#: builtin/remote.c:1442
+#: builtin/remote.c:1448
msgid "no remote specified"
msgstr "ingen fjärr angavs"
-#: builtin/remote.c:1459
+#: builtin/remote.c:1465
msgid "query push URLs rather than fetch URLs"
msgstr "fråga sänd-URL:er istället för hämta-URL:er"
-#: builtin/remote.c:1461
+#: builtin/remote.c:1467
msgid "return all URLs"
msgstr "returnera alla URL:er"
-#: builtin/remote.c:1489
+#: builtin/remote.c:1495
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "ingen URL:er angivna för fjärren \"%s\""
-#: builtin/remote.c:1515
+#: builtin/remote.c:1521
msgid "manipulate push URLs"
msgstr "manipulera URL:ar för sändning"
-#: builtin/remote.c:1517
+#: builtin/remote.c:1523
msgid "add URL"
msgstr "lägg till URL"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1525
msgid "delete URLs"
msgstr "ta bort URL:ar"
-#: builtin/remote.c:1526
+#: builtin/remote.c:1532
msgid "--add --delete doesn't make sense"
msgstr "--add --delete ger ingen mening"
-#: builtin/remote.c:1567
+#: builtin/remote.c:1573
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Felaktig gammalt URL-mönster: %s"
-#: builtin/remote.c:1575
+#: builtin/remote.c:1581
#, c-format
msgid "No such URL found: %s"
msgstr "Ingen sådan URL hittades: %s"
-#: builtin/remote.c:1577
+#: builtin/remote.c:1583
msgid "Will not delete all non-push URLs"
msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
-#: builtin/remote.c:1591
+#: builtin/remote.c:1597
msgid "be verbose; must be placed before a subcommand"
msgstr "var pratsam; måste skrivas före ett underkommando"
-#: builtin/remote.c:1622
+#: builtin/remote.c:1628
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Okänt underkommando: %s"
-#: builtin/repack.c:17
+#: builtin/repack.c:18
msgid "git repack [<options>]"
msgstr "git repack [<flaggor>]"
-#: builtin/repack.c:22
+#: builtin/repack.c:23
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -11910,123 +12242,127 @@ msgstr ""
"Använd --no-write-bitmap-index eller inaktivera inställningen\n"
"pack.writebitmaps"
-#: builtin/repack.c:166
+#: builtin/repack.c:168
msgid "pack everything in a single pack"
msgstr "packa allt i ett enda paket"
-#: builtin/repack.c:168
+#: builtin/repack.c:170
msgid "same as -a, and turn unreachable objects loose"
msgstr "samma som -a, och gör onåbara objekt lösa"
-#: builtin/repack.c:171
+#: builtin/repack.c:173
msgid "remove redundant packs, and run git-prune-packed"
msgstr "ta bort överflödiga paket, och kör git-prune-packed"
-#: builtin/repack.c:173
+#: builtin/repack.c:175
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "sänd --no-reuse-delta till git-pack-objects"
-#: builtin/repack.c:175
+#: builtin/repack.c:177
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "sänd --no-reuse-object till git-pack-objects"
-#: builtin/repack.c:177
+#: builtin/repack.c:179
msgid "do not run git-update-server-info"
msgstr "kör inte git-update-server-info"
-#: builtin/repack.c:180
+#: builtin/repack.c:182
msgid "pass --local to git-pack-objects"
msgstr "sänd --local till git-pack-objects"
-#: builtin/repack.c:182
+#: builtin/repack.c:184
msgid "write bitmap index"
msgstr "skriv bitkartindex"
-#: builtin/repack.c:183
+#: builtin/repack.c:185
msgid "approxidate"
msgstr "cirkadatum"
-#: builtin/repack.c:184
+#: builtin/repack.c:186
msgid "with -A, do not loosen objects older than this"
msgstr "med -A, lös inte upp objekt äldre än detta"
-#: builtin/repack.c:186
+#: builtin/repack.c:188
msgid "with -a, repack unreachable objects"
msgstr "med -a, packa om onåbara objekt"
-#: builtin/repack.c:188
+#: builtin/repack.c:190
msgid "size of the window used for delta compression"
msgstr "storlek på fönster använt för deltakomprimering"
-#: builtin/repack.c:189 builtin/repack.c:193
+#: builtin/repack.c:191 builtin/repack.c:197
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:190
+#: builtin/repack.c:192
msgid "same as the above, but limit memory size instead of entries count"
msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal"
-#: builtin/repack.c:192
+#: builtin/repack.c:194
msgid "limits the maximum delta depth"
msgstr "begränsa maximalt deltadjup"
-#: builtin/repack.c:194
+#: builtin/repack.c:196
+msgid "limits the maximum number of threads"
+msgstr "begränsar maximalt antal trådar"
+
+#: builtin/repack.c:198
msgid "maximum size of each packfile"
msgstr "maximal storlek på varje paketfil"
-#: builtin/repack.c:196
+#: builtin/repack.c:200
msgid "repack objects in packs marked with .keep"
msgstr "packa om objekt i paket märkta med .keep"
-#: builtin/repack.c:206
+#: builtin/repack.c:210
msgid "cannot delete packs in a precious-objects repo"
msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
-#: builtin/repack.c:210
+#: builtin/repack.c:214
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable och -A kan inte användas samtidigt"
-#: builtin/repack.c:400 builtin/worktree.c:115
+#: builtin/repack.c:406 builtin/worktree.c:116
#, c-format
msgid "failed to remove '%s'"
msgstr "misslyckades ta bort \"%s\""
-#: builtin/replace.c:19
+#: builtin/replace.c:20
msgid "git replace [-f] <object> <replacement>"
msgstr "git replace [-f] <objekt> <ersättning>"
-#: builtin/replace.c:20
+#: builtin/replace.c:21
msgid "git replace [-f] --edit <object>"
msgstr "git replace [-f] --edit <objekt>"
-#: builtin/replace.c:21
+#: builtin/replace.c:22
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr "git replace [-f] --graft <incheckning> [<förälder>...]"
-#: builtin/replace.c:22
+#: builtin/replace.c:23
msgid "git replace -d <object>..."
msgstr "git replace -d <objekt>..."
-#: builtin/replace.c:23
+#: builtin/replace.c:24
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<format>] [-l [<mönster>]]"
-#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
+#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "Objektnamnet är inte giltigt: \"%s\""
-#: builtin/replace.c:355
+#: builtin/replace.c:361
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "felaktig sammanslagningstagg i incheckningen \"%s\""
-#: builtin/replace.c:357
+#: builtin/replace.c:363
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "felformad sammanslagningstagg i incheckningen \"%s\""
-#: builtin/replace.c:368
+#: builtin/replace.c:374
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -12035,204 +12371,204 @@ msgstr ""
"den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s"
"\" som har förkastats; använd --edit istället för --graft"
-#: builtin/replace.c:401
+#: builtin/replace.c:407
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur."
-#: builtin/replace.c:402
+#: builtin/replace.c:408
msgid "the signature will be removed in the replacement commit!"
msgstr "signaturen kommer att tas bort i ersättningsincheckningen!"
-#: builtin/replace.c:408
+#: builtin/replace.c:414
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "kunde inte skriva ersättningsincheckning för: \"%s\""
-#: builtin/replace.c:432
+#: builtin/replace.c:438
msgid "list replace refs"
msgstr "visa ersättningsreferenser"
-#: builtin/replace.c:433
+#: builtin/replace.c:439
msgid "delete replace refs"
msgstr "ta bort ersättningsreferenser"
-#: builtin/replace.c:434
+#: builtin/replace.c:440
msgid "edit existing object"
msgstr "redigera befintligt objekt"
-#: builtin/replace.c:435
+#: builtin/replace.c:441
msgid "change a commit's parents"
msgstr "ändra en inchecknings föräldrar"
-#: builtin/replace.c:436
+#: builtin/replace.c:442
msgid "replace the ref if it exists"
msgstr "ersätt referensen om den finns"
-#: builtin/replace.c:437
+#: builtin/replace.c:443
msgid "do not pretty-print contents for --edit"
msgstr "använd inte snygg visning av innehåll för --edit"
-#: builtin/replace.c:438
+#: builtin/replace.c:444
msgid "use this format"
msgstr "använd detta format"
-#: builtin/rerere.c:12
+#: builtin/rerere.c:13
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
-#: builtin/rerere.c:58
+#: builtin/rerere.c:59
msgid "register clean resolutions in index"
msgstr "registrera rena lösningar i indexet"
-#: builtin/reset.c:26
+#: builtin/reset.c:29
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]"
-#: builtin/reset.c:27
+#: builtin/reset.c:30
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr "git reset [-q] [<träd-igt>] [--] <sökvägar>..."
-#: builtin/reset.c:28
+#: builtin/reset.c:31
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]"
-#: builtin/reset.c:34
+#: builtin/reset.c:37
msgid "mixed"
msgstr "blandad"
-#: builtin/reset.c:34
+#: builtin/reset.c:37
msgid "soft"
msgstr "mjuk"
-#: builtin/reset.c:34
+#: builtin/reset.c:37
msgid "hard"
msgstr "hård"
-#: builtin/reset.c:34
+#: builtin/reset.c:37
msgid "merge"
msgstr "sammanslagning"
-#: builtin/reset.c:34
+#: builtin/reset.c:37
msgid "keep"
msgstr "behåll"
-#: builtin/reset.c:74
+#: builtin/reset.c:77
msgid "You do not have a valid HEAD."
msgstr "Du har inte en giltig HEAD."
-#: builtin/reset.c:76
+#: builtin/reset.c:79
msgid "Failed to find tree of HEAD."
msgstr "Kunde inte hitta träder för HEAD."
-#: builtin/reset.c:82
+#: builtin/reset.c:85
#, c-format
msgid "Failed to find tree of %s."
msgstr "Kunde inte hitta träder för %s."
-#: builtin/reset.c:100
+#: builtin/reset.c:103
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD är nu på %s"
-#: builtin/reset.c:183
+#: builtin/reset.c:186
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."
-#: builtin/reset.c:276
+#: builtin/reset.c:286
msgid "be quiet, only report errors"
msgstr "var tyst, rapportera endast fel"
-#: builtin/reset.c:278
+#: builtin/reset.c:288
msgid "reset HEAD and index"
msgstr "återställ HEAD och index"
-#: builtin/reset.c:279
+#: builtin/reset.c:289
msgid "reset only HEAD"
msgstr "återställ endast HEAD"
-#: builtin/reset.c:281 builtin/reset.c:283
+#: builtin/reset.c:291 builtin/reset.c:293
msgid "reset HEAD, index and working tree"
msgstr "återställ HEAD, index och arbetskatalog"
-#: builtin/reset.c:285
+#: builtin/reset.c:295
msgid "reset HEAD but keep local changes"
msgstr "återställ HEAD men behåll lokala ändringar"
-#: builtin/reset.c:288
+#: builtin/reset.c:301
msgid "record only the fact that removed paths will be added later"
msgstr "registrera endast att borttagna sökvägar kommer läggas till senare"
-#: builtin/reset.c:305
+#: builtin/reset.c:320
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Kunde inte slå upp \"%s\" som en giltig revision."
-#: builtin/reset.c:313
+#: builtin/reset.c:328
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd."
-#: builtin/reset.c:322
+#: builtin/reset.c:337
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
-#: builtin/reset.c:331
+#: builtin/reset.c:346
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"."
-#: builtin/reset.c:333
+#: builtin/reset.c:348
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Kan inte göra %s återställning med sökvägar."
-#: builtin/reset.c:343
+#: builtin/reset.c:358
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s återställning tillåts inte i ett naket arkiv"
-#: builtin/reset.c:347
+#: builtin/reset.c:362
msgid "-N can only be used with --mixed"
msgstr "-N kan endast användas med --mixed"
-#: builtin/reset.c:364
+#: builtin/reset.c:379
msgid "Unstaged changes after reset:"
msgstr "Oköade ändringar efter återställning:"
-#: builtin/reset.c:370
+#: builtin/reset.c:385
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
-#: builtin/reset.c:374
+#: builtin/reset.c:389
msgid "Could not write new index file."
msgstr "Kunde inte skriva ny indexfil."
-#: builtin/rev-list.c:354
+#: builtin/rev-list.c:358
msgid "rev-list does not support display of notes"
msgstr "rev-list stöder inte visning av anteckningar"
-#: builtin/rev-parse.c:391
+#: builtin/rev-parse.c:394
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]"
-#: builtin/rev-parse.c:396
+#: builtin/rev-parse.c:399
msgid "keep the `--` passed as an arg"
msgstr "behåll \"--\" sänt som argument"
-#: builtin/rev-parse.c:398
+#: builtin/rev-parse.c:401
msgid "stop parsing after the first non-option argument"
msgstr "sluta tolka efter första argument som inte är flagga"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:404
msgid "output in stuck long form"
msgstr "utdata fast i lång form"
-#: builtin/rev-parse.c:532
+#: builtin/rev-parse.c:535
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12247,92 +12583,96 @@ msgstr ""
"Kör \"git rev-parse --parseopt -h\" för mer information om den första "
"varianten."
-#: builtin/revert.c:22
+#: builtin/revert.c:23
msgid "git revert [<options>] <commit-ish>..."
msgstr "git revert [<flaggor>] <incheckning-igt>..."
-#: builtin/revert.c:23
+#: builtin/revert.c:24
msgid "git revert <subcommand>"
msgstr "git revert <underkommando>"
-#: builtin/revert.c:28
+#: builtin/revert.c:29
msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr "git cherry-pick [<flaggor>] <incheckning-igt>..."
-#: builtin/revert.c:29
+#: builtin/revert.c:30
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <underkommando>"
-#: builtin/revert.c:71
+#: builtin/revert.c:90
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s: %s kan inte användas med %s"
-#: builtin/revert.c:80
+#: builtin/revert.c:99
msgid "end revert or cherry-pick sequence"
msgstr "avsluta revert- eller cherry-pick-sekvens"
-#: builtin/revert.c:81
+#: builtin/revert.c:100
msgid "resume revert or cherry-pick sequence"
msgstr "återuppta revert- eller cherry-pick-sekvens"
-#: builtin/revert.c:82
+#: builtin/revert.c:101
msgid "cancel revert or cherry-pick sequence"
msgstr "avbryt revert- eller cherry-pick-sekvens"
-#: builtin/revert.c:83
+#: builtin/revert.c:102
msgid "don't automatically commit"
msgstr "checka inte in automatiskt"
-#: builtin/revert.c:84
+#: builtin/revert.c:103
msgid "edit the commit message"
msgstr "redigera incheckningsmeddelandet"
-#: builtin/revert.c:87
-msgid "parent number"
-msgstr "nummer på förälder"
+#: builtin/revert.c:106
+msgid "parent-number"
+msgstr "nummer-på-förälder"
+
+#: builtin/revert.c:107
+msgid "select mainline parent"
+msgstr "välj förälder för huvudlinje"
-#: builtin/revert.c:89
+#: builtin/revert.c:109
msgid "merge strategy"
msgstr "sammanslagningsstrategi"
-#: builtin/revert.c:90
+#: builtin/revert.c:110
msgid "option"
msgstr "alternativ"
-#: builtin/revert.c:91
+#: builtin/revert.c:111
msgid "option for merge strategy"
-msgstr "alternativ för sammanslagningsstrategi"
+msgstr "alternativ för sammanslagningsstrategi"
-#: builtin/revert.c:100
+#: builtin/revert.c:120
msgid "append commit name"
msgstr "lägg till incheckningsnamn"
-#: builtin/revert.c:102
+#: builtin/revert.c:122
msgid "preserve initially empty commits"
msgstr "behåll incheckningar som börjar som tomma"
-#: builtin/revert.c:103
+#: builtin/revert.c:123
msgid "allow commits with empty messages"
msgstr "tillåt incheckningar med tomt meddelande"
-#: builtin/revert.c:104
+#: builtin/revert.c:124
msgid "keep redundant, empty commits"
msgstr "behåll redundanta, tomma incheckningar"
-#: builtin/revert.c:192
+#: builtin/revert.c:212
msgid "revert failed"
msgstr "\"revert\" misslyckades"
-#: builtin/revert.c:205
+#: builtin/revert.c:225
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" misslyckades"
-#: builtin/rm.c:17
+#: builtin/rm.c:18
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<flaggor>] [--] <fil>..."
-#: builtin/rm.c:205
+#: builtin/rm.c:206
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
@@ -12344,7 +12684,7 @@ msgstr[0] ""
msgstr[1] ""
"följande filer har köat innehåll som skiljer sig både från filen och HEAD:"
-#: builtin/rm.c:210
+#: builtin/rm.c:211
msgid ""
"\n"
"(use -f to force removal)"
@@ -12352,13 +12692,13 @@ msgstr ""
"\n"
"(använd -f för att tvinga borttagning)"
-#: builtin/rm.c:214
+#: builtin/rm.c:215
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] "följande fil har ändringar köade i indexet:"
msgstr[1] "följande filer har ändringar köade i indexet:"
-#: builtin/rm.c:218 builtin/rm.c:227
+#: builtin/rm.c:219 builtin/rm.c:228
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
@@ -12366,29 +12706,29 @@ msgstr ""
"\n"
"(använd --cached för att behålla filen eller -f för att tvinga borttagning)"
-#: builtin/rm.c:224
+#: builtin/rm.c:225
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "följande fil har lokala ändringar:"
msgstr[1] "följande filer har lokala ändringar:"
-#: builtin/rm.c:242
+#: builtin/rm.c:243
msgid "do not list removed files"
msgstr "lista inte borttagna filer"
-#: builtin/rm.c:243
+#: builtin/rm.c:244
msgid "only remove from the index"
msgstr "ta bara bort från indexet"
-#: builtin/rm.c:244
+#: builtin/rm.c:245
msgid "override the up-to-date check"
msgstr "överstyr àjour-testet"
-#: builtin/rm.c:245
+#: builtin/rm.c:246
msgid "allow recursive removal"
msgstr "tillåt rekursiv borttagning"
-#: builtin/rm.c:247
+#: builtin/rm.c:248
msgid "exit with a zero status even if nothing matched"
msgstr "avsluta med nollstatus även om inget träffades"
@@ -12407,7 +12747,7 @@ msgstr "git rm: kan inte ta bort %s"
msgid "could not remove '%s'"
msgstr "kunde inte ta bort \"%s\""
-#: builtin/send-pack.c:18
+#: builtin/send-pack.c:19
msgid ""
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
@@ -12419,23 +12759,23 @@ msgstr ""
"[<ref>...]\n"
" --all och explicit angiven <ref> är ömsesidigt uteslutande."
-#: builtin/send-pack.c:160
+#: builtin/send-pack.c:162
msgid "remote name"
msgstr "fjärrnamn"
-#: builtin/send-pack.c:171
+#: builtin/send-pack.c:176
msgid "use stateless RPC protocol"
msgstr "använd tillståndslöst RPC-protokoll"
-#: builtin/send-pack.c:172
+#: builtin/send-pack.c:177
msgid "read refs from stdin"
msgstr "läs referenser från standard in"
-#: builtin/send-pack.c:173
+#: builtin/send-pack.c:178
msgid "print status from remote helper"
msgstr "visa status från fjärrhjälpare"
-#: builtin/shortlog.c:13
+#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
@@ -12463,7 +12803,7 @@ msgstr "w[,i1[,i2]]"
msgid "Linewrap output"
msgstr "Radbryt utdata"
-#: builtin/show-branch.c:10
+#: builtin/show-branch.c:12
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -12475,126 +12815,126 @@ msgstr ""
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
-#: builtin/show-branch.c:14
+#: builtin/show-branch.c:16
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]"
-#: builtin/show-branch.c:375
+#: builtin/show-branch.c:376
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] "ignorerar %s; kan inte hantera mer än %d referens"
msgstr[1] "ignorerar %s; kan inte hantera mer än %d referenser"
-#: builtin/show-branch.c:541
+#: builtin/show-branch.c:530
#, c-format
msgid "no matching refs with %s"
msgstr "inga motsvarande referenser med %s"
-#: builtin/show-branch.c:639
+#: builtin/show-branch.c:626
msgid "show remote-tracking and local branches"
msgstr "visa fjärrspårande och lokala grenar"
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:628
msgid "show remote-tracking branches"
msgstr "visa fjärrspårande grenar"
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:630
msgid "color '*!+-' corresponding to the branch"
msgstr "färga \"*!+-\" enligt grenen"
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:632
msgid "show <n> more commits after the common ancestor"
msgstr "visa <n> ytterligare incheckningar efter gemensam anfader"
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:634
msgid "synonym to more=-1"
msgstr "synonym till more=-1"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:635
msgid "suppress naming strings"
msgstr "undertyck namnsträngar"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:637
msgid "include the current branch"
msgstr "inkludera aktuell gren"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:639
msgid "name commits with their object names"
msgstr "namnge incheckningar med deras objektnamn"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:641
msgid "show possible merge bases"
msgstr "visa möjliga sammanslagningsbaser"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:643
msgid "show refs unreachable from any other ref"
msgstr "visa referenser som inte kan nås från någon annan referens"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:645
msgid "show commits in topological order"
msgstr "visa incheckningar i topologisk ordning"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:648
msgid "show only commits not on the first branch"
msgstr "visa endast incheckningar inte på den första grenen"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:650
msgid "show merges reachable from only one tip"
msgstr "visa sammanslagningar som endast kan nås från en spets"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:652
msgid "topologically sort, maintaining date order where possible"
msgstr "sortera topologiskt, behåll datumordning när möjligt"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:655
msgid "<n>[,<base>]"
msgstr "<n>[,<bas>]"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:656
msgid "show <n> most recent ref-log entries starting at base"
msgstr "visa <n> nyaste refloggposter med början på bas"
-#: builtin/show-branch.c:703
+#: builtin/show-branch.c:690
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr ""
"--reflog är inkompatibel med --all, --remotes, --independent eller --merge-"
"base"
-#: builtin/show-branch.c:727
+#: builtin/show-branch.c:714
msgid "no branches given, and HEAD is not valid"
msgstr "inga grenar angavs, och HEAD är inte giltigt"
-#: builtin/show-branch.c:730
+#: builtin/show-branch.c:717
msgid "--reflog option needs one branch name"
msgstr "--reflog behöver ett namn på en gren"
-#: builtin/show-branch.c:733
+#: builtin/show-branch.c:720
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "maximalt %d poster kan visas samtidigt."
msgstr[1] "maximalt %d poster kan visas samtidigt."
-#: builtin/show-branch.c:737
+#: builtin/show-branch.c:724
#, c-format
msgid "no such ref %s"
msgstr "ingen sådan referens %s"
-#: builtin/show-branch.c:829
+#: builtin/show-branch.c:808
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "kan inte hantera mer än %d revision."
msgstr[1] "kan inte hantera mer än %d revisioner."
-#: builtin/show-branch.c:833
+#: builtin/show-branch.c:812
#, c-format
msgid "'%s' is not a valid ref."
msgstr "\"%s\" är inte en giltig referens."
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:815
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "hittar inte incheckning %s (%s)"
@@ -12643,123 +12983,132 @@ msgstr "visa inte resultat på standard ut (användbart med --verify)"
msgid "show refs from stdin that aren't in local repository"
msgstr "visa referenser från standard in som inte finns i lokalt arkiv"
-#: builtin/stripspace.c:17
+#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
-#: builtin/stripspace.c:18
+#: builtin/stripspace.c:19
msgid "git stripspace [-c | --comment-lines]"
msgstr "git stripspace [-c | --comment-lines]"
-#: builtin/stripspace.c:35
+#: builtin/stripspace.c:36
msgid "skip and remove all lines starting with comment character"
msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken"
-#: builtin/stripspace.c:38
+#: builtin/stripspace.c:39
msgid "prepend comment character and space to each line"
msgstr "lägg in kommentarstecken och blanksteg först på varje rad"
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062
+#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
#, c-format
msgid "No such ref: %s"
msgstr "Ingen sådan referens: %s"
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071
+#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Förväntade fullt referensnamn, fick %s"
-#: builtin/submodule--helper.c:71
+#: builtin/submodule--helper.c:72
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "kan inte ta bort en komponent från url:en \"%s\""
-#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592
+#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
msgid "alternative anchor for relative paths"
msgstr "alternativa ankare för relativa sökvägar"
-#: builtin/submodule--helper.c:287
+#: builtin/submodule--helper.c:310
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
-#: builtin/submodule--helper.c:373
+#: builtin/submodule--helper.c:395
+#, c-format
+msgid ""
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sn eget "
+"officiella uppström."
+
+#: builtin/submodule--helper.c:406
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Misslyckades registrera url för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:377
+#: builtin/submodule--helper.c:410
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
-#: builtin/submodule--helper.c:387
+#: builtin/submodule--helper.c:420
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n"
-#: builtin/submodule--helper.c:394
+#: builtin/submodule--helper.c:427
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\""
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:443
msgid "Suppress output for initializing a submodule"
msgstr "Dölj utdata från initiering av undermodul"
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:448
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<sökväg>]"
-#: builtin/submodule--helper.c:436
+#: builtin/submodule--helper.c:476
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <sökväg>"
-#: builtin/submodule--helper.c:442
+#: builtin/submodule--helper.c:482
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\""
-#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s"
-#: builtin/submodule--helper.c:564
+#: builtin/submodule--helper.c:604
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte"
-#: builtin/submodule--helper.c:571
+#: builtin/submodule--helper.c:611
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte"
-#: builtin/submodule--helper.c:595
+#: builtin/submodule--helper.c:633
msgid "where the new submodule will be cloned to"
msgstr "var den nya undermodulen skall klonas till"
-#: builtin/submodule--helper.c:598
+#: builtin/submodule--helper.c:636
msgid "name of the new submodule"
msgstr "namn på den nya undermodulen"
-#: builtin/submodule--helper.c:601
+#: builtin/submodule--helper.c:639
msgid "url where to clone the submodule from"
msgstr "URL att klona undermodulen från"
-#: builtin/submodule--helper.c:607
+#: builtin/submodule--helper.c:645
msgid "depth for shallow clones"
msgstr "djup för grunda kloner"
-#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980
+#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
msgid "force cloning progress"
msgstr "tvinga kloningsförlopp"
-#: builtin/submodule--helper.c:615
+#: builtin/submodule--helper.c:653
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -12767,92 +13116,82 @@ msgstr ""
"git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference "
"<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>"
-#: builtin/submodule--helper.c:646
+#: builtin/submodule--helper.c:684
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
+msgstr "misslyckades klona \"%s\" till undermodulsökvägen ”%s”"
-#: builtin/submodule--helper.c:662
-#, c-format
-msgid "cannot open file '%s'"
-msgstr "kan inte öppna filen \"%s\""
-
-#: builtin/submodule--helper.c:667
-#, c-format
-msgid "could not close file %s"
-msgstr "kunde inte stänga filen %s"
-
-#: builtin/submodule--helper.c:674
+#: builtin/submodule--helper.c:699
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
-#: builtin/submodule--helper.c:742
+#: builtin/submodule--helper.c:764
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Undermodulsökvägen \"%s\" har inte initierats"
-#: builtin/submodule--helper.c:746
+#: builtin/submodule--helper.c:768
msgid "Maybe you want to use 'update --init'?"
msgstr "Kanske menade du att använda \"update --init\"?"
-#: builtin/submodule--helper.c:772
+#: builtin/submodule--helper.c:793
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Hoppar över ej sammanslagen undermodul %s"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:814
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Hoppar över undermodulen \"%s\""
-#: builtin/submodule--helper.c:929
+#: builtin/submodule--helper.c:942
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
-#: builtin/submodule--helper.c:940
+#: builtin/submodule--helper.c:953
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Misslyckades klona \"%s\" för andra gången, avbryter"
-#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105
+#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
msgid "path into the working tree"
msgstr "sökväg inuti arbetskatalogen"
-#: builtin/submodule--helper.c:964
+#: builtin/submodule--helper.c:977
msgid "path into the working tree, across nested submodule boundaries"
msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser"
-#: builtin/submodule--helper.c:968
+#: builtin/submodule--helper.c:981
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout eller none"
-#: builtin/submodule--helper.c:972
+#: builtin/submodule--helper.c:985
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Skapa en grund klon trunkerad till angivet antal revisioner"
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:988
msgid "parallel jobs"
msgstr "parallella jobb"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:990
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "om den första klonen skall följa rekommendation för grund kloning"
-#: builtin/submodule--helper.c:978
+#: builtin/submodule--helper.c:991
msgid "don't print cloning progress"
msgstr "skriv inte klonförlopp"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:998
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:995
+#: builtin/submodule--helper.c:1008
msgid "bad value for update parameter"
msgstr "felaktigt värde för parametern update"
-#: builtin/submodule--helper.c:1066
+#: builtin/submodule--helper.c:1079
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -12861,58 +13200,54 @@ msgstr ""
"Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men "
"huvudprojektet är inte på någon gren"
-#: builtin/submodule--helper.c:1106
+#: builtin/submodule--helper.c:1163
msgid "recurse into submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/submodule--helper.c:1112
+#: builtin/submodule--helper.c:1169
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<sökväg>...]"
-#: builtin/submodule--helper.c:1157
-msgid "submodule--helper subcommand must be called with a subcommand"
-msgstr "underkommandot submodule--helper måste anropas med ett underkommando"
-
-#: builtin/submodule--helper.c:1164
+#: builtin/submodule--helper.c:1232
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s stöder inte --super-prefix"
-#: builtin/submodule--helper.c:1170
+#: builtin/submodule--helper.c:1238
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
-#: builtin/symbolic-ref.c:7
+#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]"
-#: builtin/symbolic-ref.c:8
+#: builtin/symbolic-ref.c:9
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <namn>"
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:41
msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
"undertryck felmeddelanden för icke-symboliska (frånkopplade) referenser"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:42
msgid "delete symbolic ref"
msgstr "ta bort symbolisk referens"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:43
msgid "shorten ref output"
msgstr "förkorta ref-utdata"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
msgid "reason"
msgstr "skäl"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
msgid "reason of the update"
msgstr "skäl till uppdateringen"
-#: builtin/tag.c:23
+#: builtin/tag.c:24
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
"[<head>]"
@@ -12920,38 +13255,35 @@ msgstr ""
"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>] <taggnamn> "
"[<huvud>]"
-#: builtin/tag.c:24
+#: builtin/tag.c:25
msgid "git tag -d <tagname>..."
msgstr "git tag -d <taggnamn>..."
-#: builtin/tag.c:25
+#: builtin/tag.c:26
msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
-"git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>]\n"
+"git tag -l [-n[<antal>]] [--contains <incheckning>] [--no-contains "
+"<incheckning>] [--points-at <objekt>]\n"
"\t\t[--format=<format>] [--[no-]merged [<incheckning>]] [<mönster>...]"
-#: builtin/tag.c:27
+#: builtin/tag.c:28
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <taggnamn>..."
-#: builtin/tag.c:82
-#, c-format
-msgid "tag name too long: %.*s..."
-msgstr "taggnamnet för långt: %.*s..."
-
-#: builtin/tag.c:87
+#: builtin/tag.c:84
#, c-format
msgid "tag '%s' not found."
msgstr "taggen \"%s\" hittades inte."
-#: builtin/tag.c:102
+#: builtin/tag.c:100
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tog bort tagg \"%s\" (var %s)\n"
-#: builtin/tag.c:131
+#: builtin/tag.c:129
#, c-format
msgid ""
"\n"
@@ -12964,7 +13296,7 @@ msgstr ""
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:133
#, c-format
msgid ""
"\n"
@@ -12979,328 +13311,348 @@ msgstr ""
"Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n"
"du vill.\n"
-#: builtin/tag.c:213
+#: builtin/tag.c:211
msgid "unable to sign the tag"
msgstr "kunde inte signera taggen"
-#: builtin/tag.c:215
+#: builtin/tag.c:213
msgid "unable to write tag file"
msgstr "kunde inte skriva tagg-filen"
-#: builtin/tag.c:240
+#: builtin/tag.c:237
msgid "bad object type."
-msgstr "felaktig objekttyp"
+msgstr "felaktig objekttyp."
-#: builtin/tag.c:253
-msgid "tag header too big."
-msgstr "tagghuvud för stort."
-
-#: builtin/tag.c:289
+#: builtin/tag.c:283
msgid "no tag message?"
msgstr "inget taggmeddelande?"
-#: builtin/tag.c:295
+#: builtin/tag.c:290
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Taggmeddelandet har lämnats i %s\n"
-#: builtin/tag.c:354
+#: builtin/tag.c:398
msgid "list tag names"
msgstr "lista taggnamn"
-#: builtin/tag.c:356
+#: builtin/tag.c:400
msgid "print <n> lines of each tag message"
msgstr "visa <n> rader från varje taggmeddelande"
-#: builtin/tag.c:358
+#: builtin/tag.c:402
msgid "delete tags"
msgstr "ta bort taggar"
-#: builtin/tag.c:359
+#: builtin/tag.c:403
msgid "verify tags"
msgstr "verifiera taggar"
-#: builtin/tag.c:361
+#: builtin/tag.c:405
msgid "Tag creation options"
msgstr "Alternativ för att skapa taggar"
-#: builtin/tag.c:363
+#: builtin/tag.c:407
msgid "annotated tag, needs a message"
msgstr "annoterad tagg, behöver meddelande"
-#: builtin/tag.c:365
+#: builtin/tag.c:409
msgid "tag message"
msgstr "taggmeddelande"
-#: builtin/tag.c:367
+#: builtin/tag.c:411
msgid "annotated and GPG-signed tag"
msgstr "annoterad och GPG-signerad tagg"
-#: builtin/tag.c:371
+#: builtin/tag.c:415
msgid "use another key to sign the tag"
msgstr "använd annan nyckel för att signera taggen"
-#: builtin/tag.c:372
+#: builtin/tag.c:416
msgid "replace the tag if exists"
msgstr "ersätt taggen om den finns"
-#: builtin/tag.c:373 builtin/update-ref.c:368
+#: builtin/tag.c:417 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "skapa en reflog"
-#: builtin/tag.c:375
+#: builtin/tag.c:419
msgid "Tag listing options"
msgstr "Alternativ för listning av taggar"
-#: builtin/tag.c:376
+#: builtin/tag.c:420
msgid "show tag list in columns"
msgstr "lista taggar i spalter"
-#: builtin/tag.c:377 builtin/tag.c:378
+#: builtin/tag.c:421 builtin/tag.c:423
msgid "print only tags that contain the commit"
msgstr "visa endast taggar som innehåller incheckningen"
-#: builtin/tag.c:379
+#: builtin/tag.c:422 builtin/tag.c:424
+msgid "print only tags that don't contain the commit"
+msgstr "visa endast taggar som inte innehåller incheckningen"
+
+#: builtin/tag.c:425
msgid "print only tags that are merged"
msgstr "visa endast taggar som slagits samman"
-#: builtin/tag.c:380
+#: builtin/tag.c:426
msgid "print only tags that are not merged"
msgstr "visa endast taggar som ej slagits samman"
-#: builtin/tag.c:385
+#: builtin/tag.c:431
msgid "print only tags of the object"
msgstr "visa endast taggar för objektet"
-#: builtin/tag.c:415
+#: builtin/tag.c:470
msgid "--column and -n are incompatible"
msgstr "--column och -n är inkompatibla"
-#: builtin/tag.c:437
-msgid "-n option is only allowed with -l."
-msgstr "Flaggan -n är endast tillåten tillsammans med -l."
+#: builtin/tag.c:492
+msgid "-n option is only allowed in list mode"
+msgstr "Flaggan -n är endast tillåten i listläge"
+
+#: builtin/tag.c:494
+msgid "--contains option is only allowed in list mode"
+msgstr "Flaggan --contains är endast tillåten i listläge"
-#: builtin/tag.c:439
-msgid "--contains option is only allowed with -l."
-msgstr "Flaggan --contains är endast tillåten tillsammans med -l"
+#: builtin/tag.c:496
+msgid "--no-contains option is only allowed in list mode"
+msgstr "Flaggan --no-contains är endast tillåten i listläge"
-#: builtin/tag.c:441
-msgid "--points-at option is only allowed with -l."
-msgstr "Flaggan --points-at är endast tillåten tillsammans med -l."
+#: builtin/tag.c:498
+msgid "--points-at option is only allowed in list mode"
+msgstr "Flaggan --points-at är endast tillåten i listläge"
-#: builtin/tag.c:443
-msgid "--merged and --no-merged option are only allowed with -l"
-msgstr "flaggorna --merged och --no-merged tillåts endast tillsammans med -l"
+#: builtin/tag.c:500
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge"
-#: builtin/tag.c:454
+#: builtin/tag.c:511
msgid "only one -F or -m option is allowed."
msgstr "endast en av flaggorna -F eller -m tillåts."
-#: builtin/tag.c:473
+#: builtin/tag.c:530
msgid "too many params"
msgstr "för många parametrar"
-#: builtin/tag.c:479
+#: builtin/tag.c:536
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "\"%s\" är inte ett giltigt taggnamn."
-#: builtin/tag.c:484
+#: builtin/tag.c:541
#, c-format
msgid "tag '%s' already exists"
msgstr "taggen \"%s\" finns redan"
-#: builtin/tag.c:512
+#: builtin/tag.c:571
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
-#: builtin/unpack-objects.c:493
+#: builtin/unpack-objects.c:494
msgid "Unpacking objects"
msgstr "Packar upp objekt"
-#: builtin/update-index.c:79
+#: builtin/update-index.c:80
#, c-format
msgid "failed to create directory %s"
msgstr "misslyckades skapa katalogen %s"
-#: builtin/update-index.c:85
+#: builtin/update-index.c:86
#, c-format
msgid "failed to stat %s"
msgstr "misslyckades ta status på %s"
-#: builtin/update-index.c:95
+#: builtin/update-index.c:96
#, c-format
msgid "failed to create file %s"
msgstr "misslyckades skapa filen %s"
-#: builtin/update-index.c:103
+#: builtin/update-index.c:104
#, c-format
msgid "failed to delete file %s"
msgstr "misslyckades ta bort filen %s"
-#: builtin/update-index.c:110 builtin/update-index.c:212
+#: builtin/update-index.c:111 builtin/update-index.c:217
#, c-format
msgid "failed to delete directory %s"
msgstr "misslyckades ta bort katalogen %s"
-#: builtin/update-index.c:133
+#: builtin/update-index.c:136
#, c-format
msgid "Testing mtime in '%s' "
-msgstr "Testar mtime i \"%s\""
+msgstr "Testar mtime i \"%s\" "
-#: builtin/update-index.c:145
+#: builtin/update-index.c:150
msgid "directory stat info does not change after adding a new file"
msgstr "stat-informationen för en katalog ändras inte när nya filer läggs till"
-#: builtin/update-index.c:158
+#: builtin/update-index.c:163
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"stat-informationen för en katalog ändras inte när nya kataloger läggs till"
-#: builtin/update-index.c:171
+#: builtin/update-index.c:176
msgid "directory stat info changes after updating a file"
msgstr "stat-informationen för en katalog ändras när filer uppdateras"
-#: builtin/update-index.c:182
+#: builtin/update-index.c:187
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"stat-informationen för en katalog ändras när filer läggs till i en "
"underkatalog"
-#: builtin/update-index.c:193
+#: builtin/update-index.c:198
msgid "directory stat info does not change after deleting a file"
msgstr "stat-informationen för en katalog ändras inte när en fil tas bort"
-#: builtin/update-index.c:206
+#: builtin/update-index.c:211
msgid "directory stat info does not change after deleting a directory"
msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort"
-#: builtin/update-index.c:213
+#: builtin/update-index.c:218
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:564
+#: builtin/update-index.c:569
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<flaggor>] [--] [<fil>...]"
-#: builtin/update-index.c:919
+#: builtin/update-index.c:924
msgid "continue refresh even when index needs update"
msgstr "fortsätt uppdatera även när index inte är àjour"
-#: builtin/update-index.c:922
+#: builtin/update-index.c:927
msgid "refresh: ignore submodules"
msgstr "refresh: ignorera undermoduler"
-#: builtin/update-index.c:925
+#: builtin/update-index.c:930
msgid "do not ignore new files"
msgstr "ignorera inte nya filer"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:932
msgid "let files replace directories and vice-versa"
msgstr "låt filer ersätta kataloger och omvänt"
-#: builtin/update-index.c:929
+#: builtin/update-index.c:934
msgid "notice files missing from worktree"
msgstr "lägg märke till filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:931
+#: builtin/update-index.c:936
msgid "refresh even if index contains unmerged entries"
msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:939
msgid "refresh stat information"
msgstr "uppdatera statusinformation"
-#: builtin/update-index.c:938
+#: builtin/update-index.c:943
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "som --refresh, men ignorera assume-unchanged-inställning"
-#: builtin/update-index.c:942
+#: builtin/update-index.c:947
msgid "<mode>,<object>,<path>"
msgstr "<läge>,<objekt>,<sökväg>"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:948
msgid "add the specified entry to the index"
msgstr "lägg till angiven post i indexet"
-#: builtin/update-index.c:952
+#: builtin/update-index.c:957
msgid "mark files as \"not changing\""
msgstr "markera filer som \"ändras inte\""
-#: builtin/update-index.c:955
+#: builtin/update-index.c:960
msgid "clear assumed-unchanged bit"
msgstr "rensa \"assume-unchanged\"-biten"
-#: builtin/update-index.c:958
+#: builtin/update-index.c:963
msgid "mark files as \"index-only\""
msgstr "markera filer som \"endast index\""
-#: builtin/update-index.c:961
+#: builtin/update-index.c:966
msgid "clear skip-worktree bit"
msgstr "töm \"skip-worktree\"-biten"
-#: builtin/update-index.c:964
+#: builtin/update-index.c:969
msgid "add to index only; do not add content to object database"
msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:971
msgid "remove named paths even if present in worktree"
msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen"
-#: builtin/update-index.c:968
+#: builtin/update-index.c:973
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "med --stdin: indatarader termineras med null-byte"
-#: builtin/update-index.c:970
+#: builtin/update-index.c:975
msgid "read list of paths to be updated from standard input"
msgstr "läs lista över sökvägar att uppdatera från standard in"
-#: builtin/update-index.c:974
+#: builtin/update-index.c:979
msgid "add entries from standard input to the index"
msgstr "lägg poster från standard in till indexet"
-#: builtin/update-index.c:978
+#: builtin/update-index.c:983
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "återfyll etapp 2 och 3 från angivna sökvägar"
-#: builtin/update-index.c:982
+#: builtin/update-index.c:987
msgid "only update entries that differ from HEAD"
msgstr "uppdatera endast poster som skiljer sig från HEAD"
-#: builtin/update-index.c:986
+#: builtin/update-index.c:991
msgid "ignore files missing from worktree"
msgstr "ignorera filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:989
+#: builtin/update-index.c:994
msgid "report actions to standard output"
msgstr "rapportera åtgärder på standard ut"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:996
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(för porslin) glöm sparade olösta konflikter"
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1000
msgid "write index in this format"
msgstr "skriv index i detta format"
-#: builtin/update-index.c:997
+#: builtin/update-index.c:1002
msgid "enable or disable split index"
msgstr "aktivera eller inaktivera delat index"
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1004
msgid "enable/disable untracked cache"
msgstr "aktivera/inaktivera ospårad cache"
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1006
msgid "test if the filesystem supports untracked cache"
msgstr "testa om filsystemet stöder ospårad cache"
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1008
msgid "enable untracked cache without testing the filesystem"
msgstr "aktivera ospårad cache utan att testa filsystemet"
-#: builtin/update-index.c:1120
+#: builtin/update-index.c:1108
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+"core.splitIndex är satt till false; ta bort eller ändra det om du verkligen "
+"vill aktivera delat index"
+
+#: builtin/update-index.c:1117
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+"core.splitIndex är satt till true; ta bort eller ändra det om du verkligen "
+"vill inaktivera delat index"
+
+#: builtin/update-index.c:1128
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -13308,11 +13660,11 @@ msgstr ""
"core.untrackedCache är satt till true; ta bort eller ändra det om du "
"verkligen vill inaktivera den ospårade cachen"
-#: builtin/update-index.c:1124
+#: builtin/update-index.c:1132
msgid "Untracked cache disabled"
msgstr "Ospårad cache är inaktiverad"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1140
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -13320,133 +13672,133 @@ msgstr ""
"core.untrackedCache är satt till false; ta bort eller ändra det om du "
"verkligen vill aktivera den ospårade cachen"
-#: builtin/update-index.c:1136
+#: builtin/update-index.c:1144
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Ospårad cache är aktiverad för \"%s\""
-#: builtin/update-ref.c:9
+#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr "git update-ref [<flaggor>] -d <refnamn> [<gammaltvärde>]"
-#: builtin/update-ref.c:10
+#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr "git update-ref [<flaggor>] <refnamn> <gammaltvärde> [<nyttvärde>]"
-#: builtin/update-ref.c:11
+#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<flaggor>] --stdin [-z]"
-#: builtin/update-ref.c:363
+#: builtin/update-ref.c:364
msgid "delete the reference"
msgstr "ta bort referensen"
-#: builtin/update-ref.c:365
+#: builtin/update-ref.c:366
msgid "update <refname> not the one it points to"
msgstr "uppdatera <refnamn> inte det den pekar på"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:367
msgid "stdin has NUL-terminated arguments"
msgstr "standard in har NUL-terminerade argument"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:368
msgid "read updates from stdin"
msgstr "läs uppdateringar från standard in"
-#: builtin/update-server-info.c:6
+#: builtin/update-server-info.c:7
msgid "git update-server-info [--force]"
msgstr "git update-server-info [--force]"
-#: builtin/update-server-info.c:14
+#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
msgstr "uppdatera informationsfilerna från grunden"
-#: builtin/verify-commit.c:17
+#: builtin/verify-commit.c:18
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <incheckning>..."
-#: builtin/verify-commit.c:72
+#: builtin/verify-commit.c:73
msgid "print commit contents"
msgstr "visa innehåll för incheckning"
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:37
+#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
msgid "print raw gpg status output"
msgstr "visa råa gpg-statusdata"
-#: builtin/verify-pack.c:54
+#: builtin/verify-pack.c:55
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..."
-#: builtin/verify-pack.c:64
+#: builtin/verify-pack.c:65
msgid "verbose"
msgstr "pratsam"
-#: builtin/verify-pack.c:66
+#: builtin/verify-pack.c:67
msgid "show statistics only"
msgstr "visa endast statistik"
-#: builtin/verify-tag.c:18
+#: builtin/verify-tag.c:19
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..."
-#: builtin/verify-tag.c:36
+#: builtin/verify-tag.c:37
msgid "print tag contents"
msgstr "visa innehåll för tag"
-#: builtin/worktree.c:15
+#: builtin/worktree.c:16
msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<flaggor>] <sökväg> [<gren>]"
-#: builtin/worktree.c:16
+#: builtin/worktree.c:17
msgid "git worktree list [<options>]"
msgstr "git worktree list [<flaggor>]"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<flaggor>] <sökväg>"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<flaggor>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <sökväg>"
-#: builtin/worktree.c:42
+#: builtin/worktree.c:44
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Tar bort worktrees/%s: inte en giltig katalog"
-#: builtin/worktree.c:48
+#: builtin/worktree.c:50
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
-#: builtin/worktree.c:53
+#: builtin/worktree.c:55
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
-#: builtin/worktree.c:64
+#: builtin/worktree.c:66
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
-#: builtin/worktree.c:80
+#: builtin/worktree.c:82
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"
-#: builtin/worktree.c:128
+#: builtin/worktree.c:129
msgid "report pruned working trees"
msgstr "rapportera borttagna arbetskataloger"
-#: builtin/worktree.c:130
+#: builtin/worktree.c:131
msgid "expire working trees older than <time>"
msgstr "låt tid gå ut för arbetskataloger äldre än <tid>"
-#: builtin/worktree.c:204
+#: builtin/worktree.c:205
#, c-format
msgid "'%s' already exists"
msgstr "\"%s\" finns redan"
@@ -13456,97 +13808,101 @@ msgstr "\"%s\" finns redan"
msgid "could not create directory of '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/worktree.c:272
+#: builtin/worktree.c:275
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Förbereder %s (identifieraren %s)"
-#: builtin/worktree.c:323
+#: builtin/worktree.c:327
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
-#: builtin/worktree.c:325
+#: builtin/worktree.c:329
msgid "create a new branch"
msgstr "skapa en ny gren"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:331
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:333
msgid "populate the new working tree"
msgstr "befolka den nya arbetskatalogen"
-#: builtin/worktree.c:337
+#: builtin/worktree.c:334
+msgid "keep the new working tree locked"
+msgstr "låt arbetskatalogen förbli låst"
+
+#: builtin/worktree.c:342
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B och --detach är ömsesidigt uteslutande"
-#: builtin/worktree.c:472
+#: builtin/worktree.c:479
msgid "reason for locking"
msgstr "orsak till lås"
-#: builtin/worktree.c:484 builtin/worktree.c:517
+#: builtin/worktree.c:491 builtin/worktree.c:524
#, c-format
msgid "'%s' is not a working tree"
msgstr "\"%s\" är inte en arbetskatalog"
-#: builtin/worktree.c:486 builtin/worktree.c:519
+#: builtin/worktree.c:493 builtin/worktree.c:526
msgid "The main working tree cannot be locked or unlocked"
msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
-#: builtin/worktree.c:491
+#: builtin/worktree.c:498
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "\"%s\" är redan låst, orsak: %s"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:500
#, c-format
msgid "'%s' is already locked"
msgstr "\"%s\" är redan låst"
-#: builtin/worktree.c:521
+#: builtin/worktree.c:528
#, c-format
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
-#: builtin/write-tree.c:13
+#: builtin/write-tree.c:14
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
-#: builtin/write-tree.c:26
+#: builtin/write-tree.c:27
msgid "<prefix>/"
msgstr "<prefix>/"
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
msgid "write tree object for a subdirectory <prefix>"
msgstr "visa trädobjekt för underkatalogen <prefix>"
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr "endast användbart vid felsökning"
-#: upload-pack.c:22
+#: upload-pack.c:23
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<flaggor>] <katalog>"
-#: upload-pack.c:1036
+#: upload-pack.c:1041
msgid "quit after a single request/response exchange"
msgstr "avsluta omedelbart efter första anrop/svar-utväxling"
-#: upload-pack.c:1038
+#: upload-pack.c:1043
msgid "exit immediately after initial ref advertisement"
msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
-#: upload-pack.c:1040
+#: upload-pack.c:1045
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog"
-#: upload-pack.c:1042
+#: upload-pack.c:1047
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "avbryt överföringen efter <n> sekunders inaktivitet"
-#: credential-cache--daemon.c:223
+#: credential-cache--daemon.c:224
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -13559,11 +13915,11 @@ msgstr ""
"\n"
"\tchmod 0700 %s"
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr "skriv felsökningsmeddelanden på standard fel"
-#: git.c:14
+#: git.c:15
msgid ""
"'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
@@ -13573,15 +13929,20 @@ msgstr ""
"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
"<koncept>\" för att läsa mer om specifika underkommandon och koncept."
-#: http.c:344
+#: http.c:337
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "http.postbuffer har negativt värde; använder förvalet %d"
+
+#: http.c:358
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"
-#: http.c:353
+#: http.c:367
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0"
-#: http.c:1713
+#: http.c:1764
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -13592,7 +13953,7 @@ msgstr ""
" bad om: %s\n"
" omdirigering: %s"
-#: remote-curl.c:319
+#: remote-curl.c:324
#, c-format
msgid "redirecting to %s"
msgstr "omdirigerar till %s"
@@ -13734,7 +14095,7 @@ msgstr "Du måste starta med \"git bisect start\""
#. at this point.
#: git-bisect.sh:60
msgid "Do you want me to do it for you [Y/n]? "
-msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]?"
+msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]? "
#: git-bisect.sh:121
#, sh-format
@@ -13756,7 +14117,7 @@ msgid ""
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
msgstr ""
"Misslyckades checka ut \"$start_head\". Försök \"git bisect reset "
-"<giltig_gren>\""
+"<giltig_gren>”."
# cogito-relaterat
#: git-bisect.sh:177
@@ -13796,7 +14157,7 @@ msgstr "\"git bisect $TERM_BAD\" kan bara ta ett argument."
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr ""
-"Varning: utför \"bisect\" med endast en dålig (\"$TERM_BAD\") incheckning"
+"Varning: utför \"bisect\" med endast en dålig (\"$TERM_BAD\") incheckning."
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
@@ -13969,7 +14330,7 @@ msgstr "Försök enkel sammanslagning med $pretty_name"
msgid "Simple merge did not work, trying automatic merge."
msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."
-#: git-rebase.sh:57
+#: git-rebase.sh:58
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
@@ -13980,37 +14341,41 @@ msgstr ""
"Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n"
"För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"."
-#: git-rebase.sh:157 git-rebase.sh:396
+#: git-rebase.sh:158 git-rebase.sh:397
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Kunde inte flytta tillbaka till $head_name"
-#: git-rebase.sh:171
+#: git-rebase.sh:169
+msgid "Applied autostash."
+msgstr "Tillämpade autostash."
+
+#: git-rebase.sh:172
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Kan inte spara $stash_sha1"
-#: git-rebase.sh:211
+#: git-rebase.sh:212
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
-#: git-rebase.sh:216
+#: git-rebase.sh:217
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Det verkar som en git-am körs. Kan inte ombasera."
-#: git-rebase.sh:357
+#: git-rebase.sh:358
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
-#: git-rebase.sh:368
+#: git-rebase.sh:369
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
-#: git-rebase.sh:375
+#: git-rebase.sh:376
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
-#: git-rebase.sh:378
+#: git-rebase.sh:379
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14018,7 +14383,7 @@ msgstr ""
"Du måste redigera alla sammanslagningskonflikter och\n"
"därefter markera dem som lösta med git add"
-#: git-rebase.sh:418
+#: git-rebase.sh:419
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -14039,102 +14404,102 @@ msgstr ""
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
"något av värde där."
-#: git-rebase.sh:469
+#: git-rebase.sh:470
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "ogiltig uppström $upstream_name"
-#: git-rebase.sh:493
+#: git-rebase.sh:494
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: mer än en sammanslagningsbas finns"
-#: git-rebase.sh:496 git-rebase.sh:500
+#: git-rebase.sh:497 git-rebase.sh:501
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ingen sammanslagningsbas finns"
-#: git-rebase.sh:505
+#: git-rebase.sh:506
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Peka på en giltig incheckning: $onto_name"
-#: git-rebase.sh:528
+#: git-rebase.sh:529
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "ödesdigert: ingen sådan gren: $branch_name"
-#: git-rebase.sh:561
+#: git-rebase.sh:562
msgid "Cannot autostash"
msgstr "Kan inte utföra \"autostash\""
-#: git-rebase.sh:566
+#: git-rebase.sh:567
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Skapade autostash: $stash_abbrev"
-#: git-rebase.sh:570
+#: git-rebase.sh:571
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
-#: git-rebase.sh:590
+#: git-rebase.sh:591
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktuell gren $branch_name är à jour."
-#: git-rebase.sh:594
+#: git-rebase.sh:595
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
-#: git-rebase.sh:605
+#: git-rebase.sh:606
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Ändringar från $mb till $onto:"
-#: git-rebase.sh:614
+#: git-rebase.sh:615
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
-#: git-rebase.sh:624
+#: git-rebase.sh:625
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Snabbspolade $branch_name till $onto_name."
-#: git-stash.sh:50
+#: git-stash.sh:54
msgid "git stash clear with parameters is unimplemented"
msgstr "\"git stash clear\" med parametrar har inte implementerats"
-#: git-stash.sh:73
+#: git-stash.sh:95
msgid "You do not have the initial commit yet"
msgstr "Du har inte den första incheckningen ännu"
-#: git-stash.sh:88
+#: git-stash.sh:110
msgid "Cannot save the current index state"
msgstr "Kan inte spara aktuellt tillstånd för indexet"
-#: git-stash.sh:103
+#: git-stash.sh:125
msgid "Cannot save the untracked files"
msgstr "Kan inte spara ospårade filer"
-#: git-stash.sh:123 git-stash.sh:136
+#: git-stash.sh:145 git-stash.sh:158
msgid "Cannot save the current worktree state"
msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
-#: git-stash.sh:140
+#: git-stash.sh:162
msgid "No changes selected"
msgstr "Inga ändringar valda"
-#: git-stash.sh:143
+#: git-stash.sh:165
msgid "Cannot remove temporary index (can't happen)"
msgstr "Kan inte ta bort temporärt index (kan inte inträffa)"
-#: git-stash.sh:156
+#: git-stash.sh:178
msgid "Cannot record working tree state"
msgstr "Kan inte registrera tillstånd för arbetskatalog"
-#: git-stash.sh:188
+#: git-stash.sh:210
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Kan inte uppdatera $ref_stash med $w_commit"
@@ -14149,7 +14514,7 @@ msgstr "Kan inte uppdatera $ref_stash med $w_commit"
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:238
+#: git-stash.sh:266
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -14158,108 +14523,107 @@ msgstr ""
"fel: felaktig flagga för \"stash save\": $option\n"
" För att ange ett meddelande, använd git stash save -- \"$option\""
-#: git-stash.sh:251
+#: git-stash.sh:281
msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr ""
-"Kan inte använda --patch och --include-untracked eller --all samtidigt."
+msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt"
-#: git-stash.sh:259
+#: git-stash.sh:289
msgid "No local changes to save"
msgstr "Inga lokala ändringar att spara"
-#: git-stash.sh:263
+#: git-stash.sh:294
msgid "Cannot initialize stash"
msgstr "Kan inte initiera \"stash\""
-#: git-stash.sh:267
+#: git-stash.sh:298
msgid "Cannot save the current status"
msgstr "Kan inte spara aktuell status"
-#: git-stash.sh:268
+#: git-stash.sh:299
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Sparade arbetskatalogen och indexstatus $stash_msg"
-#: git-stash.sh:285
+#: git-stash.sh:326
msgid "Cannot remove worktree changes"
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-#: git-stash.sh:403
+#: git-stash.sh:474
#, sh-format
msgid "unknown option: $opt"
msgstr "okänd flagga: $opt"
-#: git-stash.sh:416
-msgid "No stash found."
-msgstr "Ingen \"stash\" hittades."
+#: git-stash.sh:487
+msgid "No stash entries found."
+msgstr "Inga \"stash”-poster hittades."
-#: git-stash.sh:423
+#: git-stash.sh:494
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "För många revisioner angivna: $REV"
-#: git-stash.sh:438
+#: git-stash.sh:509
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference är inte en giltig referens"
-#: git-stash.sh:466
+#: git-stash.sh:537
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
-#: git-stash.sh:477
+#: git-stash.sh:548
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "\"$args\" är inte en \"stash\"-referens"
-#: git-stash.sh:485
+#: git-stash.sh:556
msgid "unable to refresh index"
msgstr "kan inte uppdatera indexet"
-#: git-stash.sh:489
+#: git-stash.sh:560
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning"
-#: git-stash.sh:497
+#: git-stash.sh:568
msgid "Conflicts in index. Try without --index."
msgstr "Konflikter i indexet. Testa utan --index."
-#: git-stash.sh:499
+#: git-stash.sh:570
msgid "Could not save index tree"
msgstr "Kunde inte spara indexträd"
-#: git-stash.sh:508
-msgid "Could not restore untracked files from stash"
-msgstr "Kunde inte återställa ospårade filer från stash"
+#: git-stash.sh:579
+msgid "Could not restore untracked files from stash entry"
+msgstr "Kunde inte återställa ospårade filer från stash-post"
-#: git-stash.sh:533
+#: git-stash.sh:604
msgid "Cannot unstage modified files"
msgstr "Kan inte ta bort ändrade filer ur kön"
-#: git-stash.sh:548
+#: git-stash.sh:619
msgid "Index was not unstashed."
msgstr "Indexet har inte tagits ur kön."
-#: git-stash.sh:562
-msgid "The stash is kept in case you need it again."
-msgstr "\"Stash\":en behålls ifall du behöver den igen."
+#: git-stash.sh:633
+msgid "The stash entry is kept in case you need it again."
+msgstr "Stash-posten behålls ifall du behöver den igen."
-#: git-stash.sh:571
+#: git-stash.sh:642
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Kastade ${REV} ($s)"
-#: git-stash.sh:572
+#: git-stash.sh:643
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Kunde inte kasta \"stash\"-post"
-#: git-stash.sh:580
+#: git-stash.sh:651
msgid "No branch name specified"
msgstr "Inget grennamn angavs"
-#: git-stash.sh:652
+#: git-stash.sh:730
msgid "(To restore them type \"git stash apply\")"
msgstr "(För att återställa dem, skriv \"git stash apply\")"
@@ -14282,7 +14646,7 @@ msgstr "\"$sm_path\" finns redan i indexet"
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul"
-#: git-submodule.sh:218
+#: git-submodule.sh:219
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
@@ -14291,24 +14655,24 @@ msgid ""
msgstr ""
"Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
"$sm_path\n"
-"Använd -f om du verkligen vill lägga till den"
+"Använd -f om du verkligen vill lägga till den."
-#: git-submodule.sh:236
+#: git-submodule.sh:237
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
-#: git-submodule.sh:238
+#: git-submodule.sh:239
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
-#: git-submodule.sh:246
+#: git-submodule.sh:247
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):"
-#: git-submodule.sh:248
+#: git-submodule.sh:249
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -14326,48 +14690,48 @@ msgstr ""
"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
"flaggan \"--name\"."
-#: git-submodule.sh:254
+#: git-submodule.sh:255
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt."
-#: git-submodule.sh:266
+#: git-submodule.sh:267
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kan inte checka ut undermodulen \"$sm_path\""
-#: git-submodule.sh:271
+#: git-submodule.sh:272
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
-#: git-submodule.sh:280
+#: git-submodule.sh:281
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Misslyckades registrera undermodulen \"$sm_path\""
-#: git-submodule.sh:327
+#: git-submodule.sh:342
#, sh-format
msgid "Entering '$displaypath'"
msgstr "Går in i \"$displaypath\""
-#: git-submodule.sh:347
+#: git-submodule.sh:362
#, sh-format
msgid "Stopping at '$displaypath'; script returned non-zero status."
msgstr ""
"Stoppar på \"$displaypath\"; skriptet returnerade en status skild från noll."
-#: git-submodule.sh:418
+#: git-submodule.sh:433
#, sh-format
msgid "pathspec and --all are incompatible"
msgstr "sökvägsangivelse och --all är inkompatibla"
-#: git-submodule.sh:423
+#: git-submodule.sh:438
#, sh-format
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
-#: git-submodule.sh:443
+#: git-submodule.sh:458
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains a .git directory\n"
@@ -14376,7 +14740,7 @@ msgstr ""
"Undermodulsarbetskatalogen \"$displaypath\" innehåller en .git-katalog\n"
"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
-#: git-submodule.sh:451
+#: git-submodule.sh:466
#, sh-format
msgid ""
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -14385,38 +14749,38 @@ msgstr ""
"Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" "
"kastar bort dem"
-#: git-submodule.sh:454
+#: git-submodule.sh:469
#, sh-format
msgid "Cleared directory '$displaypath'"
msgstr "Rensade katalogen \"$displaypath\""
-#: git-submodule.sh:455
+#: git-submodule.sh:470
#, sh-format
msgid "Could not remove submodule work tree '$displaypath'"
msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\""
-#: git-submodule.sh:458
+#: git-submodule.sh:473
#, sh-format
msgid "Could not create empty submodule directory '$displaypath'"
msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\""
-#: git-submodule.sh:467
+#: git-submodule.sh:482
#, sh-format
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
"Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\""
-#: git-submodule.sh:623
+#: git-submodule.sh:638
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:633
+#: git-submodule.sh:648
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
-#: git-submodule.sh:638
+#: git-submodule.sh:653
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -14425,12 +14789,12 @@ msgstr ""
"Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
"undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:656
+#: git-submodule.sh:671
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\""
-#: git-submodule.sh:662
+#: git-submodule.sh:677
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14439,84 +14803,84 @@ msgstr ""
"Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
"Direkt hämtning av incheckningen misslyckades."
-#: git-submodule.sh:669
+#: git-submodule.sh:684
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:670
+#: git-submodule.sh:685
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
-#: git-submodule.sh:674
+#: git-submodule.sh:689
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:675
+#: git-submodule.sh:690
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
-#: git-submodule.sh:680
+#: git-submodule.sh:695
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:681
+#: git-submodule.sh:696
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
-#: git-submodule.sh:686
+#: git-submodule.sh:701
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:687
+#: git-submodule.sh:702
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
-#: git-submodule.sh:718
+#: git-submodule.sh:733
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:826
+#: git-submodule.sh:841
msgid "The --cached option cannot be used with the --files option"
msgstr "Flaggan --cached kan inte användas med flaggan --files"
-#: git-submodule.sh:878
+#: git-submodule.sh:893
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "oväntat läge $mod_dst"
-#: git-submodule.sh:898
+#: git-submodule.sh:913
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src"
-#: git-submodule.sh:901
+#: git-submodule.sh:916
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst"
-#: git-submodule.sh:904
+#: git-submodule.sh:919
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Varning: $display_name innehåller inte incheckningarna $sha1_src och "
"$sha1_dst"
-#: git-submodule.sh:1051
+#: git-submodule.sh:1065
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:1118
+#: git-submodule.sh:1137
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synkroniserar undermodul-url för \"$displaypath\""
@@ -14667,7 +15031,7 @@ msgstr "Det här är en kombination av 2 incheckningar."
#: git-rebase--interactive.sh:531
#, sh-format
msgid "Could not apply $sha1... $rest"
-msgstr "kunde inte tillämpa $sha1... $rest"
+msgstr "Kunde inte tillämpa $sha1... $rest"
#: git-rebase--interactive.sh:559
#, sh-format
@@ -14715,7 +15079,7 @@ msgid ""
msgstr ""
"Du kan rätta problemet och sedan köra\n"
"\n"
-"\tgit rebase --continue\""
+"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
#: git-rebase--interactive.sh:656
@@ -14818,11 +15182,11 @@ msgstr ""
msgid "Or you can abort the rebase with 'git rebase --abort'."
msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"."
-#: git-rebase--interactive.sh:1079
+#: git-rebase--interactive.sh:1083
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Kunde inte ta bort CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1084
+#: git-rebase--interactive.sh:1088
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -14853,11 +15217,11 @@ msgstr ""
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1101
+#: git-rebase--interactive.sh:1105
msgid "Error trying to find the author identity to amend commit"
msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning"
-#: git-rebase--interactive.sh:1106
+#: git-rebase--interactive.sh:1110
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
@@ -14865,11 +15229,11 @@ msgstr ""
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
"först och kör sedan \"git rebase --continute\" igen."
-#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115
+#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
msgid "Could not commit staged changes."
msgstr "Kunde inte checka in köade ändringar."
-#: git-rebase--interactive.sh:1139
+#: git-rebase--interactive.sh:1147
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -14883,40 +15247,40 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305
+#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
msgid "Could not execute editor"
msgstr "Kunde inte starta textredigerare"
-#: git-rebase--interactive.sh:1160
+#: git-rebase--interactive.sh:1168
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Kunde inte checka ut $switch_to"
-#: git-rebase--interactive.sh:1165
+#: git-rebase--interactive.sh:1173
msgid "No HEAD?"
msgstr "Inget HEAD?"
-#: git-rebase--interactive.sh:1166
+#: git-rebase--interactive.sh:1174
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Kunde inte skapa temporär $state_dir"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:1176
msgid "Could not mark as interactive"
msgstr "Kunde inte markera som interaktiv"
-#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183
+#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
msgid "Could not init rewritten commits"
msgstr "Kunde inte initiera omskrivna incheckningar"
-#: git-rebase--interactive.sh:1283
+#: git-rebase--interactive.sh:1291
#, 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:1288
+#: git-rebase--interactive.sh:1296
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -14926,7 +15290,7 @@ msgstr ""
"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
"\n"
-#: git-rebase--interactive.sh:1295
+#: git-rebase--interactive.sh:1303
msgid "Note that empty commits are commented out"
msgstr "Observera att tomma incheckningar är utkommenterade"
@@ -14991,81 +15355,81 @@ msgid "Unable to determine absolute path of git directory"
msgstr "Kunde inte bestämma absolut sökväg till git-katalogen"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:238
+#: git-add--interactive.perl:196
#, perl-format
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
msgid "staged"
msgstr "köad"
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
msgid "unstaged"
msgstr "ej köad"
-#: git-add--interactive.perl:297 git-add--interactive.perl:322
+#: git-add--interactive.perl:246 git-add--interactive.perl:271
msgid "binary"
msgstr "binär"
-#: git-add--interactive.perl:306 git-add--interactive.perl:360
+#: git-add--interactive.perl:255 git-add--interactive.perl:309
msgid "nothing"
msgstr "ingenting"
-#: git-add--interactive.perl:342 git-add--interactive.perl:357
+#: git-add--interactive.perl:291 git-add--interactive.perl:306
msgid "unchanged"
msgstr "oändrad"
-#: git-add--interactive.perl:653
+#: git-add--interactive.perl:602
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "lade till %d sökväg\n"
msgstr[1] "lade till %d sökvägar\n"
-#: git-add--interactive.perl:656
+#: git-add--interactive.perl:605
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "uppdaterade %d sökväg\n"
msgstr[1] "uppdaterade %d sökvägar\n"
-#: git-add--interactive.perl:659
+#: git-add--interactive.perl:608
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "återställde %d sökväg\n"
msgstr[1] "återställde %d sökvägar\n"
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:611
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "rörde %d sökväg\n"
msgstr[1] "rörde %d sökvägar\n"
-#: git-add--interactive.perl:671
+#: git-add--interactive.perl:620
msgid "Update"
msgstr "Uppdatera"
-#: git-add--interactive.perl:683
+#: git-add--interactive.perl:632
msgid "Revert"
msgstr "Återställ"
-#: git-add--interactive.perl:706
+#: git-add--interactive.perl:655
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "observera: %s spåras inte längre.\n"
-#: git-add--interactive.perl:717
+#: git-add--interactive.perl:666
msgid "Add untracked"
msgstr "Lägg till ospårad"
-#: git-add--interactive.perl:723
+#: git-add--interactive.perl:672
msgid "No untracked files.\n"
msgstr "Inga ospårade filer.\n"
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:985
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -15073,7 +15437,7 @@ msgstr ""
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"köas omedelbart."
-#: git-add--interactive.perl:1042
+#: git-add--interactive.perl:988
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -15081,7 +15445,7 @@ msgstr ""
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"läggas till i \"stash\" omedelbart."
-#: git-add--interactive.perl:1045
+#: git-add--interactive.perl:991
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -15089,7 +15453,7 @@ msgstr ""
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"tas bort från kön omedelbart."
-#: git-add--interactive.perl:1048 git-add--interactive.perl:1057
+#: git-add--interactive.perl:994 git-add--interactive.perl:1003
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -15097,15 +15461,7 @@ msgstr ""
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"markeras för applicering omedelbart."
-#: git-add--interactive.perl:1051
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for discarding"
-msgstr ""
-"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
-"markeras för kasta omedelbart"
-
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:997 git-add--interactive.perl:1000
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -15113,16 +15469,16 @@ msgstr ""
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"markeras för kasta omedelbart."
-#: git-add--interactive.perl:1067
+#: git-add--interactive.perl:1013
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s"
-#: git-add--interactive.perl:1068
+#: git-add--interactive.perl:1014
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1020
#, perl-format
msgid ""
"---\n"
@@ -15136,7 +15492,7 @@ msgstr ""
"Rader som börjar med %s kommer att tas bort.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1082
+#: git-add--interactive.perl:1028
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -15146,7 +15502,7 @@ msgstr ""
"redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"
"redigeringen och stycket lämnas oförändrat.\n"
-#: git-add--interactive.perl:1096
+#: git-add--interactive.perl:1042
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s"
@@ -15157,14 +15513,14 @@ msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s"
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1187
+#: git-add--interactive.perl:1134
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "
-"[y/n]?"
+"[y/n]? "
-#: git-add--interactive.perl:1196
+#: git-add--interactive.perl:1143
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -15178,7 +15534,7 @@ msgstr ""
"a - köa stycket och alla följande i filen\n"
"d - köa inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1202
+#: git-add--interactive.perl:1149
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -15192,7 +15548,7 @@ msgstr ""
"a - \"stash\":a stycket och alla följande i filen\n"
"d - \"stash\":a inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1208
+#: git-add--interactive.perl:1155
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -15206,7 +15562,7 @@ msgstr ""
"a - ta bort stycket och alla följande i filen från kön\n"
"d - ta inte bort stycket eller något av de följande i filen från kön"
-#: git-add--interactive.perl:1214
+#: git-add--interactive.perl:1161
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -15220,7 +15576,7 @@ msgstr ""
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1220
+#: git-add--interactive.perl:1167
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -15234,7 +15590,7 @@ msgstr ""
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1226
+#: git-add--interactive.perl:1173
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -15248,7 +15604,7 @@ msgstr ""
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1232
+#: git-add--interactive.perl:1179
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -15262,7 +15618,7 @@ msgstr ""
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1241
+#: git-add--interactive.perl:1188
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -15284,203 +15640,203 @@ msgstr ""
"e - redigera aktuellt stycke manuellt\n"
"? - visa hjälp\n"
-#: git-add--interactive.perl:1272
+#: git-add--interactive.perl:1219
msgid "The selected hunks do not apply to the index!\n"
msgstr "Markerade stycken kan inte appliceras på indexet!\n"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1220
msgid "Apply them to the worktree anyway? "
msgstr "Applicera dem på arbetskatalogen trots det? "
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1223
msgid "Nothing was applied.\n"
msgstr "Ingenting applicerades.\n"
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1234
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignorerar ej sammanslagen: %s\n"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1243
msgid "Only binary files changed.\n"
msgstr "Endast binära filer ändrade.\n"
-#: git-add--interactive.perl:1298
+#: git-add--interactive.perl:1245
msgid "No changes.\n"
msgstr "Inga ändringar.\n"
-#: git-add--interactive.perl:1306
+#: git-add--interactive.perl:1253
msgid "Patch update"
msgstr "Uppdatera patch"
-#: git-add--interactive.perl:1358
+#: git-add--interactive.perl:1305
#, perl-format
msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Köa ändrat läge [y,n,q,a,d,/%s,?]?"
+msgstr "Köa ändrat läge [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1359
+#: git-add--interactive.perl:1306
#, perl-format
msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Köa borttagning [y,n,q,a,d,/%s,?]?"
+msgstr "Köa borttagning [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1307
#, perl-format
msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Köa stycket [y,n,q,a,d,/%s,?]?"
+msgstr "Köa stycket [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1363
+#: git-add--interactive.perl:1310
#, perl-format
msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Stash:a ändrat läge [y,n,q,a,d,/%s,?]?"
+msgstr "Stash:a ändrat läge [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1364
+#: git-add--interactive.perl:1311
#, perl-format
msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Stash:a borttagning [y,n,q,a,d,/%s,?]?"
+msgstr "Stash:a borttagning [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1365
+#: git-add--interactive.perl:1312
#, perl-format
msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Stash:a stycket [y,n,q,a,d,/%s,?]?"
+msgstr "Stash:a stycket [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1368
+#: git-add--interactive.perl:1315
#, perl-format
msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Ta bort ändrat läge från kön [y,n,q,a,d,/%s,?]?"
+msgstr "Ta bort ändrat läge från kön [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1369
+#: git-add--interactive.perl:1316
#, perl-format
msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Ta bort borttagning från kön [y,n,q,a,d,/%s,?]?"
+msgstr "Ta bort borttagning från kön [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1370
+#: git-add--interactive.perl:1317
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Ta bort stycket från kön [y,n,q,a,d,/%s,?]?"
+msgstr "Ta bort stycket från kön [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1373
+#: git-add--interactive.perl:1320
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
-msgstr "Applicera ändrat läge på indexet [y,n,q,a,d,/%s,?]?"
+msgstr "Applicera ändrat läge på indexet [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1374
+#: git-add--interactive.perl:1321
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
-msgstr "Applicera borttagning på indexet [y,n,q,a,d,/%s,?]?"
+msgstr "Applicera borttagning på indexet [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1375
+#: git-add--interactive.perl:1322
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
-msgstr "Applicera stycket på indexet [y,n,q,a,d,/%s,?]?"
+msgstr "Applicera stycket på indexet [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1378
+#: git-add--interactive.perl:1325
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d,/%s,?]?"
+msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1379
+#: git-add--interactive.perl:1326
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d,/%s,?]?"
+msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1380
+#: git-add--interactive.perl:1327
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d,/%s,?]?"
+msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1383
+#: git-add--interactive.perl:1330
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?"
+msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1384
+#: git-add--interactive.perl:1331
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?"
+msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1385
+#: git-add--interactive.perl:1332
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?"
+msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1388
+#: git-add--interactive.perl:1335
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-"Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?"
+"Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1389
+#: git-add--interactive.perl:1336
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
msgstr ""
-"Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?"
+"Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1337
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?"
+msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]? "
-#: git-add--interactive.perl:1493
+#: git-add--interactive.perl:1440
msgid "go to which hunk (<ret> to see more)? "
-msgstr "gå till vilket stycke (<ret> för att se fler)?"
+msgstr "gå till vilket stycke (<ret> för att se fler)? "
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1442
msgid "go to which hunk? "
-msgstr "gå till vilket stycke?"
+msgstr "gå till vilket stycke? "
-#: git-add--interactive.perl:1504
+#: git-add--interactive.perl:1451
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Ogiltigt siffervärde: \"%s\"\n"
-#: git-add--interactive.perl:1509
+#: git-add--interactive.perl:1456
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Beklagar, det finns bara %d stycke.\n"
msgstr[1] "Beklagar, det finns bara %d stycken.\n"
-#: git-add--interactive.perl:1535
+#: git-add--interactive.perl:1482
msgid "search for regex? "
msgstr "sök efter reguljärt uttryck? "
-#: git-add--interactive.perl:1548
+#: git-add--interactive.perl:1495
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n"
-#: git-add--interactive.perl:1558
+#: git-add--interactive.perl:1505
msgid "No hunk matches the given pattern\n"
msgstr "Inga stycken motsvarar givet mönster\n"
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1592
+#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
msgid "No previous hunk\n"
msgstr "Inget föregående stycke\n"
-#: git-add--interactive.perl:1579 git-add--interactive.perl:1598
+#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
msgid "No next hunk\n"
msgstr "Inget följande stycke\n"
-#: git-add--interactive.perl:1606
+#: git-add--interactive.perl:1553
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Dela i %d stycke.\n"
msgstr[1] "Dela i %d stycken.\n"
-#: git-add--interactive.perl:1658
+#: git-add--interactive.perl:1605
msgid "Review diff"
msgstr "Granska diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1677
+#: git-add--interactive.perl:1624
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"revert - revert staged set of changes back to the HEAD version\n"
"patch - pick hunks and update selectively\n"
-"diff\t - view diff between HEAD and index\n"
+"diff - view diff between HEAD and index\n"
"add untracked - add contents of untracked files to the staged set of "
"changes\n"
msgstr ""
@@ -15488,88 +15844,88 @@ msgstr ""
"update - lägg arbetskatalogens tillstånd till köade ändringar\n"
"revert - återställ köade ändringar till HEAD-versionen\n"
"patch - välj och uppdatera valda stycken\n"
-"diff\t - visa diff mellan HEAD och index\n"
+"diff - visa diff mellan HEAD och index\n"
"add untracked - lägg till innehåll i ospårade filer till köade ändringar\n"
-#: git-add--interactive.perl:1694 git-add--interactive.perl:1699
-#: git-add--interactive.perl:1702 git-add--interactive.perl:1709
-#: git-add--interactive.perl:1713 git-add--interactive.perl:1719
+#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
+#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
+#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
msgid "missing --"
msgstr "saknad --"
-#: git-add--interactive.perl:1715
+#: git-add--interactive.perl:1662
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "okänt läge för --patch: %s"
-#: git-add--interactive.perl:1721 git-add--interactive.perl:1727
+#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "felaktigt argument %s, förväntar --"
-#: git-send-email.perl:121
+#: git-send-email.perl:126
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "lokal zon skiljer sig från GMT med delar av minuter\n"
-#: git-send-email.perl:128 git-send-email.perl:134
+#: git-send-email.perl:133 git-send-email.perl:139
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n"
-#: git-send-email.perl:202 git-send-email.perl:208
+#: git-send-email.perl:208 git-send-email.perl:214
msgid "the editor exited uncleanly, aborting everything"
msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting"
-#: git-send-email.perl:282
+#: git-send-email.perl:291
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
"\"%s\" innehåller en mellanliggande version av e-postbrevet du skrev.\n"
-#: git-send-email.perl:287
+#: git-send-email.perl:296
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "\"%s.final\" innehåller det skrivna brevet.\n"
-#: git-send-email.perl:305
+#: git-send-email.perl:314
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-alias är inkompatibelt med andra flaggor\n"
-#: git-send-email.perl:368 git-send-email.perl:623
+#: git-send-email.perl:379 git-send-email.perl:634
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Kan inte köra git format-patch från utanför arkivet\n"
-#: git-send-email.perl:437
+#: git-send-email.perl:448
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Okänt fält i --suppress-cc: \"%s\"\n"
-#: git-send-email.perl:466
+#: git-send-email.perl:477
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Okänd inställning i --confirm: \"%s\"\n"
-#: git-send-email.perl:498
+#: git-send-email.perl:509
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n"
-#: git-send-email.perl:500
+#: git-send-email.perl:511
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "varning: \":include:\" stöds inte: %s\n"
-#: git-send-email.perl:502
+#: git-send-email.perl:513
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n"
-#: git-send-email.perl:507
+#: git-send-email.perl:518
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "varning: sendmail-raden känns inte igen: %s\n"
-#: git-send-email.perl:589
+#: git-send-email.perl:600
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -15584,12 +15940,12 @@ msgstr ""
" * Säga \"./%s\" om du menar en fil; eller\n"
" * Ange flaggan --format-patch om du menar ett intervall.\n"
-#: git-send-email.perl:610
+#: git-send-email.perl:621
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Misslyckades utföra opendir %s: %s"
-#: git-send-email.perl:634
+#: git-send-email.perl:645
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -15598,7 +15954,7 @@ msgstr ""
"ödesdigert: %s: %s\n"
"varning: inga patchar har sänts\n"
-#: git-send-email.perl:645
+#: git-send-email.perl:656
msgid ""
"\n"
"No patch files specified!\n"
@@ -15608,17 +15964,17 @@ msgstr ""
"Inga patchfiler angavs!\n"
"\n"
-#: git-send-email.perl:658
+#: git-send-email.perl:669
#, perl-format
msgid "No subject line in %s?"
msgstr "Ingen ärenderad i %s?"
-#: git-send-email.perl:668
+#: git-send-email.perl:679
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Kunde inte öppna för skrivning %s: %s"
-#: git-send-email.perl:678
+#: git-send-email.perl:689
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -15632,42 +15988,42 @@ msgstr ""
"\n"
"Rensa brevkroppen om du inte vill sända någon sammanfattning.\n"
-#: git-send-email.perl:701
+#: git-send-email.perl:712
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Misslyckades öppna %s.final: %s"
-#: git-send-email.perl:704
+#: git-send-email.perl:715
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Misslyckades öppna %s: %s"
-#: git-send-email.perl:739
+#: git-send-email.perl:750
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
msgstr "Fälten To/Cc/Bcc tolkas inte ännu, de har ignorerats\n"
-#: git-send-email.perl:748
+#: git-send-email.perl:759
msgid "Summary email is empty, skipping it\n"
msgstr "Sammanfattande brev tomt, hoppar över\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:780
+#: git-send-email.perl:791
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? "
-#: git-send-email.perl:809
+#: git-send-email.perl:820
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
"Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n"
-#: git-send-email.perl:814
+#: git-send-email.perl:825
msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]?"
+msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]? "
-#: git-send-email.perl:822
+#: git-send-email.perl:833
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -15680,21 +16036,21 @@ msgstr ""
"har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen "
"vill sända.\n"
-#: git-send-email.perl:841
+#: git-send-email.perl:852
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Till vem skall breven sändas (om någon)?"
-#: git-send-email.perl:859
+#: git-send-email.perl:870
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n"
-#: git-send-email.perl:871
+#: git-send-email.perl:882
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
-"Message-ID att använda som In-Reply-To för det första brevet (om något)?"
+"Message-ID att använda som In-Reply-To för det första brevet (om något)? "
-#: git-send-email.perl:921 git-send-email.perl:929
+#: git-send-email.perl:932 git-send-email.perl:940
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "fel: kunde inte få fram en giltig adress från: %s\n"
@@ -15702,16 +16058,16 @@ msgstr "fel: kunde inte få fram en giltig adress från: %s\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:933
+#: git-send-email.perl:944
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
-msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera):"
+msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): "
-#: git-send-email.perl:1234
+#: git-send-email.perl:1245
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA-sökvägen \"%s\" finns inte"
-#: git-send-email.perl:1309
+#: git-send-email.perl:1320
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -15738,119 +16094,124 @@ msgstr ""
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1324
+#: git-send-email.perl:1335
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr "Sända brevet? (y=ja, n=nej, q=avsluta, a=alla): "
-#: git-send-email.perl:1327
+#: git-send-email.perl:1338
msgid "Send this email reply required"
msgstr "Svar krävs på frågan \"Sända brevet?\""
-#: git-send-email.perl:1353
+#: git-send-email.perl:1364
msgid "The required SMTP server is not properly defined."
msgstr "Nödvändig SMTP-server har inte angivits korrekt."
-#: git-send-email.perl:1397
+#: git-send-email.perl:1411
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Servern stöder inte SMARTTLS! %s"
-#: git-send-email.perl:1403
+#: git-send-email.perl:1416 git-send-email.perl:1420
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "STARTTLS misslyckades! %s"
+
+#: git-send-email.perl:1430
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --"
"smtp-debug."
-#: git-send-email.perl:1421
+#: git-send-email.perl:1448
#, perl-format
msgid "Failed to send %s\n"
msgstr "Misslyckades sända %s\n"
-#: git-send-email.perl:1424
+#: git-send-email.perl:1451
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Test-Sände %s\n"
-#: git-send-email.perl:1424
+#: git-send-email.perl:1451
#, perl-format
msgid "Sent %s\n"
msgstr "Sände %s\n"
-#: git-send-email.perl:1426
+#: git-send-email.perl:1453
msgid "Dry-OK. Log says:\n"
msgstr "Test-OK. Loggen säger:\n"
-#: git-send-email.perl:1426
+#: git-send-email.perl:1453
msgid "OK. Log says:\n"
msgstr "OK. Loggen säger:\n"
-#: git-send-email.perl:1438
+#: git-send-email.perl:1465
msgid "Result: "
msgstr "Resultat: "
-#: git-send-email.perl:1441
+#: git-send-email.perl:1468
msgid "Result: OK\n"
msgstr "Resultat: OK\n"
-#: git-send-email.perl:1454
+#: git-send-email.perl:1481
#, perl-format
msgid "can't open file %s"
msgstr "kan inte öppna filen %s"
-#: git-send-email.perl:1501 git-send-email.perl:1521
+#: git-send-email.perl:1528 git-send-email.perl:1548
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1507
+#: git-send-email.perl:1534
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n"
-#: git-send-email.perl:1555
+#: git-send-email.perl:1582
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1578
+#: git-send-email.perl:1605
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n"
-#: git-send-email.perl:1676
+#: git-send-email.perl:1711
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Kunde inte köra \"%s\""
-#: git-send-email.perl:1683
+#: git-send-email.perl:1718
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Lägger till %s: %s från: \"%s\"\n"
-#: git-send-email.perl:1687
+#: git-send-email.perl:1722
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) misslyckades stänga röret till \"%s\""
-#: git-send-email.perl:1714
+#: git-send-email.perl:1749
msgid "cannot send message as 7bit"
msgstr "kan inte sända brev som sjubitars"
-#: git-send-email.perl:1722
+#: git-send-email.perl:1757
msgid "invalid transfer encoding"
msgstr "ogiltig överföringskondning"
-#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802
+#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "kunde inte öppna %s: %s\n"
-#: git-send-email.perl:1744
+#: git-send-email.perl:1798
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: patchen innehåller en rad längre än 998 tecken"
-#: git-send-email.perl:1760
+#: git-send-email.perl:1814
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
@@ -15858,11 +16219,182 @@ msgstr ""
"säkerhetskopior.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1764
+#: git-send-email.perl:1818
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
+#~ msgid "Could not open file '%s'"
+#~ msgstr "Kunde inte öppna filen \"%s\""
+
+#~ msgid "%lu second ago"
+#~ msgid_plural "%lu seconds ago"
+#~ msgstr[0] "%lu sekund sedan"
+#~ msgstr[1] "%lu sekunder sedan"
+
+#~ msgid "%lu minute ago"
+#~ msgid_plural "%lu minutes ago"
+#~ msgstr[0] "%lu minut sedan"
+#~ msgstr[1] "%lu minuter sedan"
+
+#~ msgid "%lu hour ago"
+#~ msgid_plural "%lu hours ago"
+#~ msgstr[0] "%lu timme sedan"
+#~ msgstr[1] "%lu timmar sedan"
+
+#~ msgid "%lu day ago"
+#~ msgid_plural "%lu days ago"
+#~ msgstr[0] "%lu dag sedan"
+#~ msgstr[1] "%lu dagar sedan"
+
+#~ msgid "%lu week ago"
+#~ msgid_plural "%lu weeks ago"
+#~ msgstr[0] "%lu vecka sedan"
+#~ msgstr[1] "%lu veckor sedan"
+
+#~ msgid "%lu month ago"
+#~ msgid_plural "%lu months ago"
+#~ msgstr[0] "%lu månad sedan"
+#~ msgstr[1] "%lu månader sedan"
+
+#~ msgid "%lu year"
+#~ msgid_plural "%lu years"
+#~ msgstr[0] "%lu år"
+#~ msgstr[1] "%lu år"
+
+#~ msgid "%s, %lu month ago"
+#~ msgid_plural "%s, %lu months ago"
+#~ msgstr[0] "%s, %lu månad sedan"
+#~ msgstr[1] "%s, %lu månader sedan"
+
+#~ msgid "%lu year ago"
+#~ msgid_plural "%lu years ago"
+#~ msgstr[0] "%lu år sedan"
+#~ msgstr[1] "%lu år sedan"
+
+#~ msgid "in %0.1f seconds automatically..."
+#~ msgstr "automatiskt om %0.1f sekunder..."
+
+#~ msgid "dup2(%d,%d) failed"
+#~ msgstr "dup2(%d,%d) misslyckades"
+
+#~ msgid "Initial commit on "
+#~ msgstr "Första incheckning på "
+
+#~ msgid "Patch is empty. Was it split wrong?"
+#~ msgstr "Patchen är tom. Delades den upp felaktigt?"
+
+#~ msgid ""
+#~ "You still have unmerged paths in your index.\n"
+#~ "Did you forget to use 'git add'?"
+#~ msgstr ""
+#~ "Du har fortfarande sökvägar som inte slagits samman i ditt index.\n"
+#~ "Glömde du använda \"git add\"?"
+
+#~ msgid ""
+#~ "Cannot update paths and switch to branch '%s' at the same time.\n"
+#~ "Did you intend to checkout '%s' which can not be resolved as commit?"
+#~ msgstr ""
+#~ "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"
+#~ "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"
+
+#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
+#~ msgstr ""
+#~ "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
+
+#~ msgid "default mode for recursion"
+#~ msgstr "standardläge för rekursion"
+
+#~ msgid "submodule--helper subcommand must be called with a subcommand"
+#~ msgstr ""
+#~ "underkommandot submodule--helper måste anropas med ett underkommando"
+
+#~ msgid "could not stat '%s"
+#~ msgstr "kunde inte ta status på \"%s\""
+
+#~ msgid "tag: tagging "
+#~ msgstr "tag: taggar"
+
+#~ msgid "object of unknown type"
+#~ msgstr "objekt av okänd typ"
+
+#~ msgid "commit object"
+#~ msgstr "incheckningsobjekt"
+
+#~ msgid "tree object"
+#~ msgstr "trädobjekt"
+
+#~ msgid "blob object"
+#~ msgstr "blob-objekt"
+
+#~ msgid "other tag object"
+#~ msgstr "annat taggobjekt"
+
+#~ msgid ""
+#~ "There is nothing to exclude from by :(exclude) patterns.\n"
+#~ "Perhaps you forgot to add either ':/' or '.' ?"
+#~ msgstr ""
+#~ "Ingenting att exkludera från med :(exkludera)-mönster.\n"
+#~ "Glömde du kanske att antingen lägga till \":/\" eller \".\"?"
+
+#~ msgid "unrecognized format: %%(%s)"
+#~ msgstr "okänt format: %%(%s)"
+
+#~ msgid ":strip= requires a positive integer argument"
+#~ msgstr ":strip= kräver ett positivt heltalsargument"
+
+#~ msgid "ref '%s' does not have %ld components to :strip"
+#~ msgstr "referensen \"%s\" har inte %ld komponenter för :strip"
+
+#~ msgid "unknown %.*s format %s"
+#~ msgstr "okänt \"%.*s\"-format %s"
+
+#~ msgid "[%s: gone]"
+#~ msgstr "[%s: försvunnen]"
+
+#~ msgid "[%s]"
+#~ msgstr "[%s]"
+
+#~ msgid "[%s: behind %d]"
+#~ msgstr "[%s: bakom %d] "
+
+#~ msgid "[%s: ahead %d]"
+#~ msgstr "[%s: före %d] "
+
+#~ msgid "[%s: ahead %d, behind %d]"
+#~ msgstr "[%s: före %d, bakom %d] "
+
+#~ msgid " **** invalid ref ****"
+#~ msgstr " **** ogiltig ref ****"
+
+#~ msgid "insanely long object directory %.*s"
+#~ msgstr "tokigt lång objektkatalog %.*s"
+
+#~ msgid "git merge [<options>] <msg> HEAD <commit>"
+#~ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>"
+
+#~ msgid "'%s' is not a commit"
+#~ msgstr "\"%s\" är inte en incheckning"
+
+#~ msgid "cannot open file '%s'"
+#~ msgstr "kan inte öppna filen \"%s\""
+
+#~ msgid "could not close file %s"
+#~ msgstr "kunde inte stänga filen %s"
+
+#~ msgid "tag name too long: %.*s..."
+#~ msgstr "taggnamnet för långt: %.*s..."
+
+#~ msgid "tag header too big."
+#~ msgstr "tagghuvud för stort."
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for discarding"
+#~ msgstr ""
+#~ "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
+#~ "markeras för kasta omedelbart"
+
#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
#~ msgstr ""
#~ "Använd en experimentell algoritm baserad på tomma rader för att förbättra "
@@ -16437,9 +16969,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
#~ msgid "cannot update HEAD ref"
#~ msgstr "kunde inte uppdatera HEAD-referens"
-#~ msgid "cannot tell cwd"
-#~ msgstr "kan inte läsa aktuell katalog (cwd)"
-
#~ msgid "%s: cannot lock the ref"
#~ msgstr "%s: kan inte låsa referensen"