#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.0.0\n"
+"Project-Id-Version: git 2.6.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-01-21 14:21+0800\n"
-"PO-Revision-Date: 2015-01-21 14:57+0800\n"
+"POT-Creation-Date: 2015-09-05 09:16+0800\n"
+"PO-Revision-Date: 2015-09-09 21:45+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\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"
#: advice.c:55
#, c-format
"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."
-#: archive.c:11
-msgid "git archive [options] <tree-ish> [<path>...]"
-msgstr "git archive [flaggor] <träd-igt> [<sökväg>...]"
+#: advice.c:101 builtin/merge.c:1227
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
+
+#: advice.c:103
+msgid "Please, commit your changes before you can merge."
+msgstr "Ange ett incheckningsmeddelande för dina ändringar."
+
+#: advice.c:104
+msgid "Exiting because of unfinished merge."
+msgstr "Avslutar på grund av ofullbordad sammanslagning."
#: archive.c:12
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]"
+
+#: archive.c:13
msgid "git archive --list"
msgstr "git archive --list"
-#: archive.c:13
+#: archive.c:14
msgid ""
-"git archive --remote <repo> [--exec <cmd>] [
options] <tree-ish> [<path>...]"
+"git archive --remote <repo> [--exec <cmd>] [
<options>] <tree-ish> [<path>...]"
msgstr ""
-"git archive --remote <arkiv> [--exec <kmd>] [flaggor] <träd-igt> "
+"git archive --remote <arkiv> [--exec <kmd>] [<flaggor>] <träd-igt> "
"[<sökväg>...]"
-#: archive.c:14
+#: archive.c:15
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
-#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328
+#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
-#: archive.c:427
+#: archive.c:428
msgid "fmt"
msgstr "fmt"
-#: archive.c:427
+#: archive.c:428
msgid "archive format"
msgstr "arkivformat"
-#: archive.c:428 builtin/log.c:1204
+#: archive.c:429 builtin/log.c:1229
msgid "prefix"
msgstr "prefix"
-#: archive.c:429
+#: archive.c:430
msgid "prepend prefix to each pathname in the archive"
msgstr "lägg till prefix till varje sökväg i arkivet"
-#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517
-#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986
-#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101
-#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394
-#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151
+#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516
+#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987
+#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99
+#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395
+#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153
msgid "file"
msgstr "fil"
-#: archive.c:431 builtin/archive.c:89
+#: archive.c:432 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "skriv arkivet till filen"
-#: archive.c:433
+#: archive.c:434
msgid "read .gitattributes in working directory"
msgstr "läs .gitattributes i arbetskatalogen"
-#: archive.c:434
+#: archive.c:435
msgid "report archived files on stderr"
msgstr "rapportera arkiverade filer på standard fel"
-#: archive.c:435
+#: archive.c:436
msgid "store only"
msgstr "endast spara"
-#: archive.c:436
+#: archive.c:437
msgid "compress faster"
msgstr "komprimera snabbare"
-#: archive.c:444
+#: archive.c:445
msgid "compress better"
msgstr "komprimera bättre"
-#: archive.c:447
+#: archive.c:448
msgid "list supported archive formats"
msgstr "visa understödda arkivformat"
-#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86
+#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77
msgid "repo"
msgstr "arkiv"
-#: archive.c:450 builtin/archive.c:91
+#: archive.c:451 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "hämta arkivet från fjärrarkivet <arkiv>"
-#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
+#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479
msgid "command"
msgstr "kommando"
-#: archive.c:452 builtin/archive.c:93
+#: archive.c:453 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"
-#: attr.c:258
+#: attr.c:265
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgid "Not a valid branch point: '%s'."
msgstr "Avgreningspunkten är inte giltig: \"%s\""
+#: branch.c:399
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr "\"%s\" är redan utcheckad på \"%s\""
+
#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:87 builtin/commit.c:770
+#: bundle.c:87 builtin/commit.c:765
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
-#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706
-#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330
-#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358
+#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708
+#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334
+#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
msgstr[0] "Paketet (bundlen) kräver denna referens:"
msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"
-#: bundle.c:251
+#: bundle.c:253
msgid "Could not spawn pack-objects"
msgstr "Kunde inte starta pack-objects"
-#: bundle.c:269
+#: bundle.c:264
msgid "pack-objects died"
msgstr "pack-objects misslyckades"
-#: bundle.c:309
+#: bundle.c:304
msgid "rev-list died"
msgstr "rev-list dog"
-#: bundle.c:358
+#: bundle.c:353
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
-#: bundle.c:444
+#: bundle.c:449
msgid "Refusing to create empty bundle."
msgstr "Vägrar skapa ett tomt paket (bundle)."
-#: bundle.c:454
+#: bundle.c:459
#, c-format
msgid "cannot create '%s'"
msgstr "kan inte skapa \"%s\""
-#: bundle.c:475
+#: bundle.c:480
msgid "index-pack died"
msgstr "index-pack dog"
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
-#: commit.c:40
+#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1489
+#: builtin/am.c:2101
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
msgid "memory exhausted"
msgstr "minnet slut"
-#: config.c:469 config.c:471
+#: config.c:474 config.c:476
#, c-format
msgid "bad config file line %d in %s"
msgstr "felaktig konfigurationsfil rad %d i %s"
-#: config.c:587
+#: config.c:592
#, 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:589
+#: config.c:594
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
-#: config.c:674
+#: config.c:679
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "misslyckades expandera användarkatalog i: \"%s\""
-#: config.c:752 config.c:763
+#: config.c:757 config.c:768
#, c-format
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: config.c:885
+#: config.c:890
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:1211
+#: config.c:1216
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:1272
+#: config.c:1277
msgid "unknown error occured while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:1596
+#: config.c:1601
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
-#: config.c:1598
+#: config.c:1603
#, 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:1657
+#: config.c:1662
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
msgid "failed to read orderfile '%s'"
msgstr "kunde inte läsa orderfilen \"%s\""
-#: diffcore-rename.c:516
+#: diffcore-rename.c:536
msgid "Performing inexact rename detection"
msgstr "Utför onöjaktig namnbytesdetektering"
-#: diff.c:114
+#: diff.c:116
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
-#: diff.c:119
+#: diff.c:121
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Okänd dirstat-parameter \"%s\"\n"
-#: diff.c:214
+#: diff.c:216
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
-#: diff.c:266
+#: diff.c:268
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:2957
+#: diff.c:2998
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:3352
+#: diff.c:3394
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:3515
+#: diff.c:3557
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:3529
+#: diff.c:3571
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
-#: gpg-interface.c:129 gpg-interface.c:200
+#: dir.c:1853
+msgid "failed to get kernel name and information"
+msgstr "misslyckades hämta kärnans namn och information"
+
+#: dir.c:1936
+msgid "Untracked cache is disabled on this system."
+msgstr "Ospårad cache är inaktiverad på detta system."
+
+#: gpg-interface.c:166 gpg-interface.c:237
msgid "could not run gpg."
msgstr "kunde inte köra gpg."
-#: gpg-interface.c:141
+#: gpg-interface.c:178
msgid "gpg did not accept the data"
msgstr "gpg godtog inte data"
-#: gpg-interface.c:152
+#: gpg-interface.c:189
msgid "gpg failed to sign the data"
msgstr "gpg misslyckades signera data"
-#: gpg-interface.c:185
+#: gpg-interface.c:222
#, c-format
msgid "could not create temporary file '%s': %s"
msgstr "kunde inte skapa temporära filen \"%s\": %s"
-#: gpg-interface.c:188
+#: gpg-interface.c:225
#, c-format
msgid "failed writing detached signature to '%s': %s"
msgstr "misslyckades skriva fristående signatur till \"%s\": %s"
msgid "git commands available from elsewhere on your $PATH"
msgstr "git-kommandon från andra platser i din $PATH"
-#: help.c:230
-msgid "The most commonly used git commands are:"
-msgstr "De mest använda git-kommandona är:"
+#: help.c:246
+msgid "These are common Git commands used in various situations:"
+msgstr "Dessa vanliga Git-kommandon används i olika situationer:"
-#: help.c:289
+#: help.c:311
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
"köra det. Kanske git-%s är trasigt?"
-#: help.c:346
+#: help.c:368
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
-#: help.c:368
+#: help.c:390
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
"VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n"
"Fortsätter under förutsättningen att du menade \"%s\""
-#: help.c:373
+#: help.c:395
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr "automatiskt om %0.1f sekunder..."
-#: help.c:380
+#: help.c:402
#, 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:384 help.c:444
+#: help.c:406 help.c:466
msgid ""
"\n"
"Did you mean this?"
"\n"
"Menade du ett av dessa?"
-#: help.c:440
+#: help.c:462
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: lockfile.c:283
-msgid "BUG: reopen a lockfile that is still open"
-msgstr "FEL: återöppna en låsfil som fortfarande är öppen"
-
-#: lockfile.c:285
-msgid "BUG: reopen a lockfile that has been committed"
-msgstr "FEL: återöppna en låsfil som har överlämnats"
-
#: merge.c:41
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
-#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580
-#: builtin/clone.c:662
+#: merge.c:94 builtin/am.c:1974 builtin/am.c:2009 builtin/checkout.c:375
+#: builtin/checkout.c:586 builtin/clone.c:715
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
msgid "error building trees"
msgstr "fel vid byggande av träd"
-#: merge-recursive.c:688
+#: merge-recursive.c:687
#, c-format
msgid "failed to create path '%s'%s"
msgstr "misslyckades skapa sökvägen \"%s\"%s"
-#: merge-recursive.c:699
+#: merge-recursive.c:698
#, 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:713 merge-recursive.c:734
+#: merge-recursive.c:712 merge-recursive.c:733
msgid ": perhaps a D/F conflict?"
msgstr ": kanske en K/F-konflikt?"
-#: merge-recursive.c:724
+#: merge-recursive.c:723
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "vägrar förlora ospårad fil vid \"%s\""
-#: merge-recursive.c:764
+#: merge-recursive.c:763
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kan inte läsa objektet %s: \"%s\""
-#: merge-recursive.c:766
+#: merge-recursive.c:765
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob förväntades för %s \"%s\""
-#: merge-recursive.c:789 builtin/clone.c:321
+#: merge-recursive.c:788 builtin/clone.c:364
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
-#: merge-recursive.c:797
+#: merge-recursive.c:796
#, c-format
msgid "failed to symlink '%s'"
msgstr "misslyckades skapa symboliska länken \"%s\""
-#: merge-recursive.c:800
+#: merge-recursive.c:799
#, 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:938
+#: merge-recursive.c:937
msgid "Failed to execute internal merge"
msgstr "Misslyckades exekvera intern sammanslagning"
-#: merge-recursive.c:942
+#: merge-recursive.c:941
#, c-format
msgid "Unable to add %s to database"
msgstr "Kunde inte lägga till %s till databasen"
-#: merge-recursive.c:958
+#: merge-recursive.c:957
msgid "unsupported object type in the tree"
msgstr "objekttyp som ej stöds upptäcktes i trädet"
-#: merge-recursive.c:1033 merge-recursive.c:1047
+#: merge-recursive.c:1032 merge-recursive.c:1046
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet."
-#: merge-recursive.c:1039 merge-recursive.c:1052
+#: merge-recursive.c:1038 merge-recursive.c:1051
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"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:1093
+#: merge-recursive.c:1092
msgid "rename"
msgstr "namnbyte"
-#: merge-recursive.c:1093
+#: merge-recursive.c:1092
msgid "renamed"
msgstr "namnbytt"
-#: merge-recursive.c:1149
+#: merge-recursive.c:1148
#, 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:1171
+#: merge-recursive.c:1170
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
-#: merge-recursive.c:1176
+#: merge-recursive.c:1175
msgid " (left unresolved)"
msgstr " (lämnad olöst)"
-#: merge-recursive.c:1230
+#: merge-recursive.c:1229
#, 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:1260
+#: merge-recursive.c:1259
#, 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:1459
+#: merge-recursive.c:1458
#, 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:1469
+#: merge-recursive.c:1468
#, c-format
msgid "Adding merged %s"
msgstr "Lägger till sammanslagen %s"
-#: merge-recursive.c:1474 merge-recursive.c:1672
+#: merge-recursive.c:1473 merge-recursive.c:1671
#, c-format
msgid "Adding as %s instead"
msgstr "Lägger till som %s istället"
-#: merge-recursive.c:1525
+#: merge-recursive.c:1524
#, c-format
msgid "cannot read object %s"
msgstr "kan inte läsa objektet %s"
-#: merge-recursive.c:1528
+#: merge-recursive.c:1527
#, c-format
msgid "object %s is not a blob"
msgstr "objektet %s är inte en blob"
-#: merge-recursive.c:1576
+#: merge-recursive.c:1575
msgid "modify"
msgstr "ändra"
-#: merge-recursive.c:1576
+#: merge-recursive.c:1575
msgid "modified"
msgstr "ändrad"
-#: merge-recursive.c:1586
+#: merge-recursive.c:1585
msgid "content"
msgstr "innehåll"
-#: merge-recursive.c:1593
+#: merge-recursive.c:1592
msgid "add/add"
msgstr "tillägg/tillägg"
-#: merge-recursive.c:1627
+#: merge-recursive.c:1626
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-#: merge-recursive.c:1641
+#: merge-recursive.c:1640
#, c-format
msgid "Auto-merging %s"
msgstr "Slår ihop %s automatiskt"
-#: merge-recursive.c:1645 git-submodule.sh:1150
+#: merge-recursive.c:1644 git-submodule.sh:1150
msgid "submodule"
msgstr "undermodul"
-#: merge-recursive.c:1646
+#: merge-recursive.c:1645
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-#: merge-recursive.c:1732
+#: merge-recursive.c:1731
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: merge-recursive.c:1757
+#: merge-recursive.c:1756
msgid "file/directory"
msgstr "fil/katalog"
-#: merge-recursive.c:1763
+#: merge-recursive.c:1762
msgid "directory/file"
msgstr "katalog/fil"
-#: merge-recursive.c:1768
+#: merge-recursive.c:1767
#, 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:1778
+#: merge-recursive.c:1777
#, c-format
msgid "Adding %s"
msgstr "Lägger till %s"
-#: merge-recursive.c:1795
+#: merge-recursive.c:1794
msgid "Fatal merge failure, shouldn't happen."
msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa."
-#: merge-recursive.c:1814
+#: merge-recursive.c:1813
msgid "Already up-to-date!"
msgstr "Redan à jour!"
-#: merge-recursive.c:1823
+#: merge-recursive.c:1822
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "sammanslagning av träden %s och %s misslyckades"
-#: merge-recursive.c:1853
+#: merge-recursive.c:1852
#, c-format
msgid "Unprocessed path??? %s"
msgstr "Obehandlad sökväg??? %s"
-#: merge-recursive.c:1898
+#: merge-recursive.c:1900
msgid "Merging:"
msgstr "Slår ihop:"
-#: merge-recursive.c:1911
+#: merge-recursive.c:1913
#, 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:1948
+#: merge-recursive.c:1950
msgid "merge returned no commit"
msgstr "sammanslagningen returnerade ingen incheckning"
-#: merge-recursive.c:2005
+#: merge-recursive.c:2007
#, c-format
msgid "Could not parse object '%s'"
msgstr "Kunde inte tolka objektet \"%s\""
-#: merge-recursive.c:2016 builtin/merge.c:667
+#: merge-recursive.c:2018 builtin/merge.c:645
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"
-#: notes-utils.c:82
+#: notes-utils.c:100
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "Felaktigt värde för notes.rewriteMode: '%s'"
-#: notes-utils.c:92
+#: notes-utils.c:110
#, 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:119
+#: notes-utils.c:137
#, c-format
msgid "Bad %s value: '%s'"
msgstr "Felaktigt värde på %s: \"%s\""
-#: object.c:241
+#: object.c:242
#, c-format
msgid "unable to parse object: %s"
msgstr "kunde inte tolka objektet: %s"
-#: parse-options.c:546
+#: parse-options.c:563
msgid "..."
msgstr "..."
-#: parse-options.c:564
+#: parse-options.c:581
#, 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:568
+#: parse-options.c:585
#, c-format
msgid " or: %s"
msgstr " eller: %s"
-#: parse-options.c:571
+#: parse-options.c:588
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:605
+#: parse-options.c:622
msgid "-NUM"
msgstr "-TAL"
"Ingenting att exkludera från med :(exkludera)-mönster.\n"
"Glömde du kanske att antingen lägga till \":/\" eller \".\"?"
-#: pretty.c:968
+#: pretty.c:969
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
-#: progress.c:225
+#: progress.c:236
msgid "done"
msgstr "klart"
-#: read-cache.c:1267
+#: read-cache.c:1296
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"index.version satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1277
+#: read-cache.c:1306
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: remote.c:782
+#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
+#: builtin/merge.c:983
+#, c-format
+msgid "Could not open '%s' for writing"
+msgstr "Kunde inte öppna \"%s\" för skrivning"
+
+#: refs.c:3001
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "kunde inte ta bort referensen %s: %s"
+
+#: refs.c:3004
+#, c-format
+msgid "could not delete references: %s"
+msgstr "kunde inte ta bort referenser: %s"
+
+#: refs.c:3013
+#, c-format
+msgid "could not remove reference %s"
+msgstr "kunde inte ta bort referensen %s"
+
+#: ref-filter.c:660
+msgid "unable to parse format"
+msgstr "kan inte tolka formatet"
+
+#: remote.c:792
#, 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:786
+#: remote.c:796
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s spårar vanligtvis %s, inte %s"
-#: remote.c:790
+#: remote.c:800
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s spårar både %s och %s"
-#: remote.c:798
+#: remote.c:808
msgid "Internal error"
msgstr "Internt fel"
-#: remote.c:1980
+#: remote.c:1723 remote.c:1766
+msgid "HEAD does not point to a branch"
+msgstr "HEAD pekar inte på en gren"
+
+#: remote.c:1732
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "okänd gren: \"%s\""
+
+#: remote.c:1735
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "ingen standarduppström angiven för grenen \"%s\""
+
+#: remote.c:1741
+#, 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:1756
+#, 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:1771
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "grenen \"%s\" har ingen fjärr för \"push\""
+
+#: remote.c:1782
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
+
+#: remote.c:1795
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
+
+#: remote.c:1817
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "\"enkel push\" motsvarar flera olika mål"
+
+#: remote.c:2124
#, 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:1984
+#: remote.c:2128
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"
-#: remote.c:1987
+#: remote.c:2131
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "Din gren är à jour med \"%s\".\n"
-#: remote.c:1991
+#: remote.c:2135
#, 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:1997
+#: remote.c:2141
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:2000
+#: remote.c:2144
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
msgstr[1] ""
"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
-#: remote.c:2008
+#: remote.c:2152
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:2011
+#: remote.c:2155
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"Din gren och \"%s\" har divergerat,\n"
"och har %d respektive %d olika incheckningar.\n"
-#: remote.c:2021
+#: remote.c:2165
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"
-#: run-command.c:87
+#: revision.c:2198
+msgid "your current branch appears to be broken"
+msgstr "din nuvarande gren verkar vara trasig"
+
+#: revision.c:2201
+#, 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:2395
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent är inkompatibelt med --bisect"
+
+#: run-command.c:83
msgid "open /dev/null failed"
msgstr "misslyckades öppna /dev/null"
-#: run-command.c:89
+#: run-command.c:85
#, c-format
msgid "dup2(%d,%d) failed"
msgstr "dup2(%d,%d) misslyckades"
-#: send-pack.c:268
+#: send-pack.c:295
msgid "failed to sign the push certificate"
msgstr "misslyckades underteckna push-certifikatet"
-#: send-pack.c:325
+#: send-pack.c:404
msgid "the receiving end does not support --signed push"
msgstr "mottagarsidan stöder inte push med --signed"
-#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
-#: builtin/merge.c:1005
-#, c-format
-msgid "Could not open '%s' for writing"
-msgstr "Kunde inte öppna \"%s\" för skrivning"
+#: send-pack.c:406
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
+"signed"
-#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997
-#: builtin/merge.c:1010
-#, c-format
-msgid "Could not write to '%s'"
-msgstr "Kunde inte skriva till \"%s\""
+#: send-pack.c:418
+msgid "the receiving end does not support --atomic push"
+msgstr "mottagarsidan stöder inte push med --atomic"
-#: sequencer.c:195
+#: sequencer.c:183
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
"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:198
+#: sequencer.c:186
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
"och checka in resultatet med \"git commit\""
-#: sequencer.c:211 sequencer.c:856 sequencer.c:939
+#: sequencer.c:199 sequencer.c:842 sequencer.c:922
#, c-format
msgid "Could not write to %s"
msgstr "Kunde inte skriva till %s"
-#: sequencer.c:214
+#: sequencer.c:202
#, c-format
msgid "Error wrapping up %s"
msgstr "Fel vid ombrytning av %s"
-#: sequencer.c:229
+#: sequencer.c:217
msgid "Your local changes would be overwritten by cherry-pick."
msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"."
-#: sequencer.c:231
+#: sequencer.c:219
msgid "Your local changes would be overwritten by revert."
msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"."
-#: sequencer.c:234
+#: sequencer.c:222
msgid "Commit your changes or stash them to proceed."
msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta."
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
-#: sequencer.c:321
+#: sequencer.c:309
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Kunde inte skriva ny indexfil"
-#: sequencer.c:339
+#: sequencer.c:327
msgid "Could not resolve HEAD commit\n"
msgstr "Kunde inte bestämma HEAD:s incheckning\n"
-#: sequencer.c:359
+#: sequencer.c:347
msgid "Unable to update cache tree\n"
msgstr "Kan inte uppdatera cacheträd\n"
-#: sequencer.c:406
+#: sequencer.c:399
#, c-format
msgid "Could not parse commit %s\n"
msgstr "Kunde inte tolka incheckningen %s\n"
-#: sequencer.c:411
+#: sequencer.c:404
#, c-format
msgid "Could not parse parent commit %s\n"
msgstr "Kunde inte tolka föräldraincheckningen %s\n"
-#: sequencer.c:477
+#: sequencer.c:469
msgid "Your index file is unmerged."
msgstr "Din indexfil har inte slagits ihop."
-#: sequencer.c:496
+#: sequencer.c:488
#, 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:504
+#: sequencer.c:496
#, c-format
msgid "Commit %s does not have parent %d"
msgstr "Incheckning %s har inte förälder %d"
-#: sequencer.c:508
+#: sequencer.c:500
#, c-format
msgid "Mainline was specified but commit %s is not a merge."
msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning"
#. TRANSLATORS: The first %s will be "revert" or
#. "cherry-pick", the second %s a SHA1
-#: sequencer.c:521
+#: sequencer.c:513
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:525
+#: sequencer.c:517
#, c-format
msgid "Cannot get commit message for %s"
msgstr "Kan inte hämta incheckningsmeddelande för %s"
-#: sequencer.c:611
+#: sequencer.c:603
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:612
+#: sequencer.c:604
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:648
+#: sequencer.c:639
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:656
+#: sequencer.c:647
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:660
+#: sequencer.c:651
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:720
+#: sequencer.c:711
#, c-format
msgid "Cannot %s during a %s"
msgstr "kan inte %s under en %s"
-#: sequencer.c:742
+#: sequencer.c:733
#, c-format
msgid "Could not parse line %d."
msgstr "Kan inte tolka rad %d."
-#: sequencer.c:747
+#: sequencer.c:738
msgid "No commits parsed."
msgstr "Inga incheckningar lästes."
-#: sequencer.c:760
+#: sequencer.c:750
#, c-format
msgid "Could not open %s"
msgstr "Kunde inte öppna %s"
-#: sequencer.c:764
+#: sequencer.c:754
#, c-format
msgid "Could not read %s."
msgstr "kunde inte läsa %s."
-#: sequencer.c:771
+#: sequencer.c:761
#, c-format
msgid "Unusable instruction sheet: %s"
msgstr "Oanvändbart manus: %s"
-#: sequencer.c:801
+#: sequencer.c:791
#, c-format
msgid "Invalid key: %s"
msgstr "Felaktig nyckel: %s"
-#: sequencer.c:804
+#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49
#, c-format
msgid "Invalid value for %s: %s"
msgstr "Felaktigt värde för %s: %s"
-#: sequencer.c:816
+#: sequencer.c:804
#, c-format
msgid "Malformed options sheet: %s"
msgstr "Trasigt manus: %s"
-#: sequencer.c:837
+#: sequencer.c:823
msgid "a cherry-pick or revert is already in progress"
msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
-#: sequencer.c:838
+#: sequencer.c:824
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:842
+#: sequencer.c:828
#, c-format
msgid "Could not create sequencer directory %s"
msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:858 sequencer.c:943
+#: sequencer.c:844 sequencer.c:926
#, c-format
msgid "Error wrapping up %s."
msgstr "Fel vid ombrytning av %s."
-#: sequencer.c:877 sequencer.c:1013
+#: sequencer.c:863 sequencer.c:996
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:879
+#: sequencer.c:865
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:881
+#: sequencer.c:867
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:903 builtin/apply.c:4128
+#: sequencer.c:887 builtin/apply.c:4291
#, c-format
msgid "cannot open %s: %s"
msgstr "kan inte öppna %s: %s"
-#: sequencer.c:906
+#: sequencer.c:890
#, c-format
msgid "cannot read %s: %s"
msgstr "kan inte läsa %s: %s"
-#: sequencer.c:907
+#: sequencer.c:891
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:913
+#: sequencer.c:897
#, 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:936
+#: sequencer.c:919
#, c-format
msgid "Could not format %s."
msgstr "Kunde inte formatera %s."
-#: sequencer.c:1081
+#: sequencer.c:1064
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
-#: sequencer.c:1084
+#: sequencer.c:1067
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:1118
+#: sequencer.c:1101
msgid "Can't revert as initial commit"
msgstr "Kan inte ångra som första incheckning"
-#: sequencer.c:1119
+#: sequencer.c:1102
msgid "Can't cherry-pick into empty head"
msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
-#: sha1_name.c:440
+#: setup.c:243
+#, c-format
+msgid "failed to read %s"
+msgstr "misslyckades läsa %s"
+
+#: sha1_name.c:453
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"
"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
"genom att köra \"git config advice.objectNameWarning false\""
-#: sha1_name.c:1068
-msgid "HEAD does not point to a branch"
-msgstr "HEAD pekar inte på en gren"
-
-#: sha1_name.c:1071
-#, c-format
-msgid "No such branch: '%s'"
-msgstr "Okänd gren: \"%s\""
-
-#: sha1_name.c:1073
-#, c-format
-msgid "No upstream configured for branch '%s'"
-msgstr "Ingen standarduppström angiven för grenen \"%s\""
-
-#: sha1_name.c:1077
-#, 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"
-
-#: submodule.c:64 submodule.c:98
+#: submodule.c:61 submodule.c:95
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:68 submodule.c:102
+#: submodule.c:65 submodule.c:99
#, 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:76
+#: submodule.c:73
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Kunde inte uppdatera .gitmodules-posten %s"
-#: submodule.c:109
+#: submodule.c:106
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Kunde inte ta bort .gitmodules-posten för %s"
-#: submodule.c:120
+#: submodule.c:117
msgid "staging updated .gitmodules failed"
msgstr "misslyckades köa uppdaterad .gitmodules"
-#: submodule.c:1111 builtin/init-db.c:371
-#, c-format
-msgid "Could not create git link %s"
-msgstr "Kunde inte skapa gitlänk %s"
-
-#: submodule.c:1122
+#: submodule.c:1045
#, c-format
msgid "Could not set core.worktree in %s"
msgstr "Kunde inte sätta core.worktree i %s"
-#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566
-#: trailer.c:570
+#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
+#: trailer.c:561
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "okänt värde \"%s\" för nyckeln \"%s\""
-#: trailer.c:552 trailer.c:557 builtin/remote.c:290
+#: trailer.c:543 trailer.c:548 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "mer än en %s"
-#: trailer.c:590
+#: trailer.c:581
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "tom släpradssymbol i släpraden \"%.*s\""
-#: trailer.c:710
+#: trailer.c:701
#, c-format
msgid "could not read input file '%s'"
msgstr "kunde inte läsa indatafilen \"%s\""
-#: trailer.c:713
+#: trailer.c:704
msgid "could not read from stdin"
msgstr "Kunde inte läsa från standard in"
-#: unpack-trees.c:202
+#: transport-helper.c:1025
+#, c-format
+msgid "Could not read ref %s"
+msgstr "Kunde inte läsa referensen %s"
+
+#: unpack-trees.c:203
msgid "Checking out files"
msgstr "Checkar ut filer"
msgid "invalid '..' path segment"
msgstr "felaktigt \"..\"-sökvägssegment"
-#: wrapper.c:509
+#: wrapper.c:219 wrapper.c:362
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
+
+#: wrapper.c:221 wrapper.c:364
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "kunde inte öppna \"%s\" för skrivning"
+
+#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688
+#: builtin/merge.c:1076 builtin/pull.c:380
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "kunde inte öppna \"%s\" för läsning"
+
+#: wrapper.c:579
#, c-format
msgid "unable to access '%s': %s"
msgstr "kan inte komma åt \"%s\": %s"
-#: wrapper.c:530
+#: wrapper.c:600
#, c-format
msgid "unable to access '%s'"
msgstr "kan inte komma åt \"%s\""
-#: wrapper.c:541
+#: wrapper.c:611
#, c-format
msgid "unable to look up current user in the passwd file: %s"
msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"
-#: wrapper.c:542
+#: wrapper.c:612
msgid "no such user"
msgstr "okänd användare"
-#: wrapper.c:550
+#: wrapper.c:620
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
-#: wt-status.c:150
+#: wrapper.c:631
+#, c-format
+msgid "could not open %s for writing"
+msgstr "kunde inte öppna %s för skrivning"
+
+#: wrapper.c:642 builtin/am.c:424
+#, c-format
+msgid "could not write to %s"
+msgstr "kunde inte skriva till %s"
+
+#: wrapper.c:648
+#, c-format
+msgid "could not close %s"
+msgstr "kunde inte stänga %s"
+
+#: wt-status.c:149
msgid "Unmerged paths:"
msgstr "Ej sammanslagna sökvägar:"
-#: wt-status.c:177 wt-status.c:204
+#: wt-status.c:176 wt-status.c:203
#, 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:179 wt-status.c:206
+#: wt-status.c:178 wt-status.c:205
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:183
+#: wt-status.c:182
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (använd \"git add <fil>...\" för att ange lösning)"
-#: wt-status.c:185 wt-status.c:189
+#: wt-status.c:184 wt-status.c:188
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:187
+#: wt-status.c:186
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
-#: wt-status.c:198
+#: wt-status.c:197 wt-status.c:880
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
-#: wt-status.c:216
+#: wt-status.c:215 wt-status.c:889
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
-#: wt-status.c:220
+#: wt-status.c:219
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:222
+#: wt-status.c:221
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:223
+#: wt-status.c:222
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:225
+#: wt-status.c:224
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:237
+#: wt-status.c:236
#, 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:252
+#: wt-status.c:251
msgid "both deleted:"
msgstr "borttaget av bägge:"
-#: wt-status.c:254
+#: wt-status.c:253
msgid "added by us:"
msgstr "tillagt av oss:"
-#: wt-status.c:256
+#: wt-status.c:255
msgid "deleted by them:"
msgstr "borttaget av dem:"
-#: wt-status.c:258
+#: wt-status.c:257
msgid "added by them:"
msgstr "tillagt av dem:"
-#: wt-status.c:260
+#: wt-status.c:259
msgid "deleted by us:"
msgstr "borttaget av oss:"
-#: wt-status.c:262
+#: wt-status.c:261
msgid "both added:"
msgstr "tillagt av bägge:"
-#: wt-status.c:264
+#: wt-status.c:263
msgid "both modified:"
msgstr "ändrat av bägge:"
-#: wt-status.c:266
+#: wt-status.c:265
#, c-format
msgid "bug: unhandled unmerged status %x"
msgstr "programfel: ej hanterad \"unmerged\"-status %x"
-#: wt-status.c:274
+#: wt-status.c:273
msgid "new file:"
msgstr "ny fil:"
-#: wt-status.c:276
+#: wt-status.c:275
msgid "copied:"
msgstr "kopierad:"
-#: wt-status.c:278
+#: wt-status.c:277
msgid "deleted:"
msgstr "borttagen:"
-#: wt-status.c:280
+#: wt-status.c:279
msgid "modified:"
msgstr "ändrad:"
-#: wt-status.c:282
+#: wt-status.c:281
msgid "renamed:"
msgstr "namnbytt:"
-#: wt-status.c:284
+#: wt-status.c:283
msgid "typechange:"
msgstr "typbyte:"
-#: wt-status.c:286
+#: wt-status.c:285
msgid "unknown:"
msgstr "okänd:"
-#: wt-status.c:288
+#: wt-status.c:287
msgid "unmerged:"
msgstr "osammanslagen:"
-#: wt-status.c:370
+#: wt-status.c:369
msgid "new commits, "
msgstr "nya incheckningar, "
-#: wt-status.c:372
+#: wt-status.c:371
msgid "modified content, "
msgstr "ändrat innehåll, "
-#: wt-status.c:374
+#: wt-status.c:373
msgid "untracked content, "
msgstr "ospårat innehåll, "
-#: wt-status.c:391
+#: wt-status.c:390
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "programfel: diff-status %c ej hanterad"
-#: wt-status.c:758
+#: wt-status.c:754
msgid "Submodules changed but not updated:"
msgstr "Undermoduler ändrade men inte uppdaterade:"
-#: wt-status.c:760
+#: wt-status.c:756
msgid "Submodule changes to be committed:"
msgstr "Undermodulers ändringar att checka in:"
-#: wt-status.c:839
+#: wt-status.c:837
msgid ""
"Do not touch the line above.\n"
"Everything below will be removed."
"Rör inte raden ovan.\n"
"Allt nedan kommer tas bort."
-#: wt-status.c:930
+#: wt-status.c:948
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
-#: wt-status.c:933
+#: wt-status.c:951
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
-#: wt-status.c:936
+#: wt-status.c:954
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:939
+#: wt-status.c:957
msgid " (use \"git commit\" to conclude merge)"
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
-#: wt-status.c:949
+#: wt-status.c:967
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:952
+#: wt-status.c:970
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
-#: wt-status.c:956
+#: wt-status.c:974
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
-#: wt-status.c:958
+#: wt-status.c:976
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
-#: wt-status.c:960
+#: wt-status.c:978
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:1020 wt-status.c:1037
+#: wt-status.c:1105
+msgid "No commands done."
+msgstr "Inga kommandon utförda."
+
+#: wt-status.c:1108
+#, 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:1119
+#, c-format
+msgid " (see more in file %s)"
+msgstr " (se fler i filen %s)"
+
+#: wt-status.c:1124
+msgid "No commands remaining."
+msgstr "Inga kommandon återstår."
+
+#: wt-status.c:1127
+#, 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:1135
+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:1148
#, 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:1025 wt-status.c:1042
+#: wt-status.c:1153
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
-#: wt-status.c:1028
+#: wt-status.c:1167
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
-#: wt-status.c:1030
+#: wt-status.c:1169
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
-#: wt-status.c:1032
+#: wt-status.c:1171
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:1045
+#: wt-status.c:1177
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
-#: wt-status.c:1049
+#: wt-status.c:1181
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1054
+#: wt-status.c:1186
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:1057
+#: wt-status.c:1189
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:1061
+#: wt-status.c:1193
#, 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:1066
+#: wt-status.c:1198
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:1069
+#: wt-status.c:1201
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:1071
+#: wt-status.c:1203
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:1081
+#: wt-status.c:1213
#, 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:1086
+#: wt-status.c:1218
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
-#: wt-status.c:1089
+#: wt-status.c:1221
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"
-#: wt-status.c:1091
+#: wt-status.c:1223
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:1100
+#: wt-status.c:1232
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Du håller på med att ångra incheckningen %s."
-#: wt-status.c:1105
+#: wt-status.c:1237
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
-#: wt-status.c:1108
+#: wt-status.c:1240
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
-#: wt-status.c:1110
+#: wt-status.c:1242
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
-#: wt-status.c:1121
+#: wt-status.c:1253
#, 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:1125
+#: wt-status.c:1257
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
-#: wt-status.c:1128
+#: wt-status.c:1260
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:1303
+#: wt-status.c:1437
msgid "On branch "
msgstr "På grenen "
-#: wt-status.c:1310
+#: wt-status.c:1445
+msgid "interactive rebase in progress; onto "
+msgstr "interaktiv ombasering pågår; ovanpå"
+
+#: wt-status.c:1447
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå"
-#: wt-status.c:1317
+#: wt-status.c:1452
msgid "HEAD detached at "
msgstr "HEAD frånkopplad vid "
-#: wt-status.c:1319
+#: wt-status.c:1454
msgid "HEAD detached from "
msgstr "HEAD frånkopplad från "
-#: wt-status.c:1322
+#: wt-status.c:1457
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:1339
+#: wt-status.c:1474
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:1353
+#: wt-status.c:1488
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:1355
+#: wt-status.c:1490
msgid "Ignored files"
msgstr "Ignorerade filer"
-#: wt-status.c:1359
+#: wt-status.c:1494
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"lägga till nya filer själv (se \"git help status\")."
# %s är nästa sträng eller tom.
-#: wt-status.c:1365
+#: wt-status.c:1500
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:1367
+#: wt-status.c:1502
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
-#: wt-status.c:1373
+#: wt-status.c:1508
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:1378
+#: wt-status.c:1513
#, 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:1381
+#: wt-status.c:1516
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1384
+#: wt-status.c:1519
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
"\")\n"
-#: wt-status.c:1387
+#: wt-status.c:1522
#, 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:1390
+#: wt-status.c:1525
#, 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:1393 wt-status.c:1398
+#: wt-status.c:1528 wt-status.c:1533
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1396
+#: wt-status.c:1531
#, 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:1400
+#: wt-status.c:1535
#, c-format
msgid "nothing to commit, working directory clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
-#: wt-status.c:1509
+#: wt-status.c:1644
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:1515
+#: wt-status.c:1650
msgid "Initial commit on "
msgstr "Första incheckning på "
-#: wt-status.c:1547
+#: wt-status.c:1677
msgid "gone"
msgstr "försvunnen"
-#: wt-status.c:1549 wt-status.c:1557
+#: wt-status.c:1679 wt-status.c:1687
msgid "behind "
msgstr "efter "
-#: compat/precompose_utf8.c:55 builtin/clone.c:360
+#: compat/precompose_utf8.c:55 builtin/clone.c:403
#, c-format
msgid "failed to unlink '%s'"
msgstr "misslyckades ta bort länken \"%s\""
#: builtin/add.c:22
-msgid "git add [
options] [--] <pathspec>..."
-msgstr "git add [flaggor] [--] <sökväg>..."
+msgid "git add [
<options>] [--] <pathspec>..."
+msgstr "git add [<flaggor>] [--] <sökväg>..."
#: builtin/add.c:65
#, c-format
msgid "unexpected diff status %c"
msgstr "diff-status %c förväntades inte"
-#: builtin/add.c:70 builtin/commit.c:275
+#: builtin/add.c:70 builtin/commit.c:277
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
msgid "Unstaged changes after refreshing the index:"
msgstr "Ospårade ändringar efter att ha uppdaterat indexet:"
-#: builtin/add.c:194 builtin/rev-parse.c:785
+#: builtin/add.c:194 builtin/rev-parse.c:799
msgid "Could not read the index"
msgstr "Kunde inte läsa indexet"
msgid "Could not write patch"
msgstr "Kunde inte skriva patch"
-#: builtin/add.c:214
+#: builtin/add.c:212
+msgid "editing patch failed"
+msgstr "redigering av patch misslyckades"
+
+#: builtin/add.c:215
#, c-format
msgid "Could not stat '%s'"
msgstr "Kunde inte ta status på \"%s\""
-#: builtin/add.c:216
+#: builtin/add.c:217
msgid "Empty patch. Aborted."
msgstr "Tom patch. Avbryter."
-#: builtin/add.c:221
+#: builtin/add.c:222
#, c-format
msgid "Could not apply '%s'"
msgstr "Kunde inte tillämpa \"%s\""
-#: builtin/add.c:231
+#: builtin/add.c:232
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:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372
-#: builtin/rm.c:269
+#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110
+#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
+#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "testkörning"
-#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19
-#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608
-#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
+#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636
+#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "var pratsam"
-#: builtin/add.c:251
+#: builtin/add.c:252
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
-#: builtin/add.c:253
+#: builtin/add.c:254
msgid "edit current diff and apply"
msgstr "redigera aktuell diff och applicera"
-#: builtin/add.c:254
+#: builtin/add.c:255
msgid "allow adding otherwise ignored files"
msgstr "tillåt lägga till annars ignorerade filer"
-#: builtin/add.c:255
+#: builtin/add.c:256
msgid "update tracked files"
msgstr "uppdatera spårade filer"
-#: builtin/add.c:256
+#: builtin/add.c:257
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:257
+#: builtin/add.c:258
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:260
+#: builtin/add.c:261
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:262
+#: builtin/add.c:263
msgid "don't add, only refresh the index"
msgstr "lägg inte till, uppdatera endast indexet"
-#: builtin/add.c:263
+#: builtin/add.c:264
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:264
+#: builtin/add.c:265
msgid "check if - even missing - files are ignored in dry run"
msgstr "se om - även saknade - filer ignoreras i testkörning"
-#: builtin/add.c:286
+#: builtin/add.c:287
#, 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:293
+#: builtin/add.c:294
msgid "adding files failed"
msgstr "misslyckades lägga till filer"
-#: builtin/add.c:329
+#: builtin/add.c:330
msgid "-A and -u are mutually incompatible"
msgstr "-A och -u är ömsesidigt inkompatibla"
-#: builtin/add.c:336
+#: builtin/add.c:337
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:357
+#: builtin/add.c:358
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Inget angivet, inget tillagt.\n"
-#: builtin/add.c:358
+#: builtin/add.c:359
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Kanske menade du att skriva \"git add .\"?\n"
-#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
-#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
+#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940
+#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
msgid "index file corrupt"
msgstr "indexfilen trasig"
-#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431
+#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
-#: builtin/apply.c:58
-msgid "git apply [options] [<patch>...]"
-msgstr "git apply [flaggor] [<patch>...]"
-
-#: builtin/apply.c:111
+#: builtin/am.c:41
#, c-format
-msgid "unrecognized whitespace option '%s'"
-msgstr "okänt alternativ för whitespace: \"%s\""
+msgid "could not stat %s"
+msgstr "kunde inte ta status på %s"
-#: builtin/apply.c:126
+#: builtin/am.c:270 builtin/am.c:1318 builtin/commit.c:737
+#: builtin/merge.c:1079
#, c-format
-msgid "unrecognized whitespace ignore option '%s'"
-msgstr "okänt alternativ för ignore-whitespace: \"%s\""
+msgid "could not read '%s'"
+msgstr "kunde inte läsa \"%s\""
-#: builtin/apply.c:826
-#, c-format
-msgid "Cannot prepare timestamp regexp %s"
-msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
+#: builtin/am.c:444
+msgid "could not parse author script"
+msgstr "kunde inte tolka författarskript"
-#: builtin/apply.c:835
+#: builtin/am.c:521
#, c-format
-msgid "regexec returned %d for input: %s"
-msgstr "regexec returnerade %d för indata: %s"
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "\"%s\" togs bort av kroken applypatch-msg"
-#: builtin/apply.c:916
+#: builtin/am.c:562 builtin/notes.c:300
#, c-format
-msgid "unable to find filename in patch at line %d"
-msgstr "kan inte hitta filnamn i patchen på rad %d"
+msgid "Malformed input line: '%s'."
+msgstr "Felaktig indatarad: \"%s\"."
-#: builtin/apply.c:948
+#: builtin/am.c:599 builtin/notes.c:315
#, 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"
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
-#: builtin/apply.c:952
-#, 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"
+#: builtin/am.c:625
+msgid "fseek failed"
+msgstr "\"fseek\" misslyckades"
-#: builtin/apply.c:953
+#: builtin/am.c:786 builtin/am.c:874
#, 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"
+msgid "could not open '%s' for reading: %s"
+msgstr "kunde inte öppna \"%s\" för läsning: %s"
-#: builtin/apply.c:960
+#: builtin/am.c:793
#, 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"
+msgid "could not open '%s' for writing: %s"
+msgstr "Kunde inte öppna \"%s\" för skrivning: %s"
-#: builtin/apply.c:1423
+#: builtin/am.c:802
#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount: förväntade rad: %.*s"
+msgid "could not parse patch '%s'"
+msgstr "kunde inte tolka patchen \"%s\""
-#: builtin/apply.c:1480
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "patch-fragment utan huvud på rad %d: %.*s"
+#: builtin/am.c:867
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
-#: builtin/apply.c:1497
-#, c-format
-msgid ""
-"git diff header lacks filename information when removing %d leading pathname "
-"component (line %d)"
-msgid_plural ""
-"git diff header lacks filename information when removing %d leading pathname "
-"components (line %d)"
-msgstr[0] ""
-"git-diff-huvudet saknar filnamnsinformation när %d ledande sökvägskomponent\n"
-"tas bort (rad %d)"
-msgstr[1] ""
-"git-diff-huvudet saknar filnamnsinformation när %d ledande "
-"sökvägskomponenter\n"
-"tas bort (rad %d)"
+#: builtin/am.c:915
+msgid "invalid timestamp"
+msgstr "ogiltig tidsstämpel"
-#: builtin/apply.c:1657
-msgid "new file depends on old contents"
-msgstr "ny fil beror på gammalt innehåll"
+#: builtin/am.c:918 builtin/am.c:926
+msgid "invalid Date line"
+msgstr "ogiltig \"Date\"-rad"
-#: builtin/apply.c:1659
-msgid "deleted file still has contents"
-msgstr "borttagen fil har fortfarande innehåll"
+#: builtin/am.c:923
+msgid "invalid timezone offset"
+msgstr "ogiltig tidszons-offset"
-#: builtin/apply.c:1685
-#, c-format
-msgid "corrupt patch at line %d"
-msgstr "trasig patch på rad %d"
+#: builtin/am.c:1010
+msgid "Patch format detection failed."
+msgstr "Misslyckades detektera patchformat."
-#: builtin/apply.c:1721
+#: builtin/am.c:1015 builtin/clone.c:368
#, c-format
-msgid "new file %s depends on old contents"
-msgstr "nya filen %s beror på gammalt innehåll"
+msgid "failed to create directory '%s'"
+msgstr "misslyckades skapa katalogen \"%s\""
-#: builtin/apply.c:1723
-#, c-format
-msgid "deleted file %s still has contents"
-msgstr "borttagna filen %s har fortfarande innehåll"
+#: builtin/am.c:1019
+msgid "Failed to split patches."
+msgstr "Misslyckades dela patchar."
-#: builtin/apply.c:1726
-#, c-format
-msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** varning: filen %s blir tom men har inte tagits bort"
+#: builtin/am.c:1151 builtin/commit.c:362
+msgid "unable to write index file"
+msgstr "kan inte skriva indexfil"
-#: builtin/apply.c:1872
+#: builtin/am.c:1202
#, c-format
-msgid "corrupt binary patch at line %d: %.*s"
-msgstr "trasig binärpatch på rad %d: %.*s"
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "När du har löst problemet, kör \"%s --continue\"."
-#: builtin/apply.c:1901
+#: builtin/am.c:1203
#, c-format
-msgid "unrecognized binary patch at line %d"
-msgstr "binärpatchen på rad %d känns inte igen"
+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/apply.c:2052
+#: builtin/am.c:1204
#, c-format
-msgid "patch with only garbage at line %d"
-msgstr "patch med bara skräp på rad %d"
+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/apply.c:2142
-#, c-format
-msgid "unable to read symlink %s"
-msgstr "kunde inte läsa symboliska länken %s"
+#: builtin/am.c:1312
+msgid "Patch is empty. Was it split wrong?"
+msgstr "Patchen är tom. Delades den upp felaktigt?"
-#: builtin/apply.c:2146
+#: builtin/am.c:1386 builtin/log.c:1345
#, c-format
-msgid "unable to open or read %s"
-msgstr "kunde inte öppna eller läsa %s"
+msgid "invalid ident line: %s"
+msgstr "ogiltig ident-rad: %s"
-#: builtin/apply.c:2754
+#: builtin/am.c:1413
#, c-format
-msgid "invalid start of line: '%c'"
-msgstr "felaktig inledning på rad: \"%c\""
+msgid "unable to parse commit %s"
+msgstr "kunde inte tolka incheckningen %s"
-#: builtin/apply.c:2872
-#, 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)."
+#: builtin/am.c:1587
+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/apply.c:2884
-#, 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"
+#: builtin/am.c:1589
+msgid "Using index info to reconstruct a base tree..."
+msgstr "Använder indexinfo för att återskapa ett basträd..."
-#: builtin/apply.c:2890
-#, c-format
+#: builtin/am.c:1608
msgid ""
-"while searching for:\n"
-"%.*s"
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
msgstr ""
-"vid sökning efter:\n"
-"%.*s"
+"Har du handredigerat din patch?\n"
+"Den kan inte tillämpas på blobbar som antecknats i dess index."
-#: builtin/apply.c:2909
-#, c-format
-msgid "missing binary patch data for '%s'"
-msgstr "saknar binära patchdata för \"%s\""
+#: builtin/am.c:1614
+msgid "Falling back to patching base and 3-way merge..."
+msgstr ""
+"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-#: builtin/apply.c:3010
-#, c-format
-msgid "binary patch does not apply to '%s'"
-msgstr "binärpatchen kan inte tillämpas på \"%s\""
+#: builtin/am.c:1639
+msgid "Failed to merge in the changes."
+msgstr "Misslyckades slå ihop ändringarna."
-#: builtin/apply.c:3016
-#, 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)"
+#: builtin/am.c:1664 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:1671
+msgid "applying to an empty history"
+msgstr "tillämpar på en tom historik"
+
+#: builtin/am.c:1684 builtin/commit.c:1752 builtin/merge.c:829
+#: builtin/merge.c:854
+msgid "failed to write commit object"
+msgstr "kunde inte skriva incheckningsobjekt"
+
+#: builtin/am.c:1716 builtin/am.c:1720
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr "kan inte återuppta: %s finns inte."
+
+#: builtin/am.c:1736
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr ""
+"kan inte vara interaktiv om standard in inte är ansluten till en terminal."
+
+#: builtin/am.c:1741
+msgid "Commit Body is:"
+msgstr "Incheckningskroppen är:"
+
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#.
+#: builtin/am.c:1751
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "
+
+#: builtin/am.c:1801
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
+
+#: builtin/am.c:1836 builtin/am.c:1907
+#, c-format
+msgid "Applying: %.*s"
+msgstr "Tillämpar: %.*s"
+
+#: builtin/am.c:1852
+msgid "No changes -- Patch already applied."
+msgstr "Inga ändringar -- Patchen har redan tillämpats."
+
+#: builtin/am.c:1860
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr "Patch misslyckades på %s %.*s"
+
+#: builtin/am.c:1866
+#, 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:1910
+msgid ""
+"No changes - did you forget to use 'git add'?\n"
+"If there is nothing left to stage, chances are that something else\n"
+"already introduced the same changes; you might want to skip this patch."
+msgstr ""
+"Inga ändringar - glömde du använda \"git add\"?\n"
+"Om det inte är något kvar att köa kan det hända att något annat redan\n"
+"introducerat samma ändringar; kanske du bör hoppa över patchen."
+
+#: builtin/am.c:1917
+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\"?"
+
+#: builtin/am.c:2025 builtin/am.c:2029 builtin/am.c:2041 builtin/reset.c:308
+#: builtin/reset.c:316
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "Kan inte tolka objektet \"%s\""
+
+#: builtin/am.c:2077
+msgid "failed to clean index"
+msgstr "misslyckades städa upp indexet"
+
+#: builtin/am.c:2111
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
+"Återställer inte till ORIG_HEAD"
+
+#: builtin/am.c:2172
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr "Felaktigt värde för --patch-format: %s"
+
+#: builtin/am.c:2194
+msgid "git am [options] [(<mbox>|<Maildir>)...]"
+msgstr "git am [flaggor] [(<mbox>|<Maildir>)...]"
+
+#: builtin/am.c:2195
+msgid "git am [options] (--continue | --skip | --abort)"
+msgstr "git am [flaggor] (--continue | --skip | --abort)"
+
+#: builtin/am.c:2201
+msgid "run interactively"
+msgstr "kör interaktivt"
+
+#: builtin/am.c:2203
+msgid "historical option -- no-op"
+msgstr "historisk flagga -- no-op"
+
+#: builtin/am.c:2205
+msgid "allow fall back on 3way merging if needed"
+msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
+
+#: builtin/am.c:2206 builtin/init-db.c:509 builtin/prune-packed.c:57
+#: builtin/repack.c:171
+msgid "be quiet"
+msgstr "var tyst"
+
+#: builtin/am.c:2208
+msgid "add a Signed-off-by line to the commit message"
+msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
+
+#: builtin/am.c:2211
+msgid "recode into utf8 (default)"
+msgstr "koda om till utf8 (standard)"
+
+#: builtin/am.c:2213
+msgid "pass -k flag to git-mailinfo"
+msgstr "sänd flaggan -k till git-mailinfo"
+
+#: builtin/am.c:2215
+msgid "pass -b flag to git-mailinfo"
+msgstr "sänd flaggan -b till git-mailinfo"
+
+#: builtin/am.c:2217
+msgid "pass -m flag to git-mailinfo"
+msgstr "sänd flaggan -m till git-mailinfo"
+
+#: builtin/am.c:2219
+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:2222
+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:2225
+msgid "strip everything before a scissors line"
+msgstr "ta bort allting före en saxlinje"
+
+#: builtin/am.c:2226 builtin/apply.c:4563
+msgid "action"
+msgstr "åtgärd"
+
+#: builtin/am.c:2227 builtin/am.c:2230 builtin/am.c:2233 builtin/am.c:2236
+#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248
+#: builtin/am.c:2254
+msgid "pass it through git-apply"
+msgstr "sänd det genom git-apply"
+
+#: builtin/am.c:2235 builtin/apply.c:4587
+msgid "root"
+msgstr "rot"
+
+#: builtin/am.c:2238 builtin/am.c:2241 builtin/apply.c:4525
+#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93
+#: builtin/pull.c:167
+msgid "path"
+msgstr "sökväg"
+
+#: builtin/am.c:2244 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672
+#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127
+#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664
+#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132
+#: parse-options.h:134 parse-options.h:243
+msgid "n"
+msgstr "n"
+
+#: builtin/am.c:2247 builtin/apply.c:4531
+msgid "num"
+msgstr "antal"
+
+#: builtin/am.c:2250 builtin/for-each-ref.c:34 builtin/replace.c:438
+msgid "format"
+msgstr "format"
+
+#: builtin/am.c:2251
+msgid "format the patch(es) are in"
+msgstr "format för patch(ar)"
+
+#: builtin/am.c:2257
+msgid "override error message when patch failure occurs"
+msgstr "överstyr felmeddelanden när patchfel uppstår"
+
+#: builtin/am.c:2259
+msgid "continue applying patches after resolving a conflict"
+msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
+
+#: builtin/am.c:2262
+msgid "synonyms for --continue"
+msgstr "synonymer till --continue"
+
+#: builtin/am.c:2265
+msgid "skip the current patch"
+msgstr "hoppa över den aktuella grenen"
+
+#: builtin/am.c:2268
+msgid "restore the original branch and abort the patching operation."
+msgstr "återställ originalgrenen och avbryt patchningen."
+
+#: builtin/am.c:2272
+msgid "lie about committer date"
+msgstr "ljug om incheckningsdatum"
+
+#: builtin/am.c:2274
+msgid "use current timestamp for author date"
+msgstr "använd nuvarande tidsstämpel för författardatum"
+
+#: builtin/am.c:2276 builtin/commit.c:1590 builtin/merge.c:225
+#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606
+msgid "key-id"
+msgstr "nyckel-id"
+
+#: builtin/am.c:2277
+msgid "GPG-sign commits"
+msgstr "GPG-signera incheckningar"
+
+#: builtin/am.c:2280
+msgid "(internal use for git-rebase)"
+msgstr "(används internt av git-rebase)"
+
+#: builtin/am.c:2295
+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."
+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:2302
+msgid "failed to read the index"
+msgstr "misslyckades läsa indexet"
+
+#: builtin/am.c:2317
+#, 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:2341
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"Kvarbliven katalog %s hittades.\n"
+"Använd \"git am --abort\" för att ta bort den."
+
+#: builtin/am.c:2347
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "Lösningsoperation pågår inte, vi återupptar inte."
+
+#: builtin/apply.c:59
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<flaggor>] [<patch>...]"
+
+#: builtin/apply.c:112
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "okänt alternativ för whitespace: \"%s\""
+
+#: builtin/apply.c:127
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "okänt alternativ för ignore-whitespace: \"%s\""
+
+#: builtin/apply.c:822
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
+
+#: builtin/apply.c:831
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec returnerade %d för indata: %s"
+
+#: builtin/apply.c:912
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "kan inte hitta filnamn i patchen på rad %d"
+
+#: builtin/apply.c:944
+#, 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"
+
+#: builtin/apply.c:948
+#, 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"
+
+#: builtin/apply.c:949
+#, 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"
+
+#: builtin/apply.c:956
+#, 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"
+
+#: builtin/apply.c:1419
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: förväntade rad: %.*s"
+
+#: builtin/apply.c:1476
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "patch-fragment utan huvud på rad %d: %.*s"
+
+#: builtin/apply.c:1493
+#, c-format
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
+msgstr[0] ""
+"git-diff-huvudet saknar filnamnsinformation när %d ledande sökvägskomponent\n"
+"tas bort (rad %d)"
+msgstr[1] ""
+"git-diff-huvudet saknar filnamnsinformation när %d ledande "
+"sökvägskomponenter\n"
+"tas bort (rad %d)"
+
+#: builtin/apply.c:1659
+msgid "new file depends on old contents"
+msgstr "ny fil beror på gammalt innehåll"
+
+#: builtin/apply.c:1661
+msgid "deleted file still has contents"
+msgstr "borttagen fil har fortfarande innehåll"
+
+#: builtin/apply.c:1687
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "trasig patch på rad %d"
+
+#: builtin/apply.c:1723
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "nya filen %s beror på gammalt innehåll"
+
+#: builtin/apply.c:1725
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "borttagna filen %s har fortfarande innehåll"
+
+#: builtin/apply.c:1728
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** varning: filen %s blir tom men har inte tagits bort"
+
+#: builtin/apply.c:1874
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "trasig binärpatch på rad %d: %.*s"
+
+#: builtin/apply.c:1903
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "binärpatchen på rad %d känns inte igen"
+
+#: builtin/apply.c:2054
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "patch med bara skräp på rad %d"
+
+#: builtin/apply.c:2144
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "kunde inte läsa symboliska länken %s"
+
+#: builtin/apply.c:2148
+#, c-format
+msgid "unable to open or read %s"
+msgstr "kunde inte öppna eller läsa %s"
+
+#: builtin/apply.c:2781
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "felaktig inledning på rad: \"%c\""
+
+#: builtin/apply.c:2900
+#, 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)."
+
+#: builtin/apply.c:2912
+#, 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"
+
+#: builtin/apply.c:2918
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"vid sökning efter:\n"
+"%.*s"
+
+#: builtin/apply.c:2938
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "saknar binära patchdata för \"%s\""
-#: builtin/apply.c:3037
+#: builtin/apply.c:3039
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "binärpatchen kan inte tillämpas på \"%s\""
+
+#: builtin/apply.c:3045
+#, 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)"
+
+#: builtin/apply.c:3066
#, c-format
msgid "patch failed: %s:%ld"
msgstr "patch misslyckades: %s:%ld"
-#: builtin/apply.c:3161
+#: builtin/apply.c:3190
#, c-format
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
-#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260
+#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
#, c-format
msgid "read of %s failed"
msgstr "misslyckades läsa %s"
-#: builtin/apply.c:3240 builtin/apply.c:3462
+#: builtin/apply.c:3243
+#, 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"
+
+#: builtin/apply.c:3271 builtin/apply.c:3493
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "sökvägen %s har ändrat namn/tagits bort"
-#: builtin/apply.c:3321 builtin/apply.c:3476
+#: builtin/apply.c:3352 builtin/apply.c:3507
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: finns inte i indexet"
-#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490
+#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: builtin/apply.c:3330 builtin/apply.c:3484
+#: builtin/apply.c:3361 builtin/apply.c:3515
#, c-format
msgid "%s: does not match index"
msgstr "%s: motsvarar inte indexet"
-#: builtin/apply.c:3432
+#: builtin/apply.c:3463
msgid "removal patch leaves file contents"
msgstr "patch för borttagning lämnar kvar filinnehåll"
-#: builtin/apply.c:3501
+#: builtin/apply.c:3532
#, c-format
msgid "%s: wrong type"
msgstr "%s: fel typ"
-#: builtin/apply.c:3503
+#: builtin/apply.c:3534
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s har typen %o, förväntade %o"
-#: builtin/apply.c:3604
+#: builtin/apply.c:3693 builtin/apply.c:3695
+#, c-format
+msgid "invalid path '%s'"
+msgstr "ogiltig sökväg: %s"
+
+#: builtin/apply.c:3750
#, c-format
msgid "%s: already exists in index"
msgstr "%s: finns redan i indexet"
-#: builtin/apply.c:3607
+#: builtin/apply.c:3753
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: finns redan i arbetskatalogen"
-#: builtin/apply.c:3627
+#: builtin/apply.c:3773
#, 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)"
-#: builtin/apply.c:3632
+#: builtin/apply.c:3778
#, 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"
-#: builtin/apply.c:3640
+#: builtin/apply.c:3798
+#, 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"
+
+#: builtin/apply.c:3802
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patchen kan inte tillämpas"
-#: builtin/apply.c:3653
+#: builtin/apply.c:3816
#, c-format
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
-#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135
+#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
-#: builtin/apply.c:3889
+#: builtin/apply.c:4052
#, c-format
msgid "unable to remove %s from index"
msgstr "kan inte ta bort %s från indexet"
-#: builtin/apply.c:3918
+#: builtin/apply.c:4081
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "trasig patch för undermodulen %s"
-#: builtin/apply.c:3922
+#: builtin/apply.c:4085
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
-#: builtin/apply.c:3927
+#: builtin/apply.c:4090
#, 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"
-#: builtin/apply.c:3930 builtin/apply.c:4038
+#: builtin/apply.c:4093 builtin/apply.c:4201
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
-#: builtin/apply.c:3963
+#: builtin/apply.c:4126
#, c-format
msgid "closing file '%s'"
msgstr "stänger filen \"%s\""
-#: builtin/apply.c:4012
+#: builtin/apply.c:4175
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "kan inte skriva filen \"%s\" läge %o"
-#: builtin/apply.c:4099
+#: builtin/apply.c:4262
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tillämpade patchen %s rent."
-#: builtin/apply.c:4107
+#: builtin/apply.c:4270
msgid "internal error"
msgstr "internt fel"
-#: builtin/apply.c:4110
+#: builtin/apply.c:4273
#, 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..."
-#: builtin/apply.c:4120
+#: builtin/apply.c:4283
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: builtin/apply.c:4141
+#: builtin/apply.c:4304
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Stycke %d tillämpades rent."
-#: builtin/apply.c:4144
+#: builtin/apply.c:4307
#, c-format
msgid "Rejected hunk #%d."
msgstr "Refuserar stycke %d."
-#: builtin/apply.c:4234
+#: builtin/apply.c:4397
msgid "unrecognized input"
msgstr "indata känns inte igen"
-#: builtin/apply.c:4245
+#: builtin/apply.c:4408
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
-#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92
-#: builtin/fetch.c:93
-msgid "path"
-msgstr "sökväg"
-
-#: builtin/apply.c:4363
+#: builtin/apply.c:4526
msgid "don't apply changes matching the given path"
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
-#: builtin/apply.c:4366
+#: builtin/apply.c:4529
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: builtin/apply.c:4368
-msgid "num"
-msgstr "antal"
-
-#: builtin/apply.c:4369
+#: builtin/apply.c:4532
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
-#: builtin/apply.c:4372
+#: builtin/apply.c:4535
msgid "ignore additions made by the patch"
msgstr "ignorera tillägg gjorda av patchen"
-#: builtin/apply.c:4374
+#: builtin/apply.c:4537
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"
-#: builtin/apply.c:4378
+#: builtin/apply.c:4541
msgid "show number of added and deleted lines in decimal notation"
msgstr "visa antal tillagda och borttagna rader decimalt"
-#: builtin/apply.c:4380
+#: builtin/apply.c:4543
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"
-#: builtin/apply.c:4382
+#: builtin/apply.c:4545
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"
-#: builtin/apply.c:4384
+#: builtin/apply.c:4547
msgid "make sure the patch is applicable to the current index"
msgstr "se till att patchen kan tillämpas på aktuellt index"
-#: builtin/apply.c:4386
+#: builtin/apply.c:4549
msgid "apply a patch without touching the working tree"
msgstr "tillämpa en patch utan att röra arbetskatalogen"
-#: builtin/apply.c:4388
+#: builtin/apply.c:4551
+msgid "accept a patch that touches outside the working area"
+msgstr "godta en patch som rör filer utanför arbetskatalogen"
+
+#: builtin/apply.c:4553
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
-#: builtin/apply.c:4390
+#: builtin/apply.c:4555
msgid "attempt three-way merge if a patch does not apply"
msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
-#: builtin/apply.c:4392
+#: builtin/apply.c:4557
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455
+#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
-#: builtin/apply.c:4397
+#: builtin/apply.c:4562
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: builtin/apply.c:4398
-msgid "action"
-msgstr "åtgärd"
-
-#: builtin/apply.c:4399
+#: builtin/apply.c:4564
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
-#: builtin/apply.c:4402 builtin/apply.c:4405
+#: builtin/apply.c:4567 builtin/apply.c:4570
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
-#: builtin/apply.c:4408
+#: builtin/apply.c:4573
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
-#: builtin/apply.c:4410
+#: builtin/apply.c:4575
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
-#: builtin/apply.c:4412
+#: builtin/apply.c:4577
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
-#: builtin/apply.c:4414
+#: builtin/apply.c:4579
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: builtin/apply.c:4417
+#: builtin/apply.c:4582
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
-#: builtin/apply.c:4420
+#: builtin/apply.c:4585
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: builtin/apply.c:4422
-msgid "root"
-msgstr "rot"
-
-#: builtin/apply.c:4423
+#: builtin/apply.c:4588
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
-#: builtin/apply.c:4445
+#: builtin/apply.c:4610
msgid "--3way outside a repository"
msgstr "--3way utanför arkiv"
-#: builtin/apply.c:4453
+#: builtin/apply.c:4618
msgid "--index outside a repository"
msgstr "--index utanför arkiv"
-#: builtin/apply.c:4456
+#: builtin/apply.c:4621
msgid "--cached outside a repository"
msgstr "--cached utanför arkiv"
-#: builtin/apply.c:4472
+#: builtin/apply.c:4640
#, c-format
msgid "can't open patch '%s'"
msgstr "kan inte öppna patchen \"%s\""
-#: builtin/apply.c:4486
+#: builtin/apply.c:4654
#, 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"
-#: builtin/apply.c:4492 builtin/apply.c:4502
+#: builtin/apply.c:4660 builtin/apply.c:4670
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
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:30
-msgid "git blame [options] [rev-opts] [rev] [--] file"
-msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil"
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"
-#: builtin/blame.c:35
-msgid "[rev-opts] are documented in git-rev-list(1)"
-msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)"
+#: builtin/blame.c:37
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
-#: builtin/blame.c:2501
+#: builtin/blame.c:2500
msgid "Show blame entries as we find them, incrementally"
msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
-#: builtin/blame.c:2502
+#: builtin/blame.c:2501
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
-#: builtin/blame.c:2503
+#: builtin/blame.c:2502
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
-#: builtin/blame.c:2504
+#: builtin/blame.c:2503
msgid "Show work cost statistics"
msgstr "Visa statistik över arbetskostnad"
-#: builtin/blame.c:2505
+#: builtin/blame.c:2504
msgid "Show output score for blame entries"
msgstr "Visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:2506
+#: builtin/blame.c:2505
msgid "Show original filename (Default: auto)"
msgstr "Visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:2507
+#: builtin/blame.c:2506
msgid "Show original linenumber (Default: off)"
msgstr "Visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:2508
+#: builtin/blame.c:2507
msgid "Show in a format designed for machine consumption"
msgstr "Visa i ett format avsett för maskinkonsumtion"
-#: builtin/blame.c:2509
+#: builtin/blame.c:2508
msgid "Show porcelain format with per-line commit information"
msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:2510
+#: builtin/blame.c:2509
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:2511
+#: builtin/blame.c:2510
msgid "Show raw timestamp (Default: off)"
msgstr "Visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:2512
+#: builtin/blame.c:2511
msgid "Show long commit SHA1 (Default: off)"
msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:2513
+#: builtin/blame.c:2512
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:2514
+#: builtin/blame.c:2513
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:2515
+#: builtin/blame.c:2514
msgid "Ignore whitespace differences"
msgstr "Ignorera ändringar i blanksteg"
-#: builtin/blame.c:2516
+#: builtin/blame.c:2515
msgid "Spend extra cycles to find better match"
msgstr "Slösa extra cykler med att hitta bättre träff"
-#: builtin/blame.c:2517
+#: builtin/blame.c:2516
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:2518
+#: builtin/blame.c:2517
msgid "Use <file>'s contents as the final image"
msgstr "Använd <fil>s innehåll som slutgiltig bild"
-#: builtin/blame.c:2519 builtin/blame.c:2520
+#: builtin/blame.c:2518 builtin/blame.c:2519
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:2519
+#: builtin/blame.c:2518
msgid "Find line copies within and across files"
msgstr "Hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:2520
+#: builtin/blame.c:2519
msgid "Find line movements within and across files"
msgstr "Hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:2521
+#: builtin/blame.c:2520
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:2521
+#: builtin/blame.c:2520
msgid "Process only line range n,m, counting from 1"
msgstr "Behandla endast radintervallet n,m, med början på 1"
#. 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:2602
+#: builtin/blame.c:2601
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
#: builtin/branch.c:24
-msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
-msgstr "git branch [flaggor] [-r | -a] [--merged | --no-merged]"
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]"
#: builtin/branch.c:25
-msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
-msgstr "git branch [flaggor] [-l] [-f] <grennamn> [<startpunkt>]"
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]"
#: builtin/branch.c:26
-msgid "git branch [options] [-r] (-d | -D) <branchname>..."
-msgstr "git branch [flaggor] [-r] (-d | -D) <grennamn>..."
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..."
#: builtin/branch.c:27
-msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
-msgstr "git branch [flaggor] (-m | -M) [<gammal_gren>] <ny_gren>"
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>"
-#: builtin/branch.c:152
+#: builtin/branch.c:150
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
"tar bort grenen \"%s\" som har slagits ihop med\n"
" \"%s\", men ännu inte slagits ihop med HEAD."
-#: builtin/branch.c:156
+#: builtin/branch.c:154
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
"tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
" \"%s\", trots att den har slagits ihop med HEAD."
-#: builtin/branch.c:170
+#: builtin/branch.c:168
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
-#: builtin/branch.c:174
+#: builtin/branch.c:172
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"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:187
+#: builtin/branch.c:185
msgid "Update of config-file failed"
msgstr "Misslyckades uppdatera konfigurationsfil"
-#: builtin/branch.c:215
+#: builtin/branch.c:213
msgid "cannot use -a with -d"
msgstr "kan inte ange -a med -d"
-#: builtin/branch.c:221
+#: builtin/branch.c:219
msgid "Couldn't look up commit object for HEAD"
msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
-#: builtin/branch.c:229
+#: builtin/branch.c:227
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande."
-#: builtin/branch.c:245
+#: builtin/branch.c:243
#, c-format
-msgid "remote branch '%s' not found."
-msgstr "fjärrgrenen \"%s\" hittades inte."
+msgid "remote-tracking branch '%s' not found."
+msgstr "fjärrspårande grenen \"%s\" hittades inte."
-#: builtin/branch.c:246
+#: builtin/branch.c:244
#, c-format
msgid "branch '%s' not found."
msgstr "grenen \"%s\" hittades inte."
-#: builtin/branch.c:260
+#: builtin/branch.c:259
#, c-format
-msgid "Error deleting remote branch '%s'"
-msgstr "Fel vid borttagning av fjärrgrenen \"%s\""
+msgid "Error deleting remote-tracking branch '%s'"
+msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
-#: builtin/branch.c:261
+#: builtin/branch.c:260
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Fel vid borttagning av grenen \"%s\""
-#: builtin/branch.c:268
+#: builtin/branch.c:267
#, c-format
-msgid "Deleted remote branch %s (was %s).\n"
-msgstr "Tog bort fjärrgrenen %s (var %s).\n"
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"
-#: builtin/branch.c:269
+#: builtin/branch.c:268
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Tog bort grenen %s (var %s).\n"
-#: builtin/branch.c:370
+#: builtin/branch.c:369
#, c-format
msgid "branch '%s' does not point at a commit"
msgstr "grenen \"%s\" pekar inte på en incheckning"
-#: builtin/branch.c:459
+#: builtin/branch.c:452
#, c-format
msgid "[%s: gone]"
msgstr "[%s: försvunnen]"
-#: builtin/branch.c:464
+#: builtin/branch.c:457
#, c-format
msgid "[%s]"
msgstr "[%s]"
-#: builtin/branch.c:469
+#: builtin/branch.c:462
#, c-format
msgid "[%s: behind %d]"
msgstr "[%s: bakom %d] "
-#: builtin/branch.c:471
+#: builtin/branch.c:464
#, c-format
msgid "[behind %d]"
msgstr "[bakom %d] "
-#: builtin/branch.c:475
+#: builtin/branch.c:468
#, c-format
msgid "[%s: ahead %d]"
msgstr "[%s: före %d] "
-#: builtin/branch.c:477
+#: builtin/branch.c:470
#, c-format
msgid "[ahead %d]"
msgstr "[före %d] "
-#: builtin/branch.c:480
+#: builtin/branch.c:473
#, c-format
msgid "[%s: ahead %d, behind %d]"
msgstr "[%s: före %d, bakom %d] "
-#: builtin/branch.c:483
+#: builtin/branch.c:476
#, c-format
msgid "[ahead %d, behind %d]"
msgstr "[före %d, bakom %d] "
-#: builtin/branch.c:496
+#: builtin/branch.c:489
msgid " **** invalid ref ****"
msgstr " **** ogiltig ref ****"
-#: builtin/branch.c:587
+#: builtin/branch.c:580
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(ingen gren, ombaserar %s)"
-#: builtin/branch.c:590
+#: builtin/branch.c:583
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(ingen gren, \"bisect\" startad på %s)"
-#: builtin/branch.c:593
+#: builtin/branch.c:589
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD frånkopplat vid %s)"
+
+#: builtin/branch.c:592
#, c-format
-msgid "(detached from %s)"
-msgstr "(frånkopplad från %s)"
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD frånkopplat från %s)"
#: builtin/branch.c:596
msgid "(no branch)"
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
-#: builtin/branch.c:783
+#: builtin/branch.c:781
#, c-format
msgid "could not write branch description template: %s"
msgstr "kunde inte skriva grenbeskrivningsmall: %s"
-#: builtin/branch.c:813
+#: builtin/branch.c:811
msgid "Generic options"
msgstr "Allmänna flaggor"
-#: builtin/branch.c:815
+#: builtin/branch.c:813
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:816
+#: builtin/branch.c:814
msgid "suppress informational messages"
msgstr "undertryck informationsmeddelanden"
-#: builtin/branch.c:817
+#: builtin/branch.c:815
msgid "set up tracking mode (see git-pull(1))"
msgstr "ställ in spårningsläge (se git-pull(1))"
-#: builtin/branch.c:819
+#: builtin/branch.c:817
msgid "change upstream info"
msgstr "ändra uppströmsinformation"
-#: builtin/branch.c:823
+#: builtin/branch.c:821
msgid "use colored output"
msgstr "använd färgad utdata"
-#: builtin/branch.c:824
+#: builtin/branch.c:822
msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
-#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854
-#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587
-#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616
-#: builtin/tag.c:622
+#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852
+#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581
+#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618
+#: builtin/tag.c:624
msgid "commit"
msgstr "incheckning"
-#: builtin/branch.c:828 builtin/branch.c:834
+#: builtin/branch.c:826 builtin/branch.c:832
msgid "print only branches that contain the commit"
msgstr "visa endast grenar som innehåller incheckningen"
-#: builtin/branch.c:840
+#: builtin/branch.c:838
msgid "Specific git-branch actions:"
msgstr "Specifika git-branch-åtgärder:"
-#: builtin/branch.c:841
+#: builtin/branch.c:839
msgid "list both remote-tracking and local branches"
msgstr "visa både fjärrspårande och lokala grenar"
-#: builtin/branch.c:843
+#: builtin/branch.c:841
msgid "delete fully merged branch"
msgstr "ta bort helt sammanslagen gren"
-#: builtin/branch.c:844
+#: builtin/branch.c:842
msgid "delete branch (even if not merged)"
msgstr "ta bort gren (även om inte helt sammanslagen)"
-#: builtin/branch.c:845
+#: builtin/branch.c:843
msgid "move/rename a branch and its reflog"
msgstr "flytta/ta bort en gren och dess reflogg"
-#: builtin/branch.c:846
+#: builtin/branch.c:844
msgid "move/rename a branch, even if target exists"
msgstr "flytta/ta bort en gren, även om målet finns"
-#: builtin/branch.c:847
+#: builtin/branch.c:845
msgid "list branch names"
msgstr "lista namn på grenar"
-#: builtin/branch.c:848
+#: builtin/branch.c:846
msgid "create the branch's reflog"
msgstr "skapa grenens reflogg"
-#: builtin/branch.c:850
+#: builtin/branch.c:848
msgid "edit the description for the branch"
msgstr "redigera beskrivning för grenen"
-#: builtin/branch.c:851
+#: builtin/branch.c:849
msgid "force creation, move/rename, deletion"
msgstr "tvinga skapande, flytt/namnändring, borttagande"
-#: builtin/branch.c:854
+#: builtin/branch.c:852
msgid "print only not merged branches"
msgstr "visa endast ej sammanslagna grenar"
-#: builtin/branch.c:860
+#: builtin/branch.c:858
msgid "print only merged branches"
msgstr "visa endast sammanslagna grenar"
-#: builtin/branch.c:864
+#: builtin/branch.c:862
msgid "list branches in columns"
msgstr "visa grenar i spalter"
-#: builtin/branch.c:877
+#: builtin/branch.c:875
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens"
-#: builtin/branch.c:881 builtin/clone.c:637
+#: builtin/branch.c:879 builtin/clone.c:690
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
-#: builtin/branch.c:903
+#: builtin/branch.c:901
msgid "--column and --verbose are incompatible"
msgstr "--column och --verbose är inkompatibla"
-#: builtin/branch.c:914 builtin/branch.c:953
+#: builtin/branch.c:912 builtin/branch.c:951
msgid "branch name required"
msgstr "grennamn krävs"
-#: builtin/branch.c:929
+#: builtin/branch.c:927
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
-#: builtin/branch.c:934
+#: builtin/branch.c:932
msgid "cannot edit description of more than one branch"
msgstr "kan inte redigera beskrivning för mer än en gren"
-#: builtin/branch.c:941
+#: builtin/branch.c:939
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Inga incheckningar på grenen \"%s\" ännu"
-#: builtin/branch.c:944
+#: builtin/branch.c:942
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
-#: builtin/branch.c:959
+#: builtin/branch.c:957
msgid "too many branches for a rename operation"
msgstr "för många grenar för namnbyte"
-#: builtin/branch.c:964
+#: builtin/branch.c:962
msgid "too many branches to set new upstream"
msgstr "för många grenar för att byta uppström"
-#: builtin/branch.c:968
+#: builtin/branch.c:966
#, 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:971 builtin/branch.c:993 builtin/branch.c:1014
+#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
-#: builtin/branch.c:975
+#: builtin/branch.c:973
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
-#: builtin/branch.c:987
+#: builtin/branch.c:985
msgid "too many branches to unset upstream"
msgstr "för många grenar för att ta bort uppström"
-#: builtin/branch.c:991
+#: builtin/branch.c:989
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:997
+#: builtin/branch.c:995
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
-#: builtin/branch.c:1011
+#: builtin/branch.c:1009
msgid "it does not make sense to create 'HEAD' manually"
msgstr "kan inte skapa \"HEAD\" manuellt"
-#: builtin/branch.c:1017
+#: builtin/branch.c:1015
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:1020
+#: builtin/branch.c:1018
#, c-format
msgid ""
"The --set-upstream flag is deprecated and will be removed. Consider using --"
"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
"eller --set-upstream-to\n"
-#: builtin/branch.c:1037
+#: builtin/branch.c:1035
#, c-format
msgid ""
"\n"
"Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"
"\n"
-#: builtin/branch.c:1038
+#: builtin/branch.c:1036
#, c-format
msgid " git branch -d %s\n"
msgstr " git branch -d %s\n"
-#: builtin/branch.c:1039
+#: builtin/branch.c:1037
#, c-format
msgid " git branch --set-upstream-to %s\n"
msgstr " git branch --set-upstream-to %s\n"
-#: builtin/bundle.c:47
+#: builtin/bundle.c:51
#, c-format
msgid "%s is okay\n"
msgstr "%s är okej\n"
-#: builtin/bundle.c:56
+#: builtin/bundle.c:64
msgid "Need a repository to create a bundle."
msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."
-#: builtin/bundle.c:60
+#: builtin/bundle.c:68
msgid "Need a repository to unbundle."
msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
-#: builtin/cat-file.c:328
-msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
-msgstr "git cat-file (-t|-s|-e|-p|<typ>|--textconv) <objekt>"
+#: builtin/cat-file.c:428
+msgid ""
+"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
+"<type>|--textconv) <object>"
+msgstr ""
+"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
+"<typ>|--textconv) <objekt>"
-#: builtin/cat-file.c:329
-msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
-msgstr "git cat-file (--batch|--batch-check) < <objektlista>"
+#: builtin/cat-file.c:429
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
+"objects>"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] < <objektlista>"
-#: builtin/cat-file.c:366
+#: builtin/cat-file.c:466
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<typ> kan vara en av: blob, tree, commit, tag"
-#: builtin/cat-file.c:367
+#: builtin/cat-file.c:467
msgid "show object type"
msgstr "visa objekttyp"
-#: builtin/cat-file.c:368
+#: builtin/cat-file.c:468
msgid "show object size"
msgstr "visa objektstorlek"
-#: builtin/cat-file.c:370
+#: builtin/cat-file.c:470
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:371
+#: builtin/cat-file.c:471
msgid "pretty-print object's content"
msgstr "visa objektets innehåll snyggt"
-#: builtin/cat-file.c:373
+#: builtin/cat-file.c:473
msgid "for blob objects, run textconv on object's content"
msgstr "för blob-objekt, kör textconv på objektets innehåll"
-#: builtin/cat-file.c:375
+#: builtin/cat-file.c:475
+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:476
+msgid "buffer --batch output"
+msgstr "buffra utdata från --batch"
+
+#: builtin/cat-file.c:478
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:378
+#: builtin/cat-file.c:481
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:484
+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:486
+msgid "show all objects with --batch or --batch-check"
+msgstr "visa alla objekt med --batch eller --batch-check"
+
#: builtin/check-attr.c:11
-msgid "git check-attr [-a | --all | attr...] [--] pathname..."
-msgstr "git check-attr [-a | --all | attr...] [--] sökväg..."
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..."
#: builtin/check-attr.c:12
-msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
-msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <sökvägslista>"
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
+msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...] < <sökvägslista>"
#: builtin/check-attr.c:19
msgid "report all attributes set on file"
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:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
msgid "read file names from stdin"
msgstr "läs filnamn från standard in"
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:1107 builtin/gc.c:274
+#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
msgstr "--non-matching är endast giltig med --verbose"
#: builtin/check-mailmap.c:8
-msgid "git check-mailmap [options] <contact>..."
-msgstr "git check-mailmap [flaggor] <kontakt>..."
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<flaggor>] <kontakt>..."
#: builtin/check-mailmap.c:13
msgid "also read contacts from stdin"
msgstr "inga kontakter angavs"
#: builtin/checkout-index.c:126
-msgid "git checkout-index [options] [--] [<file>...]"
-msgstr "git checkout-index [flaggor] [--] [<fil>...]"
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<flaggor>] [--] [<fil>...]"
#: builtin/checkout-index.c:188
msgid "check out all files in the index"
msgstr "kopiera ut filer från namngiven etapp"
#: builtin/checkout.c:25
-msgid "git checkout [options] <branch>"
-msgstr "git checkout [flaggor] <gren>"
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<flaggor>] <gren>"
#: builtin/checkout.c:26
-msgid "git checkout [options] [<branch>] -- <file>..."
-msgstr "git checkout [flaggor] [<gren>] -- <fil>..."
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..."
-#: builtin/checkout.c:132 builtin/checkout.c:165
+#: builtin/checkout.c:133 builtin/checkout.c:166
#, c-format
msgid "path '%s' does not have our version"
msgstr "sökvägen \"%s\" har inte vår version"
-#: builtin/checkout.c:134 builtin/checkout.c:167
+#: builtin/checkout.c:135 builtin/checkout.c:168
#, c-format
msgid "path '%s' does not have their version"
msgstr "sökvägen \"%s\" har inte deras version"
-#: builtin/checkout.c:150
+#: builtin/checkout.c:151
#, 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:194
+#: builtin/checkout.c:195
#, 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:211
+#: builtin/checkout.c:212
#, c-format
msgid "path '%s': cannot merge"
msgstr "sökväg \"%s\": kan inte slå ihop"
-#: builtin/checkout.c:228
+#: builtin/checkout.c:229
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
-#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255
-#: builtin/checkout.c:258
+#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
+#: builtin/checkout.c:259
#, 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:261 builtin/checkout.c:264
+#: builtin/checkout.c:262 builtin/checkout.c:265
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "\"%s\" kan inte användas med %s"
-#: builtin/checkout.c:267
+#: builtin/checkout.c:268
#, 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:278 builtin/checkout.c:467
+#: builtin/checkout.c:279 builtin/checkout.c:473
msgid "corrupt index file"
msgstr "indexfilen är trasig"
-#: builtin/checkout.c:338 builtin/checkout.c:345
+#: builtin/checkout.c:339 builtin/checkout.c:346
#, c-format
msgid "path '%s' is unmerged"
msgstr "sökvägen \"%s\" har inte slagits ihop"
-#: builtin/checkout.c:489
+#: builtin/checkout.c:495
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
-#: builtin/checkout.c:615
+#: builtin/checkout.c:622
#, c-format
-msgid "Can not do reflog for '%s'\n"
-msgstr "Kan inte skapa referenslog för \"%s\"\n"
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
-#: builtin/checkout.c:653
+#: builtin/checkout.c:660
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:660
+#: builtin/checkout.c:667
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:663
+#: builtin/checkout.c:670
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:667
+#: builtin/checkout.c:674
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
-#: builtin/checkout.c:669 builtin/checkout.c:1050
+#: builtin/checkout.c:676 builtin/checkout.c:1065
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
-#: builtin/checkout.c:671
+#: builtin/checkout.c:678
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:723
+#: builtin/checkout.c:730
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:729
+#: builtin/checkout.c:736
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:747
+#: builtin/checkout.c:755
#, c-format
msgid ""
+"If you want to keep it by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
"If you want to keep them by creating a new branch, this may be a good time\n"
"to do so with:\n"
"\n"
-" git branch new_branch_name %s\n"
+" git branch <new-branch-name> %s\n"
"\n"
-msgstr ""
+msgstr[0] ""
+"Om du vill behålla den genom att skapa en ny gren är nu en bra tidpunkt\n"
+"att göra så, med:\n"
+"\n"
+" git branch <nytt_grennamn> %s\n"
+"\n"
+msgstr[1] ""
"Om du vill behålla dem genom att skapa en ny gren är nu en bra tidpunkt\n"
"att göra så, med:\n"
"\n"
-" git branch nytt_grennamn %s\n"
+" git branch <nytt_grennamn> %s\n"
"\n"
-#: builtin/checkout.c:777
+#: builtin/checkout.c:791
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:781
+#: builtin/checkout.c:795
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:808 builtin/checkout.c:1045
+#: builtin/checkout.c:822 builtin/checkout.c:1060
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:952
+#: builtin/checkout.c:967
#, c-format
msgid "only one reference expected, %d given."
msgstr "endast en referens förväntades, %d gavs."
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1006 builtin/worktree.c:210
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1020
+#: builtin/checkout.c:1035
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1059
+#: builtin/checkout.c:1074
msgid "paths cannot be used with switching branches"
msgstr "sökvägar kan inte användas vid byte av gren"
-#: builtin/checkout.c:1062 builtin/checkout.c:1066
+#: builtin/checkout.c:1077 builtin/checkout.c:1081
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "\"%s\" kan inte användas vid byte av gren"
-#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078
-#: builtin/checkout.c:1081
+#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093
+#: builtin/checkout.c:1096
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1086
+#: builtin/checkout.c:1101
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
-#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90
-#: builtin/remote.c:159 builtin/remote.c:161
+#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83
+#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317
+#: builtin/worktree.c:319
msgid "branch"
msgstr "gren"
-#: builtin/checkout.c:1109
+#: builtin/checkout.c:1135
msgid "create and checkout a new branch"
msgstr "skapa och checka ut en ny gren"
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1137
msgid "create/reset and checkout a branch"
msgstr "skapa/nollställ och checka ut en gren"
-#: builtin/checkout.c:1112
+#: builtin/checkout.c:1138
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1113
+#: builtin/checkout.c:1139
msgid "detach the HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1114
+#: builtin/checkout.c:1140
msgid "set upstream info for new branch"
msgstr "sätt uppströmsinformation för ny gren"
-#: builtin/checkout.c:1116
+#: builtin/checkout.c:1142
msgid "new-branch"
msgstr "ny-gren"
-#: builtin/checkout.c:1116
+#: builtin/checkout.c:1142
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1117
+#: builtin/checkout.c:1143
msgid "checkout our version for unmerged files"
msgstr "checka ut vår version för ej sammanslagna filer"
-#: builtin/checkout.c:1119
+#: builtin/checkout.c:1145
msgid "checkout their version for unmerged files"
msgstr "checka ut deras version för ej sammanslagna filer"
-#: builtin/checkout.c:1121
+#: builtin/checkout.c:1147
msgid "force checkout (throw away local modifications)"
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-#: builtin/checkout.c:1122
+#: builtin/checkout.c:1148
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:1123 builtin/merge.c:227
+#: builtin/checkout.c:1149 builtin/merge.c:227
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245
+#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1125
+#: builtin/checkout.c:1151
msgid "conflict style (merge or diff3)"
msgstr "konfliktstil (merge eller diff3)"
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1154
msgid "do not limit pathspecs to sparse entries only"
msgstr "begränsa inte sökvägar till endast glesa poster"
-#: builtin/checkout.c:1130
-msgid "second guess 'git checkout no-such-branch'"
-msgstr "förutspå \"git checkout gren-saknas\""
+#: builtin/checkout.c:1156
+msgid "second guess 'git checkout <no-such-branch>'"
+msgstr "förutspå \"git checkout <gren-saknas>\""
+
+#: builtin/checkout.c:1158
+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:1153
+#: builtin/checkout.c:1181
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
-#: builtin/checkout.c:1170
+#: builtin/checkout.c:1198
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1175
+#: builtin/checkout.c:1203
msgid "Missing branch name; try -b"
msgstr "Grennamn saknas; försök med -b"
-#: builtin/checkout.c:1212
+#: builtin/checkout.c:1239
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1219
+#: builtin/checkout.c:1246
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"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?"
-#: builtin/checkout.c:1224
+#: builtin/checkout.c:1251
#, 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:1228
+#: builtin/checkout.c:1255
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
"du checkar ut från indexet."
-#: builtin/clean.c:26
+#: builtin/clean.c:25
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:30
+#: builtin/clean.c:29
#, c-format
msgid "Removing %s\n"
msgstr "Tar bort %s\n"
-#: builtin/clean.c:31
+#: builtin/clean.c:30
#, c-format
msgid "Would remove %s\n"
msgstr "Skulle ta bort %s\n"
-#: builtin/clean.c:32
+#: builtin/clean.c:31
#, c-format
msgid "Skipping repository %s\n"
msgstr "Hoppar över arkivet %s\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:32
#, c-format
msgid "Would skip repository %s\n"
msgstr "Skulle hoppa över arkivet %s\n"
-#: builtin/clean.c:34
+#: builtin/clean.c:33
#, c-format
msgid "failed to remove %s"
msgstr "misslyckades ta bort %s"
-#: builtin/clean.c:295
+#: builtin/clean.c:317
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
"foo - markera post baserad på unikt prefix\n"
" - (tomt) markera ingenting"
-#: builtin/clean.c:299
+#: builtin/clean.c:321
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
"* - välj alla poster\n"
" - (tomt) avsluta markering"
-#: builtin/clean.c:517
+#: builtin/clean.c:537
#, c-format
msgid "Huh (%s)?"
msgstr "Vadå (%s)?"
-#: builtin/clean.c:659
+#: builtin/clean.c:679
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ange ignoreringsmönster>>"
-#: builtin/clean.c:696
+#: builtin/clean.c:716
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "VARNING: Hittar inte poster som motsvarar: %s"
-#: builtin/clean.c:717
+#: builtin/clean.c:737
msgid "Select items to delete"
msgstr "Välj poster att ta bort"
-#: builtin/clean.c:757
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:778
#, c-format
-msgid "remove %s? "
-msgstr "ta bort %s?"
+msgid "Remove %s [y/N]? "
+msgstr "Ta bort %s [Y=ja / N=nej]?"
-#: builtin/clean.c:782
+#: builtin/clean.c:803
msgid "Bye."
msgstr "Hej då."
-#: builtin/clean.c:790
+#: builtin/clean.c:811
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"help - denna skärm\n"
"? - hjälp för kommandoval"
-#: builtin/clean.c:817
+#: builtin/clean.c:838
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
-#: builtin/clean.c:818
+#: builtin/clean.c:839
msgid "What now"
msgstr "Vad nu"
-#: builtin/clean.c:826
+#: builtin/clean.c:847
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:843
+#: builtin/clean.c:864
msgid "No more files to clean, exiting."
msgstr "Inga fler filer att städa, avslutar."
-#: builtin/clean.c:874
+#: builtin/clean.c:895
msgid "do not print names of files removed"
msgstr "skriv inte ut namn på borttagna filer"
-#: builtin/clean.c:876
+#: builtin/clean.c:897
msgid "force"
msgstr "tvinga"
-#: builtin/clean.c:877
+#: builtin/clean.c:898
msgid "interactive cleaning"
msgstr "städa interaktivt"
-#: builtin/clean.c:879
+#: builtin/clean.c:900
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
-#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714
-#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
+#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714
+#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
msgid "pattern"
msgstr "mönster"
-#: builtin/clean.c:881
+#: builtin/clean.c:902
msgid "add <pattern> to ignore rules"
msgstr "lägg till <mönster> till ignoreringsregler"
-#: builtin/clean.c:882
+#: builtin/clean.c:903
msgid "remove ignored files, too"
msgstr "ta även bort ignorerade filer"
-#: builtin/clean.c:884
+#: builtin/clean.c:905
msgid "remove only ignored files"
msgstr "ta endast bort ignorerade filer"
-#: builtin/clean.c:902
+#: builtin/clean.c:923
msgid "-x and -X cannot be used together"
msgstr "-x och -X kan inte användas samtidigt"
-#: builtin/clean.c:906
+#: builtin/clean.c:927
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
"clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
"städa"
-#: builtin/clean.c:909
+#: builtin/clean.c:930
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
"angavs; vägrar städa"
#: builtin/clone.c:37
-msgid "git clone [options] [--] <repo> [<dir>]"
-msgstr "git clone [
flaggor] [--] <arkiv> [<kat>]"
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [
<flaggor>] [--] <arkiv> [<kat>]"
-#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224
-#: builtin/push.c:514
+#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224
+#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
-#: builtin/clone.c:68
+#: builtin/clone.c:59
msgid "don't create a checkout"
msgstr "skapa inte någon utcheckning"
-#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496
+#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504
msgid "create a bare repository"
msgstr "skapa ett naket (\"bare\") arkiv"
-#: builtin/clone.c:73
+#: builtin/clone.c:64
msgid "create a mirror repository (implies bare)"
msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
-#: builtin/clone.c:75
+#: builtin/clone.c:66
msgid "to clone from a local repository"
msgstr "för att klona från ett lokalt arkiv"
-#: builtin/clone.c:77
+#: builtin/clone.c:68
msgid "don't use local hardlinks, always copy"
msgstr "skapa inte lokala hårda länkar, kopiera alltid"
-#: builtin/clone.c:79
+#: builtin/clone.c:70
msgid "setup as shared repository"
msgstr "skapa som ett delat arkiv"
-#: builtin/clone.c:81 builtin/clone.c:83
+#: builtin/clone.c:72 builtin/clone.c:74
msgid "initialize submodules in the clone"
msgstr "initiera undermoduler i klonen"
-#: builtin/clone.c:84 builtin/init-db.c:493
+#: builtin/clone.c:75 builtin/init-db.c:501
msgid "template-directory"
msgstr "mallkatalog"
-#: builtin/clone.c:85 builtin/init-db.c:494
+#: builtin/clone.c:76 builtin/init-db.c:502
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
-#: builtin/clone.c:87
+#: builtin/clone.c:78
msgid "reference repository"
msgstr "referensarkiv"
-#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44
+#: builtin/clone.c:80
+msgid "use --reference only while cloning"
+msgstr "använd --reference endast under kloningen"
+
+#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
msgstr "namn"
-#: builtin/clone.c:89
+#: builtin/clone.c:82
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:91
+#: builtin/clone.c:84
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checka ut <gren> istället för fjärrens HEAD"
-#: builtin/clone.c:93
+#: builtin/clone.c:86
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659
+#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659
+#: builtin/pull.c:186
msgid "depth"
msgstr "djup"
-#: builtin/clone.c:95
+#: builtin/clone.c:88
msgid "create a shallow clone of that depth"
msgstr "skapa en grund klon på detta djup"
-#: builtin/clone.c:97
+#: builtin/clone.c:90
msgid "clone only one branch, HEAD or --branch"
msgstr "klona endast en gren, HEAD eller --branch"
-#: builtin/clone.c:99
-msgid "use --reference only while cloning"
-msgstr "använd --reference endast under kloningen"
-
-#: builtin/clone.c:100 builtin/init-db.c:502
+#: builtin/clone.c:91 builtin/init-db.c:510
msgid "gitdir"
msgstr "gitkat"
-#: builtin/clone.c:101 builtin/init-db.c:503
+#: builtin/clone.c:92 builtin/init-db.c:511
msgid "separate git dir from working tree"
msgstr "separera gitkatalogen från arbetskatalogen"
-#: builtin/clone.c:102
+#: builtin/clone.c:93
msgid "key=value"
msgstr "nyckel=värde"
-#: builtin/clone.c:103
+#: builtin/clone.c:94
msgid "set config inside the new repository"
msgstr "ställ in konfiguration i det nya arkivet"
-#: builtin/clone.c:256
+#: builtin/clone.c:298
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-#: builtin/clone.c:260
+#: builtin/clone.c:302
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "referensarkivet \"%s\" är grunt"
-#: builtin/clone.c:263
+#: builtin/clone.c:305
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "referensarkivet \"%s\" är ympat"
-#: builtin/clone.c:325
-#, c-format
-msgid "failed to create directory '%s'"
-msgstr "misslyckades skapa katalogen \"%s\""
-
-#: builtin/clone.c:327 builtin/diff.c:84
+#: builtin/clone.c:370 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
msgstr "misslyckades ta status på \"%s\""
-#: builtin/clone.c:329
+#: builtin/clone.c:372
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s finns och är ingen katalog"
-#: builtin/clone.c:343
+#: builtin/clone.c:386
#, c-format
msgid "failed to stat %s\n"
msgstr "misslyckades ta status på %s\n"
-#: builtin/clone.c:365
+#: builtin/clone.c:408
#, c-format
msgid "failed to create link '%s'"
msgstr "misslyckades skapa länken \"%s\""
-#: builtin/clone.c:369
+#: builtin/clone.c:412
#, c-format
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:392 builtin/clone.c:566
+#: builtin/clone.c:435 builtin/clone.c:619
#, c-format
msgid "done.\n"
msgstr "klart.\n"
-#: builtin/clone.c:404
+#: builtin/clone.c:447
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"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:481
+#: builtin/clone.c:524
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
# Vague original, not networking-related, but rather related to the actual
-# objects in the database.
-#: builtin/clone.c:561
+# objects downloaded.
+#: builtin/clone.c:614
#, c-format
msgid "Checking connectivity... "
-msgstr "Kontrollerar konnektivitet..."
+msgstr "Kontrollerar om vi fick alla objekt..."
-#: builtin/clone.c:564
+#: builtin/clone.c:617
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
-#: builtin/clone.c:628
+#: builtin/clone.c:681
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:659
+#: builtin/clone.c:712
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:746
+#: builtin/clone.c:799
msgid "cannot repack to clean up"
msgstr "kan inte packa om för att städa upp"
-#: builtin/clone.c:748
+#: builtin/clone.c:801
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
-#: builtin/clone.c:778
+#: builtin/clone.c:831
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:782
+#: builtin/clone.c:835
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:793
+#: builtin/clone.c:846
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "flaggorna --bare och --origin %s är inkompatibla."
-#: builtin/clone.c:796
+#: builtin/clone.c:849
msgid "--bare and --separate-git-dir are incompatible."
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-#: builtin/clone.c:809
+#: builtin/clone.c:862
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:815 builtin/fetch.c:1155
+#: builtin/clone.c:868 builtin/fetch.c:1168
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
-#: builtin/clone.c:825
+#: builtin/clone.c:878
#, 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:835
+#: builtin/clone.c:888
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:848 builtin/clone.c:860
+#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218
+#: builtin/worktree.c:245
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/clone.c:851
+#: builtin/clone.c:906
#, c-format
-msgid "could not create work tree dir '%s'."
+msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:870
+#: builtin/clone.c:924
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:872
+#: builtin/clone.c:926
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:897
+#: builtin/clone.c:951
msgid "--dissociate given, but there is no --reference"
msgstr "--dissociate angavs, men --reference har inte angivits"
-#: builtin/clone.c:912
+#: builtin/clone.c:968
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"
-#: builtin/clone.c:915
+#: builtin/clone.c:971
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
-#: builtin/clone.c:920
+#: builtin/clone.c:976
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:924
+#: builtin/clone.c:980
#, c-format
msgid "Don't know how to clone %s"
msgstr "Vet inte hur man klonar %s"
-#: builtin/clone.c:975 builtin/clone.c:983
+#: builtin/clone.c:1029 builtin/clone.c:1037
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:986
+#: builtin/clone.c:1040
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
#: builtin/column.c:9
-msgid "git column [options]"
-msgstr "git column [flaggor]"
+msgid "git column [<options>]"
+msgstr "git column [<flaggor>]"
#: builtin/column.c:26
msgid "lookup config vars"
msgstr "--command måste vara första argument"
#: builtin/commit.c:37
-msgid "git commit [
options] [--] <pathspec>..."
-msgstr "git commit [flaggor] [--] <sökväg>..."
+msgid "git commit [
<options>] [--] <pathspec>..."
+msgstr "git commit [<flaggor>] [--] <sökväg>..."
#: builtin/commit.c:42
-msgid "git status [
options] [--] <pathspec>..."
-msgstr "git status [flaggor] [--] <sökväg>..."
+msgid "git status [
<options>] [--] <pathspec>..."
+msgstr "git status [<flaggor>] [--] <sökväg>..."
#: builtin/commit.c:47
msgid ""
"\"git cherry-pick --continue\" kommer därefter att återuppta\n"
"cherry-pick för återstående incheckningar.\n"
-#: builtin/commit.c:302
+#: builtin/commit.c:304
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
-#: builtin/commit.c:342
+#: builtin/commit.c:345
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
-#: builtin/commit.c:348
+#: builtin/commit.c:351
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
-#: builtin/commit.c:359
-msgid "unable to write index file"
-msgstr "kan inte skriva indexfil"
-
-#: builtin/commit.c:361
+#: builtin/commit.c:364
msgid "unable to update temporary index"
msgstr "kan inte uppdatera temporärt index"
-#: builtin/commit.c:363
+#: builtin/commit.c:366
msgid "Failed to update main cache tree"
msgstr "Misslyckades uppdatera huvud-cacheträdet"
-#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461
+#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462
msgid "unable to write new_index file"
msgstr "kunde inte skriva filen new_index"
-#: builtin/commit.c:443
+#: builtin/commit.c:444
msgid "cannot do a partial commit during a merge."
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
-#: builtin/commit.c:445
+#: builtin/commit.c:446
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:454
+#: builtin/commit.c:455
msgid "cannot read the index"
msgstr "kan inte läsa indexet"
-#: builtin/commit.c:473
+#: builtin/commit.c:474
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:584
+#: builtin/commit.c:579
#, c-format
msgid "commit '%s' lacks author header"
msgstr "incheckningen \"%s\" saknar författarhuvud"
-#: builtin/commit.c:586
+#: builtin/commit.c:581
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
-#: builtin/commit.c:605
+#: builtin/commit.c:600
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:613
+#: builtin/commit.c:608
#, c-format
msgid "invalid date format: %s"
msgstr "felaktigt datumformat: %s"
-#: builtin/commit.c:657
+#: builtin/commit.c:652
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
"kunde inte välja ett kommentarstecken som inte använts\n"
"i det befintliga incheckningsmeddelandet"
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084
+#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
-#: builtin/commit.c:706 builtin/shortlog.c:273
+#: builtin/commit.c:701 builtin/shortlog.c:273
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:708
+#: builtin/commit.c:703
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
-#: builtin/commit.c:712
+#: builtin/commit.c:707
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
-#: builtin/commit.c:734
+#: builtin/commit.c:729
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
-#: builtin/commit.c:738
+#: builtin/commit.c:733
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:742
-#, c-format
-msgid "could not read '%s'"
-msgstr "kunde inte läsa \"%s\""
-
-#: builtin/commit.c:789
+#: builtin/commit.c:784
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
-#: builtin/commit.c:807
+#: builtin/commit.c:802
#, c-format
msgid ""
"\n"
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:812
+#: builtin/commit.c:807
#, c-format
msgid ""
"\n"
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:825
+#: builtin/commit.c:820
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
-#: builtin/commit.c:832
+#: builtin/commit.c:827
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"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:852
+#: builtin/commit.c:847
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
-#: builtin/commit.c:860
+#: builtin/commit.c:855
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:867
+#: builtin/commit.c:862
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
-#: builtin/commit.c:885
+#: builtin/commit.c:880
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:942
+#: builtin/commit.c:937
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:957 builtin/tag.c:495
+#: builtin/commit.c:952 builtin/tag.c:495
#, 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:1059
+#: builtin/commit.c:1054
#, c-format
-msgid "No existing author found with '%s'"
-msgstr "Hittade ingen befintlig författare med \"%s\""
+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:1074 builtin/commit.c:1314
+#: builtin/commit.c:1069 builtin/commit.c:1309
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:1111
+#: builtin/commit.c:1106
msgid "--long and -z are incompatible"
msgstr "--long och -z är inkompatibla"
-#: builtin/commit.c:1141
+#: builtin/commit.c:1136
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:1150
+#: builtin/commit.c:1145
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1153
+#: builtin/commit.c:1148
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:1155
+#: builtin/commit.c:1150
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:1158
+#: builtin/commit.c:1153
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
-#: builtin/commit.c:1168
+#: builtin/commit.c:1163
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:1170
+#: builtin/commit.c:1165
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:1178
+#: builtin/commit.c:1173
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:1195
+#: builtin/commit.c:1190
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:1197
+#: builtin/commit.c:1192
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:1199
+#: builtin/commit.c:1194
msgid "Clever... amending the last one with dirty index."
msgstr "Smart... utöka den senaste med smutsigt index."
-#: builtin/commit.c:1201
+#: builtin/commit.c:1196
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:1213 builtin/tag.c:728
+#: builtin/commit.c:1208 builtin/tag.c:730
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
-#: builtin/commit.c:1218
+#: builtin/commit.c:1213
msgid "Paths with -a does not make sense."
msgstr "Kan inte ange sökvägar med -a."
-#: builtin/commit.c:1328 builtin/commit.c:1608
+#: builtin/commit.c:1323 builtin/commit.c:1602
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1330 builtin/commit.c:1610
+#: builtin/commit.c:1325 builtin/commit.c:1604
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500
+#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1335 builtin/commit.c:1614
+#: builtin/commit.c:1330 builtin/commit.c:1608
msgid "show status in long format (default)"
msgstr "visa status i långt format (standard)"
-#: builtin/commit.c:1338 builtin/commit.c:1617
+#: builtin/commit.c:1333 builtin/commit.c:1611
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980
-#: builtin/fast-export.c:983 builtin/tag.c:603
+#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981
+#: builtin/fast-export.c:984 builtin/tag.c:604
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1341 builtin/commit.c:1620
+#: builtin/commit.c:1336 builtin/commit.c:1614
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:1344
+#: builtin/commit.c:1339
msgid "show ignored files"
msgstr "visa ignorerade filer"
-#: builtin/commit.c:1345 parse-options.h:153
+#: builtin/commit.c:1340 parse-options.h:155
msgid "when"
msgstr "när"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1341
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1343
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1435
+#: builtin/commit.c:1429
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: builtin/commit.c:1437
+#: builtin/commit.c:1431
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: builtin/commit.c:1482
+#: builtin/commit.c:1476
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: builtin/commit.c:1485
+#: builtin/commit.c:1479
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: builtin/commit.c:1578
+#: builtin/commit.c:1572
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1579
+#: builtin/commit.c:1573
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1581
+#: builtin/commit.c:1575
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1582 builtin/tag.c:601
+#: builtin/commit.c:1576 builtin/tag.c:602
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1577
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1583
+#: builtin/commit.c:1577
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1584 builtin/gc.c:275
+#: builtin/commit.c:1578 builtin/gc.c:268
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1584
+#: builtin/commit.c:1578
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
-#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391
-#: builtin/notes.c:554 builtin/tag.c:599
+#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392
+#: builtin/notes.c:555 builtin/tag.c:600
msgid "message"
msgstr "meddelande"
-#: builtin/commit.c:1585
+#: builtin/commit.c:1579
msgid "commit message"
msgstr "incheckningsmeddelande"
-#: builtin/commit.c:1586
+#: builtin/commit.c:1580
msgid "reuse and edit message from specified commit"
msgstr "återanvänd och redigera meddelande från angiven incheckning"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1581
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1582
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att fixa angiven incheckning"
-#: builtin/commit.c:1589
+#: builtin/commit.c:1583
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:1590
+#: builtin/commit.c:1584
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:1591 builtin/log.c:1191 builtin/revert.c:86
+#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1586
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1587
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1588
msgid "default"
msgstr "standard"
-#: builtin/commit.c:1594 builtin/tag.c:604
+#: builtin/commit.c:1588 builtin/tag.c:605
msgid "how to strip spaces and #comments from message"
msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1589
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92
-#: builtin/tag.c:605
-msgid "key-id"
-msgstr "nyckel-id"
-
-#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93
+#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156
+#: builtin/revert.c:93
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
-#: builtin/commit.c:1600
+#: builtin/commit.c:1594
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1595
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1596
msgid "add specified files to index for commit"
msgstr "lägg till angivna filer till indexet för incheckning"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1597
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1598
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1605
+#: builtin/commit.c:1599
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1606
+#: builtin/commit.c:1600
msgid "bypass pre-commit hook"
msgstr "förbigå pre-commit-krok"
-#: builtin/commit.c:1607
+#: builtin/commit.c:1601
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1618
+#: builtin/commit.c:1612
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1613
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1624
+#: builtin/commit.c:1618
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1620
msgid "ok to record a change with an empty message"
msgstr "ok att registrera en ändring med tomt meddelande"
-#: builtin/commit.c:1655
+#: builtin/commit.c:1649
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
-#: builtin/commit.c:1694 builtin/merge.c:519
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "kunde inte öppna \"%s\" för läsning"
-
-#: builtin/commit.c:1701
+#: builtin/commit.c:1695
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1708
+#: builtin/commit.c:1702
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1727
+#: builtin/commit.c:1721
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1738
+#: builtin/commit.c:1732
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
-#: builtin/commit.c:1743
+#: builtin/commit.c:1737
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
-#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876
-msgid "failed to write commit object"
-msgstr "kunde inte skriva incheckningsobjekt"
-
-#: builtin/commit.c:1791
+#: builtin/commit.c:1785
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
"\"git reset HEAD\" för att återställa."
#: builtin/config.c:8
-msgid "git config [options]"
-msgstr "git config [flaggor]"
+msgid "git config [<options>]"
+msgstr "git config [<flaggor>]"
-#: builtin/config.c:53
+#: builtin/config.c:54
msgid "Config file location"
msgstr "Konfigurationsfilens plats"
-#: builtin/config.c:54
+#: builtin/config.c:55
msgid "use global config file"
msgstr "använd global konfigurationsfil"
-#: builtin/config.c:55
+#: builtin/config.c:56
msgid "use system config file"
msgstr "använd systemets konfigurationsfil"
-#: builtin/config.c:56
+#: builtin/config.c:57
msgid "use repository config file"
msgstr "använd arkivets konfigurationsfil"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "use given config file"
msgstr "använd angiven konfigurationsfil"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "read config from given blob object"
msgstr "läs konfiguration från givet blob-objekt"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "Action"
msgstr "Åtgärd"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "get value: name [value-regex]"
msgstr "hämta värde: namn [värde-reguttr]"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "get all values: key [value-regex]"
msgstr "hämta alla värden: nyckel [värde-reguttr]"
-#: builtin/config.c:62
+#: builtin/config.c:63
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:63
+#: builtin/config.c:64
msgid "get value specific for the URL: section[.var] URL"
msgstr "hämta värde specifikt URL:en: sektion[.var] URL"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "replace all matching variables: name value [value_regex]"
msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "add a new variable: name value"
msgstr "lägg till en ny variabel: namn värde"
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "remove a variable: name [value-regex]"
msgstr "ta bort en variabel: namn [värde-reguttr]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "remove all matches: name [value-regex]"
msgstr "ta bort alla träffar: namn [värde-reguttr]"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "rename section: old-name new-name"
msgstr "byt namn på sektion: gammalt-namn nytt-namn"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "remove a section: name"
msgstr "ta bort en sektion: namn"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "list all"
msgstr "visa alla"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "open an editor"
msgstr "öppna textredigeringsprogram"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "find the color configured: slot [default]"
msgstr "hitta den inställda färgen: slot [default]"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "hitta färginställningen: slot [stdout-is-tty]"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "value is \"true\" or \"false\""
msgstr "värdet är \"true\" eller \"false\""
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "value is decimal number"
msgstr "värdet är ett decimalt tal"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "value is --bool or --int"
msgstr "värdet är --bool eller --int"
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "value is a path (file or directory name)"
msgstr "värdet är en sökväg (fil- eller katalognamn)"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "Other"
msgstr "Andra"
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "terminate values with NUL byte"
msgstr "terminera värden med NUL-byte"
-#: builtin/config.c:81
+#: builtin/config.c:82
+msgid "show variable names only"
+msgstr "visa endast variabelnamn"
+
+#: builtin/config.c:83
msgid "respect include directives on lookup"
msgstr "respektera inkluderingsdirektiv vid uppslag"
-#: builtin/config.c:316
+#: builtin/config.c:311
msgid "unable to parse default color value"
msgstr "kan inte tolka standardfärgvärde"
-#: builtin/config.c:457
+#: builtin/config.c:449
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
-"[core]\n"
+"[user]\n"
"# Please adapt and uncomment the following lines:\n"
-"#\tuser = %s\n"
+"#\tname = %s\n"
"#\temail = %s\n"
msgstr ""
"# Detta är Gits användarspecifika konfigurationsfil\n"
-"[core]\n"
+"[user]\n"
"# Justera och ta bort kommenteringsmärket från följande rader:\n"
-"#\tuser = %s\n"
+"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:589
+#: builtin/config.c:583
#, c-format
msgid "cannot create configuration file %s"
msgstr "kan inte skapa konfigurationsfilen \"%s\""
msgstr "skriv storlekar i människoläsbart format"
#: builtin/describe.c:17
-msgid "git describe [options] <commit-ish>*"
-msgstr "git describe [flaggor] <incheckning-igt>*"
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<flaggor>] [<incheckning-igt>...]"
#: builtin/describe.c:18
-msgid "git describe [options] --dirty"
-msgstr "git describe [flaggor] --dirty"
+msgid "git describe [<options>] --dirty"
+msgstr "git describe [<flaggor>] --dirty"
#: builtin/describe.c:217
#, 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:452
+#: builtin/describe.c:250 builtin/log.c:459
#, c-format
msgid "Not a valid object name %s"
msgstr "Objektnamnet är inte giltigt: %s"
msgid "unhandled object '%s' given."
msgstr "ej hanterat objekt \"%s\" angavs."
-#: builtin/fast-export.c:24
+#: builtin/fast-export.c:25
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-flaggor]"
-#: builtin/fast-export.c:979
+#: builtin/fast-export.c:980
msgid "show progress after <n> objects"
msgstr "visa förlopp efter <n> objekt"
-#: builtin/fast-export.c:981
+#: builtin/fast-export.c:982
msgid "select handling of signed tags"
msgstr "välj hantering av signerade taggar"
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:985
msgid "select handling of tags that tag filtered objects"
msgstr "välj hantering av taggar som har taggfiltrerade objekt"
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:988
msgid "Dump marks to this file"
msgstr "Dump märken till filen"
-#: builtin/fast-export.c:989
+#: builtin/fast-export.c:990
msgid "Import marks from this file"
msgstr "Importera märken från filen"
-#: builtin/fast-export.c:991
+#: builtin/fast-export.c:992
msgid "Fake a tagger when tags lack one"
msgstr "Fejka taggare när taggen saknar en"
-#: builtin/fast-export.c:993
+#: builtin/fast-export.c:994
msgid "Output full tree for each commit"
msgstr "Skriv ut hela trädet för varje incheckning"
-#: builtin/fast-export.c:995
+#: builtin/fast-export.c:996
msgid "Use the done feature to terminate the stream"
msgstr "Använd done-funktionen för att avsluta strömmen"
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:997
msgid "Skip output of blob data"
msgstr "Hoppa över skrivning av blob-data"
-#: builtin/fast-export.c:997
+#: builtin/fast-export.c:998
msgid "refspec"
msgstr "referensspecifikation"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:999
msgid "Apply refspec to exported refs"
msgstr "Applicera referensspecifikation på exporterade referenser"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1000
msgid "anonymize output"
msgstr "anonymisera utdata"
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<flaggor>]"
-#: builtin/fetch.c:90
+#: builtin/fetch.c:90 builtin/pull.c:162
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
-#: builtin/fetch.c:92
+#: builtin/fetch.c:92 builtin/pull.c:165
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:94
+#: builtin/fetch.c:94 builtin/pull.c:168
msgid "path to upload pack on remote end"
msgstr "sökväg till upload pack på fjärren"
-#: builtin/fetch.c:95
+#: builtin/fetch.c:95 builtin/pull.c:170
msgid "force overwrite of local branch"
msgstr "tvinga överskrivning av lokal gren"
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:99
+#: builtin/fetch.c:99 builtin/pull.c:172
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
msgid "do not fetch all tags (--no-tags)"
msgstr "hämta inte alla taggar (--no-tags)"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:103 builtin/pull.c:175
msgid "prune remote-tracking branches no longer on remote"
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
-#: builtin/fetch.c:104
+#: builtin/fetch.c:104 builtin/pull.c:178
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:105
+#: builtin/fetch.c:105 builtin/pull.c:179
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
-#: builtin/fetch.c:109
+#: builtin/fetch.c:109 builtin/pull.c:184
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
msgid "allow updating of HEAD ref"
msgstr "tillåt uppdatering av HEAD-referens"
-#: builtin/fetch.c:114
+#: builtin/fetch.c:114 builtin/pull.c:187
msgid "deepen history of shallow clone"
msgstr "fördjupa historik för grund klon"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:116 builtin/pull.c:190
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:118 builtin/log.c:1208
+#: builtin/fetch.c:118 builtin/log.c:1233
msgid "dir"
msgstr "kat"
msgid "default mode for recursion"
msgstr "standardläge för rekursion"
-#: builtin/fetch.c:124
+#: builtin/fetch.c:124 builtin/pull.c:193
msgid "accept refs that update .git/shallow"
msgstr "tar emot referenser som uppdaterar .git/shallow"
-#: builtin/fetch.c:125
+#: builtin/fetch.c:125 builtin/pull.c:195
msgid "refmap"
msgstr "referenskarta"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:126 builtin/pull.c:196
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
-#: builtin/fetch.c:376
+#: builtin/fetch.c:378
msgid "Couldn't find remote ref HEAD"
msgstr "Kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:454
+#: builtin/fetch.c:458
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:459
+#: builtin/fetch.c:463
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:473
+#: builtin/fetch.c:477
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)"
-#: builtin/fetch.c:474 builtin/fetch.c:560
+#: builtin/fetch.c:478 builtin/fetch.c:564
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:485
+#: builtin/fetch.c:489
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
-#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540
+#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544
msgid " (unable to update local ref)"
msgstr " (kunde inte uppdatera lokal ref)"
-#: builtin/fetch.c:505
+#: builtin/fetch.c:509
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:508
+#: builtin/fetch.c:512
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:511
+#: builtin/fetch.c:515
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:556
+#: builtin/fetch.c:560
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:556
+#: builtin/fetch.c:560
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:562
+#: builtin/fetch.c:566
msgid "(non-fast-forward)"
msgstr "(ej snabbspolad)"
-#: builtin/fetch.c:595 builtin/fetch.c:828
+#: builtin/fetch.c:600 builtin/fetch.c:842
#, c-format
msgid "cannot open %s: %s\n"
msgstr "kan inte öppna %s: %s\n"
-#: builtin/fetch.c:604
+#: builtin/fetch.c:609
#, 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:622
+#: builtin/fetch.c:627
#, 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:710 builtin/fetch.c:793
+#: builtin/fetch.c:715 builtin/fetch.c:807
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:721
+#: builtin/fetch.c:726
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
"vissa lokala referenser kunde inte uppdateras; testa att köra\n"
" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
-#: builtin/fetch.c:773
+#: builtin/fetch.c:778
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:774
+#: builtin/fetch.c:779
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:798
+#: builtin/fetch.c:811
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:799 builtin/remote.c:1060
+#: builtin/fetch.c:812 builtin/remote.c:1034
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:818
+#: builtin/fetch.c:832
#, 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:837
+#: builtin/fetch.c:851
#, 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:840
+#: builtin/fetch.c:854
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:896
+#: builtin/fetch.c:910
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "Vet inte hur man hämtar från %s"
-#: builtin/fetch.c:1058
+#: builtin/fetch.c:1071
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:1060 builtin/remote.c:90
+#: builtin/fetch.c:1073 builtin/remote.c:90
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
-#: builtin/fetch.c:1078
+#: builtin/fetch.c:1091
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar skall hämtas från."
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1114
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
-#: builtin/fetch.c:1143
+#: builtin/fetch.c:1156
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
-#: builtin/fetch.c:1145
+#: builtin/fetch.c:1158
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:1168
+#: builtin/fetch.c:1181
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:1170
+#: builtin/fetch.c:1183
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:1181
+#: builtin/fetch.c:1194
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:1189
+#: builtin/fetch.c:1202
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:13
-msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
+#: builtin/fmt-merge-msg.c:14
+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>]"
+"git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]"
-#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
-#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
-#: builtin/show-branch.c:657 builtin/show-ref.c:178 builtin/tag.c:590
-#: parse-options.h:132 parse-options.h:239
-msgid "n"
-msgstr "n"
-
-#: builtin/fmt-merge-msg.c:663
+#: builtin/fmt-merge-msg.c:670
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:673
msgid "alias for --log (deprecated)"
msgstr "alias för --log (avråds)"
-#: builtin/fmt-merge-msg.c:669
+#: builtin/fmt-merge-msg.c:676
msgid "text"
msgstr "text"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:677
msgid "use <text> as start of message"
msgstr "inled meddelande med <text>"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:678
msgid "file to read from"
msgstr "fil att läsa från"
-#: builtin/for-each-ref.c:676
-msgid "unable to parse format"
-msgstr "kan inte tolka formatet"
-
-#: builtin/for-each-ref.c:1064
-msgid "git for-each-ref [options] [<pattern>]"
-msgstr "git for-each-ref [flaggor] [<mönster>]"
+#: builtin/for-each-ref.c:9
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr "git for-each-ref [<flaggor>] [<mönster>]"
-#: builtin/for-each-ref.c:1079
+#: builtin/for-each-ref.c:24
msgid "quote placeholders suitably for shells"
msgstr "citera platshållare passande för skal"
-#: builtin/for-each-ref.c:1081
+#: builtin/for-each-ref.c:26
msgid "quote placeholders suitably for perl"
msgstr "citera platshållare passande för perl"
-#: builtin/for-each-ref.c:1083
+#: builtin/for-each-ref.c:28
msgid "quote placeholders suitably for python"
msgstr "citera platshållare passande för python"
-#: builtin/for-each-ref.c:1085
+#: builtin/for-each-ref.c:30
msgid "quote placeholders suitably for Tcl"
msgstr "citera platshållare passande för Tcl"
-#: builtin/for-each-ref.c:1088
+#: builtin/for-each-ref.c:33
msgid "show only <n> matched refs"
msgstr "visa endast <n> träffade refs"
-#: builtin/for-each-ref.c:1089 builtin/replace.c:438
-msgid "format"
-msgstr "format"
-
-#: builtin/for-each-ref.c:1089
+#: builtin/for-each-ref.c:34
msgid "format to use for the output"
msgstr "format att använda för utdata"
-#: builtin/for-each-ref.c:1090
+#: builtin/for-each-ref.c:35
msgid "key"
msgstr "nyckel"
-#: builtin/for-each-ref.c:1091
+#: builtin/for-each-ref.c:36
msgid "field name to sort on"
msgstr "fältnamn att sortera på"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: builtin/fsck.c:147 builtin/prune.c:136
+#: builtin/fsck.c:163 builtin/prune.c:137
msgid "Checking connectivity"
msgstr "Kontrollerar konnektivitet"
-#: builtin/fsck.c:540
+#: builtin/fsck.c:568
msgid "Checking object directories"
msgstr "Kontrollerar objektkataloger"
-#: builtin/fsck.c:603
-msgid "git fsck [options] [<object>...]"
-msgstr "git fsck [flaggor] [<objekt>...]"
+#: builtin/fsck.c:631
+msgid "git fsck [<options>] [<object>...]"
+msgstr "git fsck [<flaggor>] [<objekt>...]"
-#: builtin/fsck.c:609
+#: builtin/fsck.c:637
msgid "show unreachable objects"
msgstr "visa onåbara objekt"
-#: builtin/fsck.c:610
+#: builtin/fsck.c:638
msgid "show dangling objects"
msgstr "visa dinglande objekt"
-#: builtin/fsck.c:611
+#: builtin/fsck.c:639
msgid "report tags"
msgstr "rapportera taggar"
-#: builtin/fsck.c:612
+#: builtin/fsck.c:640
msgid "report root nodes"
msgstr "rapportera rotnoder"
-#: builtin/fsck.c:613
+#: builtin/fsck.c:641
msgid "make index objects head nodes"
msgstr "gör indexojekt till huvudnoder"
-#: builtin/fsck.c:614
+#: builtin/fsck.c:642
msgid "make reflogs head nodes (default)"
msgstr "gör refloggar till huvudnoder (standard)"
-#: builtin/fsck.c:615
+#: builtin/fsck.c:643
msgid "also consider packs and alternate objects"
msgstr "ta även hänsyn till paket och alternativa objekt"
-#: builtin/fsck.c:616
+# Vague original, not networking-related, but rather related to the actual
+# objects in the database.
+#: builtin/fsck.c:644
+msgid "check only connectivity"
+msgstr "kontrollera endast konnektivitet"
+
+#: builtin/fsck.c:645
msgid "enable more strict checking"
msgstr "aktivera striktare kontroll"
-#: builtin/fsck.c:618
+#: builtin/fsck.c:647
msgid "write dangling objects in .git/lost-found"
msgstr "skriv dinglande objekt i .git/lost-found"
-#: builtin/fsck.c:619 builtin/prune.c:108
+#: builtin/fsck.c:648 builtin/prune.c:107
msgid "show progress"
msgstr "visa förlopp"
-#: builtin/fsck.c:669
+#: builtin/fsck.c:707
msgid "Checking objects"
msgstr "Kontrollerar objekt"
-#: builtin/gc.c:24
-msgid "git gc [options]"
-msgstr "git gc [flaggor]"
+#: builtin/gc.c:25
+msgid "git gc [<options>]"
+msgstr "git gc [<flaggor>]"
-#: builtin/gc.c:79
+#: builtin/gc.c:55
#, c-format
-msgid "Invalid gc.pruneexpire: '%s'"
-msgstr "Ogiltig gc.pruneexpire: '%s'"
+msgid "Invalid %s: '%s'"
+msgstr "Felaktigt %s: \"%s\""
-#: builtin/gc.c:107
+#: builtin/gc.c:100
#, c-format
msgid "insanely long object directory %.*s"
msgstr "tokigt lång objektkatalog %.*s"
-#: builtin/gc.c:276
+#: builtin/gc.c:269
msgid "prune unreferenced objects"
msgstr "rensa ej refererade objekt"
-#: builtin/gc.c:278
+#: builtin/gc.c:271
msgid "be more thorough (increased runtime)"
msgstr "var mer grundlig (ökar körtiden)"
-#: builtin/gc.c:279
+#: builtin/gc.c:272
msgid "enable auto-gc mode"
msgstr "aktivera auto-gc-läge"
-#: builtin/gc.c:280
+#: builtin/gc.c:273
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:321
+#: builtin/gc.c:315
#, 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:323
+#: builtin/gc.c:317
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
-#: builtin/gc.c:324
+#: builtin/gc.c:318
#, 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:342
+#: builtin/gc.c:336
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
"dem."
#: builtin/grep.c:23
-msgid "git grep [
options] [-e] <pattern> [<rev>...] [[--] <path>...]"
-msgstr "git grep [flaggor] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
+msgid "git grep [
<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
#: builtin/grep.c:218
#, c-format
msgstr "sök i både spårade och ospårade filer"
#: builtin/grep.c:644
-msgid "search also in ignored files"
-msgstr "sök även i ignorerade filer"
+msgid "ignore files specified via '.gitignore'"
+msgstr "ignorera filer angivna i \".gitignore\""
#: builtin/grep.c:647
msgid "show non-matching lines"
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
-#: builtin/grep.c:741 builtin/show-ref.c:187
+#: builtin/grep.c:741 builtin/show-ref.c:189
msgid "show usage"
msgstr "visa användning"
msgid "both --cached and trees are given."
msgstr "både --cached och träd angavs."
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:80
msgid ""
-"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
-"<file>..."
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
msgstr ""
-"git hash-object [-t <typ>] [-w] [--path=<fil>|--no-filters] [--stdin] [--] "
+"git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] "
"<fil>..."
-#: builtin/hash-object.c:83
+#: builtin/hash-object.c:81
msgid "git hash-object --stdin-paths < <list-of-paths>"
msgstr "git hash-object --stdin-paths < <sökvägslista>"
-#: builtin/hash-object.c:94 builtin/tag.c:610
+#: builtin/hash-object.c:92 builtin/tag.c:614
msgid "type"
msgstr "typ"
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:92
msgid "object type"
msgstr "objekttyp"
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:93
msgid "write the object into the object database"
msgstr "skriv objektet till objektdatabasen"
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:95
msgid "read the object from stdin"
msgstr "läs objektet från standard in"
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
msgid "store file as is without filters"
msgstr "spara filen som den är utan filer"
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:98
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:99
msgid "process file as it were from this path"
msgstr "hantera filen som om den kom från sökvägen"
msgstr "visa info-sida"
#: builtin/help.c:52
-msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
-msgstr "git help [--all] [--guides] [--man|--web|--info] [kommando]"
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]"
#: builtin/help.c:64
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "\"git %s\" är ett alias för \"%s\""
-#: builtin/index-pack.c:150
+#: builtin/index-pack.c:152
#, c-format
msgid "unable to open %s"
msgstr "kunde inte öppna %s"
-#: builtin/index-pack.c:200
+#: builtin/index-pack.c:202
#, c-format
msgid "object type mismatch at %s"
msgstr "objekttyp stämmer inte överens vid %s"
-#: builtin/index-pack.c:220
+#: builtin/index-pack.c:222
#, c-format
msgid "did not receive expected object %s"
msgstr "emottog inte det förväntade objektet %s"
-#: builtin/index-pack.c:223
+#: builtin/index-pack.c:225
#, 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:265
+#: builtin/index-pack.c:267
#, 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:275
+#: builtin/index-pack.c:277
msgid "early EOF"
msgstr "tidigt filslut"
-#: builtin/index-pack.c:276
+#: builtin/index-pack.c:278
msgid "read error on input"
msgstr "indataläsfel"
-#: builtin/index-pack.c:288
+#: builtin/index-pack.c:290
msgid "used more bytes than were available"
msgstr "använde fler byte än tillgängligt"
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:297
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:311
+#: builtin/index-pack.c:313
#, c-format
msgid "unable to create '%s'"
msgstr "kunde inte skapa \"%s\""
-#: builtin/index-pack.c:316
+#: builtin/index-pack.c:318
#, c-format
msgid "cannot open packfile '%s'"
msgstr "kan inte öppna paketfilen \"%s\""
-#: builtin/index-pack.c:330
+#: builtin/index-pack.c:332
msgid "pack signature mismatch"
msgstr "paketsignatur stämmer inte överens"
-#: builtin/index-pack.c:332
+#: builtin/index-pack.c:334
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "paketversion %<PRIu32> stöds ej"
-#: builtin/index-pack.c:350
+#: builtin/index-pack.c:352
#, c-format
msgid "pack has bad object at offset %lu: %s"
msgstr "paketet har felaktigt objekt vid index %lu: %s"
-#: builtin/index-pack.c:471
+#: builtin/index-pack.c:473
#, c-format
msgid "inflate returned %d"
msgstr "inflate returnerade %d"
-#: builtin/index-pack.c:520
+#: builtin/index-pack.c:522
msgid "offset value overflow for delta base object"
msgstr "indexvärdespill för deltabasobjekt"
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:530
msgid "delta base offset is out of bound"
msgstr "deltabasindex utanför gränsen"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:538
#, c-format
msgid "unknown object type %d"
msgstr "okänd objekttyp %d"
-#: builtin/index-pack.c:567
+#: builtin/index-pack.c:569
msgid "cannot pread pack file"
msgstr "kan inte utföra \"pread\" på paketfil"
-#: builtin/index-pack.c:569
+#: builtin/index-pack.c:571
#, c-format
msgid "premature end of pack file, %lu byte missing"
msgid_plural "premature end of pack file, %lu bytes missing"
msgstr[0] "för tidigt slut på paketfilen, %lu byte saknas"
msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas"
-#: builtin/index-pack.c:595
+#: builtin/index-pack.c:597
msgid "serious inflate inconsistency"
msgstr "allvarlig inflate-inkonsekvens"
-#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715
-#: builtin/index-pack.c:749 builtin/index-pack.c:758
+#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772
+#: builtin/index-pack.c:806 builtin/index-pack.c:815
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
-#: builtin/index-pack.c:689 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:256
+#: builtin/index-pack.c:746 builtin/pack-objects.c:162
+#: builtin/pack-objects.c:254
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
-#: builtin/index-pack.c:755
+#: builtin/index-pack.c:812
#, c-format
msgid "cannot read existing object %s"
msgstr "kan inte läsa befintligt objekt %s"
-#: builtin/index-pack.c:769
+#: builtin/index-pack.c:826
#, c-format
msgid "invalid blob object %s"
msgstr "ogiltigt blob-objekt %s"
-#: builtin/index-pack.c:783
+#: builtin/index-pack.c:840
#, c-format
msgid "invalid %s"
msgstr "ogiltigt %s"
-#: builtin/index-pack.c:787
+#: builtin/index-pack.c:843
msgid "Error in object"
msgstr "Fel i objekt"
-#: builtin/index-pack.c:789
+#: builtin/index-pack.c:845
#, 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:861 builtin/index-pack.c:890
+#: builtin/index-pack.c:917 builtin/index-pack.c:948
msgid "failed to apply delta"
msgstr "misslyckades tillämpa delta"
-#: builtin/index-pack.c:1055
+#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "Tar emot objekt"
-#: builtin/index-pack.c:1055
+#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "Skapar index för objekt"
-#: builtin/index-pack.c:1081
+#: builtin/index-pack.c:1150
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paketet är trasigt (SHA1 stämmer inte)"
-#: builtin/index-pack.c:1086
+#: builtin/index-pack.c:1155
msgid "cannot fstat packfile"
msgstr "kan inte utföra \"fstat\" på paketfil"
-#: builtin/index-pack.c:1089
+#: builtin/index-pack.c:1158
msgid "pack has junk at the end"
msgstr "paket har skräp i slutet"
-#: builtin/index-pack.c:1100
+#: builtin/index-pack.c:1169
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "förvirrad bortom vanvett i parse_pack_objects()"
-#: builtin/index-pack.c:1123
+#: builtin/index-pack.c:1194
msgid "Resolving deltas"
msgstr "Analyserar delta"
-#: builtin/index-pack.c:1133
+#: builtin/index-pack.c:1205
#, c-format
msgid "unable to create thread: %s"
msgstr "kunde inte skapa tråd: %s"
-#: builtin/index-pack.c:1175
+#: builtin/index-pack.c:1247
msgid "confusion beyond insanity"
msgstr "förvirrad bortom vanvett"
-#: builtin/index-pack.c:1181
+#: builtin/index-pack.c:1253
#, c-format
msgid "completed with %d local objects"
msgstr "slutfördes med %d lokala objekt"
-#: builtin/index-pack.c:1191
+#: builtin/index-pack.c:1263
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Oväntad svanschecksumma för %s (trasig disk?)"
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1267
#, 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:1220
+#: builtin/index-pack.c:1291
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
-#: builtin/index-pack.c:1299
+#: builtin/index-pack.c:1367
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:1323
+#: builtin/index-pack.c:1391
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:1336
+#: builtin/index-pack.c:1404
#, c-format
msgid "cannot write keep file '%s'"
msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1344
+#: builtin/index-pack.c:1412
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1357
+#: builtin/index-pack.c:1425
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
-#: builtin/index-pack.c:1368
+#: builtin/index-pack.c:1436
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
-#: builtin/index-pack.c:1401
+#: builtin/index-pack.c:1469
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1475
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
-#: builtin/index-pack.c:1411 builtin/index-pack.c:1590
+#: builtin/index-pack.c:1479 builtin/index-pack.c:1663
#, c-format
msgid "no threads support, ignoring %s"
msgstr "trådstöd saknas, ignorerar %s"
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1537
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
-#: builtin/index-pack.c:1471
+#: builtin/index-pack.c:1539
#, 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:1518
+#: builtin/index-pack.c:1586
#, 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:1525
+#: builtin/index-pack.c:1593
#, 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:1554
+#: builtin/index-pack.c:1623
msgid "Cannot come back to cwd"
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: builtin/index-pack.c:1602 builtin/index-pack.c:1605
-#: builtin/index-pack.c:1617 builtin/index-pack.c:1621
+#: builtin/index-pack.c:1675 builtin/index-pack.c:1678
+#: builtin/index-pack.c:1690 builtin/index-pack.c:1694
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1635
+#: builtin/index-pack.c:1708
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
-#: builtin/index-pack.c:1639 builtin/index-pack.c:1648
+#: builtin/index-pack.c:1712 builtin/index-pack.c:1721
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
-#: builtin/index-pack.c:1656
+#: builtin/index-pack.c:1729
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
-#: builtin/init-db.c:35
+#: builtin/init-db.c:36
#, c-format
msgid "Could not make %s writable by group"
msgstr "Kunde inte göra %s skrivbar för gruppen"
-#: builtin/init-db.c:62
+#: builtin/init-db.c:63
#, c-format
msgid "insanely long template name %s"
msgstr "tokigt långt namn på mallen %s"
-#: builtin/init-db.c:67
+#: builtin/init-db.c:68
#, c-format
msgid "cannot stat '%s'"
msgstr "kan inte ta status på \"%s\""
-#: builtin/init-db.c:73
+#: builtin/init-db.c:74
#, c-format
msgid "cannot stat template '%s'"
msgstr "kan inte ta status på mallen \"%s\""
-#: builtin/init-db.c:80
+#: builtin/init-db.c:81
#, c-format
msgid "cannot opendir '%s'"
msgstr "kan inte öppna katalogen (opendir) \"%s\""
-#: builtin/init-db.c:97
+#: builtin/init-db.c:98
#, c-format
msgid "cannot readlink '%s'"
msgstr "kan inte läsa länk (readlink) \"%s\""
-#: builtin/init-db.c:99
+#: builtin/init-db.c:100
#, c-format
msgid "insanely long symlink %s"
msgstr "tokigt lång symbolisk länk %s"
-#: builtin/init-db.c:102
+#: builtin/init-db.c:103
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\""
-#: builtin/init-db.c:106
+#: builtin/init-db.c:107
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "kan inte kopiera \"%s\" till \"%s\""
-#: builtin/init-db.c:110
+#: builtin/init-db.c:111
#, c-format
msgid "ignoring template %s"
msgstr "ignorerar mallen %s"
-#: builtin/init-db.c:136
+#: builtin/init-db.c:137
#, c-format
msgid "insanely long template path %s"
msgstr "tokigt lång mallsökväg %s"
-#: builtin/init-db.c:144
+#: builtin/init-db.c:145
#, c-format
msgid "templates not found %s"
msgstr "mallarna hittades inte %s"
-#: builtin/init-db.c:157
+#: builtin/init-db.c:158
#, c-format
msgid "not copying templates of a wrong format version %d from '%s'"
msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\""
-#: builtin/init-db.c:197
+#: builtin/init-db.c:212
#, c-format
msgid "insane git directory %s"
msgstr "tokig git-katalog %s"
-#: builtin/init-db.c:331 builtin/init-db.c:334
+#: builtin/init-db.c:344 builtin/init-db.c:347
#, c-format
msgid "%s already exists"
msgstr "%s finns redan"
-#: builtin/init-db.c:363
+#: builtin/init-db.c:375
#, c-format
msgid "unable to handle file type %d"
msgstr "kan inte hantera filtyp %d"
-#: builtin/init-db.c:366
+#: builtin/init-db.c:378
#, c-format
msgid "unable to move %s to %s"
msgstr "kan inte flytta %s till %s"
#. TRANSLATORS: The first '%s' is either "Reinitialized
#. existing" or "Initialized empty", the second " shared" or
#. "", and the last '%s%s' is the verbatim directory name.
-#: builtin/init-db.c:426
+#: builtin/init-db.c:434
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s Git-arkiv i %s%s\n"
-#: builtin/init-db.c:427
+#: builtin/init-db.c:435
msgid "Reinitialized existing"
msgstr "Ominitierade befintligt"
-#: builtin/init-db.c:427
+#: builtin/init-db.c:435
msgid "Initialized empty"
msgstr "Initierade tomt"
-#: builtin/init-db.c:428
+#: builtin/init-db.c:436
msgid " shared"
msgstr " delat"
-#: builtin/init-db.c:475
+#: builtin/init-db.c:483
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [directory]"
+"shared[=<permissions>]] [<directory>]"
msgstr ""
"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
-"shared[=<behörigheter>]] [katalog]"
+"shared[=<behörigheter>]] [<katalog>]"
-#: builtin/init-db.c:498
+#: builtin/init-db.c:506
msgid "permissions"
msgstr "behörigheter"
-#: builtin/init-db.c:499
+#: builtin/init-db.c:507
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:501 builtin/prune-packed.c:57 builtin/repack.c:171
-msgid "be quiet"
-msgstr "var tyst"
-
-#: builtin/init-db.c:533 builtin/init-db.c:538
+#: builtin/init-db.c:541 builtin/init-db.c:546
#, c-format
msgid "cannot mkdir %s"
msgstr "kan inte skapa katalogen (mkdir) %s"
-#: builtin/init-db.c:542
+#: builtin/init-db.c:550
#, c-format
msgid "cannot chdir to %s"
msgstr "kan inte byta katalog (chdir) till %s"
-#: builtin/init-db.c:563
+#: builtin/init-db.c:571
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"
"dir=<katalog>)"
-#: builtin/init-db.c:591
+#: builtin/init-db.c:599
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kan inte komma åt arbetskatalogen \"%s\""
msgid "trailer(s) to add"
msgstr "släprad(er) att lägga till"
-#: builtin/log.c:41
-msgid "git log [<options>] [<revision
range>] [[--] <path>...]"
+#: builtin/log.c:43
+msgid "git log [<options>] [<revision
-range>] [[--] <path>...]"
msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
-#: builtin/log.c:42
-msgid "git show [options] <object>..."
-msgstr "git show [flaggor] <objekt>..."
+#: builtin/log.c:44
+msgid "git show [<options>] <object>..."
+msgstr "git show [<flaggor>] <objekt>..."
-#: builtin/log.c:81
+#: builtin/log.c:83
#, c-format
msgid "invalid --decorate option: %s"
msgstr "ogiltig flagga för --decorate: %s"
-#: builtin/log.c:127
+#: builtin/log.c:131
msgid "suppress diff output"
msgstr "undertryck diff-utdata"
-#: builtin/log.c:128
+#: builtin/log.c:132
msgid "show source"
msgstr "visa källkod"
-#: builtin/log.c:129
+#: builtin/log.c:133
msgid "Use mail map file"
msgstr "Använd e-postmappningsfil"
-#: builtin/log.c:130
+#: builtin/log.c:134
msgid "decorate options"
msgstr "dekoreringsflaggor"
-#: builtin/log.c:133
+#: builtin/log.c:137
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:229
+#: builtin/log.c:233
#, c-format
msgid "Final output: %d %s\n"
msgstr "Slututdata: %d %s\n"
-#: builtin/log.c:458
+#: builtin/log.c:465
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: felaktig fil"
-#: builtin/log.c:472 builtin/log.c:564
+#: builtin/log.c:479 builtin/log.c:572
#, c-format
msgid "Could not read object %s"
msgstr "Kunde inte läsa objektet %s"
-#: builtin/log.c:588
+#: builtin/log.c:596
#, c-format
msgid "Unknown type: %d"
msgstr "Okänd typ: %d"
-#: builtin/log.c:689
+#: builtin/log.c:714
msgid "format.headers without value"
msgstr "format.headers utan värde"
-#: builtin/log.c:773
+#: builtin/log.c:798
msgid "name of output directory is too long"
msgstr "namnet på utdatakatalogen är för långt"
-#: builtin/log.c:789
+#: builtin/log.c:814
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kan inte öppna patchfilen %s"
-#: builtin/log.c:803
+#: builtin/log.c:828
msgid "Need exactly one range."
msgstr "Behöver precis ett intervall."
-#: builtin/log.c:811
+#: builtin/log.c:838
msgid "Not a range."
msgstr "Inte ett intervall."
-#: builtin/log.c:919
+#: builtin/log.c:944
msgid "Cover letter needs email format"
msgstr "Omslagsbrevet behöver e-postformat"
-#: builtin/log.c:998
+#: builtin/log.c:1023
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:1026
-msgid "git format-patch [options] [<since> | <revision range>]"
-msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]"
+#: builtin/log.c:1051
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
-#: builtin/log.c:1071
+#: builtin/log.c:1096
msgid "Two output directories?"
msgstr "Två utdatakataloger?"
-#: builtin/log.c:1186
+#: builtin/log.c:1211
msgid "use [PATCH n/m] even with a single patch"
msgstr "använd [PATCH n/m] även för en ensam patch"
-#: builtin/log.c:1189
+#: builtin/log.c:1214
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
-#: builtin/log.c:1193
+#: builtin/log.c:1218
msgid "print patches to standard out"
msgstr "skriv patcharna på standard ut"
-#: builtin/log.c:1195
+#: builtin/log.c:1220
msgid "generate a cover letter"
msgstr "generera ett följebrev"
-#: builtin/log.c:1197
+#: builtin/log.c:1222
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
-#: builtin/log.c:1198
+#: builtin/log.c:1223
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1199
+#: builtin/log.c:1224
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
-#: builtin/log.c:1201
+#: builtin/log.c:1226
msgid "start numbering patches at <n> instead of 1"
msgstr "börja numrera patchar på <n> istället för 1"
-#: builtin/log.c:1203
+#: builtin/log.c:1228
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
-#: builtin/log.c:1205
+#: builtin/log.c:1230
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Använd [<prefix>] istället för [PATCH]"
-#: builtin/log.c:1208
+#: builtin/log.c:1233
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
-#: builtin/log.c:1211
+#: builtin/log.c:1236
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
-#: builtin/log.c:1214
+#: builtin/log.c:1239
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
-#: builtin/log.c:1216
+#: builtin/log.c:1241
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
-#: builtin/log.c:1218
+#: builtin/log.c:1243
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
-#: builtin/log.c:1220
+#: builtin/log.c:1245
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:1221
+#: builtin/log.c:1246
msgid "header"
msgstr "huvud"
-#: builtin/log.c:1222
+#: builtin/log.c:1247
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:1223 builtin/log.c:1225
+#: builtin/log.c:1248 builtin/log.c:1250
msgid "email"
msgstr "epost"
-#: builtin/log.c:1223
+#: builtin/log.c:1248
msgid "add To: header"
msgstr "Lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:1225
+#: builtin/log.c:1250
msgid "add Cc: header"
msgstr "Lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:1227
+#: builtin/log.c:1252
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1228
+#: builtin/log.c:1253
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:1230
+#: builtin/log.c:1255
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:1231
+#: builtin/log.c:1256
msgid "make first mail a reply to <message-id>"
msgstr "Gör det första brevet ett svar till <meddelande-id>"
-#: builtin/log.c:1232 builtin/log.c:1235
+#: builtin/log.c:1257 builtin/log.c:1260
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:1233
+#: builtin/log.c:1258
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:1236
+#: builtin/log.c:1261
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:1240
+#: builtin/log.c:1265
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:1242
+#: builtin/log.c:1267
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:1243
+#: builtin/log.c:1268
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:1245
+#: builtin/log.c:1270
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
-#: builtin/log.c:1246
+#: builtin/log.c:1271
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:1320
-#, c-format
-msgid "invalid ident line: %s"
-msgstr "ogiltig ident-rad: %s"
-
-#: builtin/log.c:1335
+#: builtin/log.c:1360
msgid "-n and -k are mutually exclusive."
msgstr "-n och -k kan inte användas samtidigt."
-#: builtin/log.c:1337
+#: builtin/log.c:1362
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix och -k kan inte användas samtidigt."
-#: builtin/log.c:1345
+#: builtin/log.c:1370
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1347
+#: builtin/log.c:1372
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1349
+#: builtin/log.c:1374
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1372
+#: builtin/log.c:1397
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken skall det vara?"
-#: builtin/log.c:1374
+#: builtin/log.c:1399
#, c-format
msgid "Could not create directory '%s'"
msgstr "Kunde inte skapa katalogen \"%s\""
-#: builtin/log.c:1472
+#: builtin/log.c:1496
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
-#: builtin/log.c:1535
+#: builtin/log.c:1559
msgid "Failed to create output files"
msgstr "Misslyckades skapa utdatafiler"
-#: builtin/log.c:1583
+#: builtin/log.c:1607
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:1638
+#: builtin/log.c:1661
#, 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/log.c:1651 builtin/log.c:1653 builtin/log.c:1665
+#: builtin/log.c:1672 builtin/log.c:1674 builtin/log.c:1686
#, c-format
msgid "Unknown commit %s"
msgstr "Okänd incheckning %s"
-#: builtin/ls-files.c:401
-msgid "git ls-files [options] [<file>...]"
-msgstr "git ls-files [flaggor] [<fil>...]"
+#: builtin/ls-files.c:358
+msgid "git ls-files [<options>] [<file>...]"
+msgstr "git ls-files [<flaggor>] [<fil>...]"
-#: builtin/ls-files.c:458
+#: builtin/ls-files.c:415
msgid "identify the file status with tags"
msgstr "identifiera filstatus med taggar"
-#: builtin/ls-files.c:460
+#: builtin/ls-files.c:417
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:462
+#: builtin/ls-files.c:419
msgid "show cached files in the output (default)"
msgstr "visa cachade filer i utdata (standard)"
-#: builtin/ls-files.c:464
+#: builtin/ls-files.c:421
msgid "show deleted files in the output"
msgstr "visa borttagna filer i utdata"
-#: builtin/ls-files.c:466
+#: builtin/ls-files.c:423
msgid "show modified files in the output"
msgstr "visa modifierade filer i utdata"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:425
msgid "show other files in the output"
msgstr "visa andra filer i utdata"
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:427
msgid "show ignored files in the output"
msgstr "visa ignorerade filer i utdata"
-#: builtin/ls-files.c:473
+#: builtin/ls-files.c:430
msgid "show staged contents' object name in the output"
msgstr "visa köat innehålls objektnamn i utdata"
-#: builtin/ls-files.c:475
+#: builtin/ls-files.c:432
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:477
+#: builtin/ls-files.c:434
msgid "show 'other' directories' names only"
msgstr "visa endast namn för \"andra\" kataloger"
-#: builtin/ls-files.c:480
+#: builtin/ls-files.c:437
msgid "don't show empty directories"
msgstr "visa inte tomma kataloger"
-#: builtin/ls-files.c:483
+#: builtin/ls-files.c:440
msgid "show unmerged files in the output"
msgstr "visa ej sammanslagna filer i utdata"
-#: builtin/ls-files.c:485
+#: builtin/ls-files.c:442
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
-#: builtin/ls-files.c:487
+#: builtin/ls-files.c:444
msgid "skip files matching pattern"
msgstr "hoppa över filer som motsvarar mönster"
-#: builtin/ls-files.c:490
+#: builtin/ls-files.c:447
msgid "exclude patterns are read from <file>"
msgstr "exkludera mönster som läses från <fil>"
-#: builtin/ls-files.c:493
+#: builtin/ls-files.c:450
msgid "read additional per-directory exclude patterns in <file>"
msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
-#: builtin/ls-files.c:495
+#: builtin/ls-files.c:452
msgid "add the standard git exclusions"
msgstr "lägg till git:s standardexkluderingar"
-#: builtin/ls-files.c:498
+#: builtin/ls-files.c:455
msgid "make the output relative to the project top directory"
msgstr "gör utdata relativ till projektets toppkatalog"
-#: builtin/ls-files.c:501
+#: builtin/ls-files.c:458
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:502
+#: builtin/ls-files.c:459
msgid "tree-ish"
msgstr "träd-igt"
-#: builtin/ls-files.c:503
+#: builtin/ls-files.c:460
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:505
+#: builtin/ls-files.c:462
msgid "show debugging data"
msgstr "visa felsökningsutdata"
msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"
#: builtin/merge.c:45
-msgid "git merge [options] [<commit>...]"
-msgstr "git merge [flaggor] [<incheckning>...]"
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<flaggor>] [<incheckning>...]"
#: builtin/merge.c:46
-msgid "git merge [options] <msg> HEAD <commit>"
-msgstr "git merge [flaggor] <meddelande> HEAD <incheckning>"
+msgid "git merge [<options>] <msg> HEAD <commit>"
+msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>"
#: builtin/merge.c:47
msgid "git merge --abort"
msgid "Available custom strategies are:"
msgstr "Tillgängliga skräddarsydda strategier är:"
-#: builtin/merge.c:193
+#: builtin/merge.c:193 builtin/pull.c:119
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:196
+#: builtin/merge.c:196 builtin/pull.c:122
msgid "show a diffstat at the end of the merge"
msgstr "visa en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:197
+#: builtin/merge.c:197 builtin/pull.c:125
msgid "(synonym to --stat)"
msgstr "(synonym till --stat)"
-#: builtin/merge.c:199
+#: builtin/merge.c:199 builtin/pull.c:128
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:202
+#: builtin/merge.c:202 builtin/pull.c:131
msgid "create a single commit instead of doing a merge"
msgstr "skapa en ensam incheckning istället för en sammanslagning"
-#: builtin/merge.c:204
+#: builtin/merge.c:204 builtin/pull.c:134
msgid "perform a commit if the merge succeeds (default)"
msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
-#: builtin/merge.c:206
+#: builtin/merge.c:206 builtin/pull.c:137
msgid "edit message before committing"
msgstr "redigera meddelande innan incheckning"
msgid "allow fast-forward (default)"
msgstr "tillåt snabbspolning (standard)"
-#: builtin/merge.c:209
+#: builtin/merge.c:209 builtin/pull.c:143
msgid "abort if fast-forward is not possible"
msgstr "avbryt om snabbspolning inte är möjlig"
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:214 builtin/notes.c:753 builtin/revert.c:89
+#: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148
+#: builtin/revert.c:89
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:215
+#: builtin/merge.c:215 builtin/pull.c:149
msgid "merge strategy to use"
msgstr "sammanslagningsstrategi att använda"
-#: builtin/merge.c:216
+#: builtin/merge.c:216 builtin/pull.c:152
msgid "option=value"
msgstr "alternativ=värde"
-#: builtin/merge.c:217
+#: builtin/merge.c:217 builtin/pull.c:153
msgid "option for selected merge strategy"
msgstr "alternativ för vald sammanslagningsstrategi"
msgid "Squash commit -- not updating HEAD\n"
msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
+#: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
+#: builtin/merge.c:988
+#, c-format
+msgid "Could not write to '%s'"
+msgstr "Kunde inte skriva till \"%s\""
+
#: builtin/merge.c:372
msgid "Writing SQUASH_MSG"
msgstr "Skriver SQUASH_MSG"
msgid "'%s' does not point to a commit"
msgstr "\"%s\" verkar inte peka på en incheckning"
-#: builtin/merge.c:559
+#: builtin/merge.c:537
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
-#: builtin/merge.c:654
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree misslyckades skriva ett träd"
-
-#: builtin/merge.c:678
+#: builtin/merge.c:656
msgid "Not handling anything other than two heads merge."
msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
-#: builtin/merge.c:692
+#: builtin/merge.c:670
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Felaktig flagga för merge-recursive: -X%s"
-#: builtin/merge.c:705
+#: builtin/merge.c:683
#, c-format
msgid "unable to write %s"
msgstr "kunde inte skriva %s"
-#: builtin/merge.c:794
+#: builtin/merge.c:772
#, c-format
msgid "Could not read from '%s'"
msgstr "Kunde inte läsa från \"%s\""
-#: builtin/merge.c:803
+#: builtin/merge.c:781
#, 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:809
+#: builtin/merge.c:787
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
"avbryter incheckningen.\n"
-#: builtin/merge.c:833
+#: builtin/merge.c:811
msgid "Empty commit message."
msgstr "Tomt incheckningsmeddelande."
-#: builtin/merge.c:845
+#: builtin/merge.c:823
#, c-format
msgid "Wonderful.\n"
msgstr "Underbart.\n"
-#: builtin/merge.c:900
+#: builtin/merge.c:878
#, 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:916
+#: builtin/merge.c:894
#, c-format
msgid "'%s' is not a commit"
msgstr "\"%s\" är inte en incheckning"
-#: builtin/merge.c:957
+#: builtin/merge.c:935
msgid "No current branch."
msgstr "Inte på någon gren."
-#: builtin/merge.c:959
+#: builtin/merge.c:937
msgid "No remote for the current branch."
msgstr "Ingen fjärr för aktuell gren."
-#: builtin/merge.c:961
+#: builtin/merge.c:939
msgid "No default upstream defined for the current branch."
msgstr "Ingen standarduppström angiven för aktuell gren."
-#: builtin/merge.c:966
+#: builtin/merge.c:944
#, 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:1122
+#: builtin/merge.c:1081
+#, c-format
+msgid "could not close '%s'"
+msgstr "kunde inte stänga \"%s\""
+
+#: builtin/merge.c:1208
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
-#: builtin/merge.c:1138
+#: builtin/merge.c:1224
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1141 git-pull.sh:34
-msgid "You have not concluded your merge (MERGE_HEAD exists)."
-msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
-
-#: builtin/merge.c:1145
+#: builtin/merge.c:1231
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1148
+#: builtin/merge.c:1234
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:1157
+#: builtin/merge.c:1243
msgid "You cannot combine --squash with --no-ff."
msgstr "Du kan inte kombinera --squash med --no-ff."
-#: builtin/merge.c:1166
+#: builtin/merge.c:1251
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
-#: builtin/merge.c:1198
-msgid "Can merge only exactly one commit into empty head"
-msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."
-
-#: builtin/merge.c:1201
+#: builtin/merge.c:1268
msgid "Squash commit into empty head not supported yet"
msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
-#: builtin/merge.c:1203
+#: builtin/merge.c:1270
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:1208
+#: builtin/merge.c:1276
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - inte något vi kan slå ihop"
-#: builtin/merge.c:1259
+#: builtin/merge.c:1278
+msgid "Can merge only exactly one commit into empty head"
+msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."
+
+#: builtin/merge.c:1333
#, 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:1262
+#: builtin/merge.c:1336
#, 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:1265
+#: builtin/merge.c:1339
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Incheckning %s har inte någon GPG-signatur."
-#: builtin/merge.c:1268
+#: builtin/merge.c:1342
#, 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:1349
+#: builtin/merge.c:1423
#, c-format
msgid "Updating %s..%s\n"
msgstr "Uppdaterar %s..%s\n"
-#: builtin/merge.c:1388
+#: builtin/merge.c:1462
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
-#: builtin/merge.c:1395
+#: builtin/merge.c:1469
#, c-format
msgid "Nope.\n"
msgstr "Nej.\n"
-#: builtin/merge.c:1427
+#: builtin/merge.c:1501
msgid "Not possible to fast-forward, aborting."
msgstr "Kan inte snabbspola, avbryter."
-#: builtin/merge.c:1450 builtin/merge.c:1529
+#: builtin/merge.c:1524 builtin/merge.c:1603
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Återspolar trädet till orört...\n"
-#: builtin/merge.c:1454
+#: builtin/merge.c:1528
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Försöker sammanslagningsstrategin %s...\n"
-#: builtin/merge.c:1520
+#: builtin/merge.c:1594
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
-#: builtin/merge.c:1522
+#: builtin/merge.c:1596
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Sammanslagning med strategin %s misslyckades.\n"
-#: builtin/merge.c:1531
+#: builtin/merge.c:1605
#, 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:1543
+#: builtin/merge.c:1617
#, 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
-msgid "git merge-base [-a|--all] <commit> <commit>..."
-msgstr "git merge-base [-a|--all] <incheckning> <incheckning>..."
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <incheckning> <incheckning>..."
#: builtin/merge-base.c:30
-msgid "git merge-base [-a|--all] --octopus <commit>..."
-msgstr "git merge-base [-a|--all] --octopus <incheckning>..."
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <incheckning>..."
#: builtin/merge-base.c:31
msgid "git merge-base --independent <commit>..."
#: builtin/merge-file.c:8
msgid ""
-"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
-"file2"
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
msgstr ""
-"git merge-file [alternativ] [-L namn1 [-L orig [-L namn2]]] fil1 origfil fil2"
+"git merge-file [<alternativ>] [-L <namn1> [-L <orig> [-L <namn2>]]] <fil1> "
+"<origfil> <fil2>"
#: builtin/merge-file.c:33
msgid "send results to standard output"
msgstr "varna inte om konflikter"
#: builtin/merge-file.c:45
-msgid "set labels for file1/orig_file/file2"
+msgid "set labels for file1/orig-file/file2"
msgstr "sätt etiketter för fil1/origfil/fil2"
#: builtin/mktree.c:64
msgstr "tillåt skapa mer än ett träd"
#: builtin/mv.c:15
-msgid "git mv [options] <source>... <destination>"
-msgstr "git mv [flaggor] <källa>... <mål>"
+msgid "git mv [<options>] <source>... <destination>"
+msgstr "git mv [<flaggor>] <källa>... <mål>"
#: builtin/mv.c:69
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
-#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355
+#: builtin/mv.c:256 builtin/remote.c:722 builtin/repack.c:362
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
#: builtin/name-rev.c:255
-msgid "git name-rev [options] <commit>..."
-msgstr "git name-rev [flaggor] <incheckning>..."
+msgid "git name-rev [<options>] <commit>..."
+msgstr "git name-rev [<flaggor>] <incheckning>..."
#: builtin/name-rev.c:256
-msgid "git name-rev [options] --all"
-msgstr "git name-rev [flaggor] --all"
+msgid "git name-rev [<options>] --all"
+msgstr "git name-rev [<flaggor>] --all"
#: builtin/name-rev.c:257
-msgid "git name-rev [options] --stdin"
-msgstr "git name-rev [flaggor] --stdin"
+msgid "git name-rev [<options>] --stdin"
+msgstr "git name-rev [<flaggor>] --stdin"
#: builtin/name-rev.c:309
msgid "print only names (no SHA-1)"
msgid "dereference tags in the input (internal use)"
msgstr "avreferera taggar i indata (används internt)"
-#: builtin/notes.c:24
-msgid "git notes [--ref <notes_ref>] [list [<object>]]"
+#: builtin/notes.c:25
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]"
-#: builtin/notes.c:25
+#: builtin/notes.c:26
msgid ""
-"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
"| (-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <anteckningsref>] add [-f] [--allow-empty] [-m <medd> | -F "
"<fil> | (-c | -C) <objekt>] [<objekt>]"
-#: builtin/notes.c:26
-msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
+#: builtin/notes.c:27
+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:27
+#: builtin/notes.c:28
msgid ""
-"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
"(-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <anteckningsref>] append [--allow-empty] [-m <medd> | -F "
"<fil> | (-c | -C) <objekt>] [<objekt>]"
-#: builtin/notes.c:28
-msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]"
+#: builtin/notes.c:29
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr "git notes [--ref <anteckningsref>] edit [--allow-empty] [<objekt>]"
-#: builtin/notes.c:29
-msgid "git notes [--ref <notes_ref>] show [<object>]"
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr "git notes [--ref <anteckningsref>] show [<objekt>]"
-#: builtin/notes.c:30
+#: builtin/notes.c:31
msgid ""
-"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr ""
-"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi> ] "
+"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi>] "
"<anteckningsref>"
-#: builtin/notes.c:31
+#: builtin/notes.c:32
msgid "git notes merge --commit [-v | -q]"
msgstr "git notes merge --commit [-v | -q]"
-#: builtin/notes.c:32
+#: builtin/notes.c:33
msgid "git notes merge --abort [-v | -q]"
msgstr "git notes merge --abort [-v | -q]"
-#: builtin/notes.c:33
-msgid "git notes [--ref <notes_ref>] remove [<object>...]"
+#: builtin/notes.c:34
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]"
-#: builtin/notes.c:34
-msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
+#: builtin/notes.c:35
+msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
msgstr "git notes [--ref <anteckningsref>] prune [-n | -v]"
-#: builtin/notes.c:35
-msgid "git notes [--ref <notes_ref>] get-ref"
+#: builtin/notes.c:36
+msgid "git notes [--ref <notes-ref>] get-ref"
msgstr "git notes [--ref <anteckningsref>] get-ref"
-#: builtin/notes.c:40
+#: builtin/notes.c:41
msgid "git notes [list [<object>]]"
msgstr "git notes [list [<objekt>]]"
-#: builtin/notes.c:45
+#: builtin/notes.c:46
msgid "git notes add [<options>] [<object>]"
msgstr "git notes add [<flaggor>] [<objekt>]"
-#: builtin/notes.c:50
+#: builtin/notes.c:51
msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr "git notes copy [<flaggor>] <från-objekt> <till-objekt>"
-#: builtin/notes.c:51
+#: builtin/notes.c:52
msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr "git notes copy --stdin [<från-objekt> <till-objekt>]..."
-#: builtin/notes.c:56
+#: builtin/notes.c:57
msgid "git notes append [<options>] [<object>]"
msgstr "git notes append [<flaggor>] [<objekt>]"
-#: builtin/notes.c:61
+#: builtin/notes.c:62
msgid "git notes edit [<object>]"
msgstr "git notes edit [<objekt>]"
-#: builtin/notes.c:66
+#: builtin/notes.c:67
msgid "git notes show [<object>]"
msgstr "git notes show [<objekt>]"
-#: builtin/notes.c:71
-msgid "git notes merge [<options>] <notes_ref>"
+#: builtin/notes.c:72
+msgid "git notes merge [<options>] <notes-ref>"
msgstr "git notes merge [<flaggor>] <anteckningsref>"
-#: builtin/notes.c:72
+#: builtin/notes.c:73
msgid "git notes merge --commit [<options>]"
msgstr "git notes merge --commit [<flaggor>]"
-#: builtin/notes.c:73
+#: builtin/notes.c:74
msgid "git notes merge --abort [<options>]"
msgstr "git notes merge --abort [<flaggor>]"
-#: builtin/notes.c:78
+#: builtin/notes.c:79
msgid "git notes remove [<object>]"
msgstr "git notes remove [<objekt>]"
-#: builtin/notes.c:83
+#: builtin/notes.c:84
msgid "git notes prune [<options>]"
msgstr "git notes prune [<flaggor>]"
-#: builtin/notes.c:88
+#: builtin/notes.c:89
msgid "git notes get-ref"
msgstr "git notes get-ref"
-#: builtin/notes.c:146
+#: builtin/notes.c:147
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "kunde inte starta \"show\" för objektet \"%s\""
-#: builtin/notes.c:150
+#: builtin/notes.c:151
msgid "could not read 'show' output"
msgstr "kunde inte läsa utdata från \"show\""
-#: builtin/notes.c:158
+#: builtin/notes.c:159
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "kunde inte avsluta \"show\" för objektet \"%s\""
-#: builtin/notes.c:173 builtin/tag.c:477
+#: builtin/notes.c:174 builtin/tag.c:477
#, c-format
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
-#: builtin/notes.c:192
+#: builtin/notes.c:193
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:201
+#: builtin/notes.c:202
msgid "unable to write note object"
msgstr "kunde inte skriva anteckningsobjekt"
-#: builtin/notes.c:203
+#: builtin/notes.c:204
#, c-format
msgid "The note contents have been left in %s"
msgstr "Anteckningens innehåll har lämnats kvar i %s"
-#: builtin/notes.c:231 builtin/tag.c:693
+#: builtin/notes.c:232 builtin/tag.c:695
#, c-format
msgid "cannot read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: builtin/notes.c:233 builtin/tag.c:696
+#: builtin/notes.c:234 builtin/tag.c:698
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%s\""
-#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
-#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
-#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
-#: builtin/notes.c:854 builtin/tag.c:709
+#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306
+#: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507
+#: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653
+#: builtin/notes.c:877 builtin/tag.c:711
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
-#: builtin/notes.c:255
+#: builtin/notes.c:256
#, c-format
msgid "Failed to read object '%s'."
msgstr "Kunde inte läsa objektet \"%s\"."
-#: builtin/notes.c:259
+#: builtin/notes.c:260
#, 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:299
-#, c-format
-msgid "Malformed input line: '%s'."
-msgstr "Felaktig indatarad: \"%s\"."
-
-#: builtin/notes.c:314
-#, c-format
-msgid "Failed to copy notes from '%s' to '%s'"
-msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
-
-#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
-#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
-#: builtin/notes.c:919
+#: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490
+#: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646
+#: builtin/notes.c:942
msgid "too many parameters"
msgstr "för många parametrar"
-#: builtin/notes.c:371 builtin/notes.c:658
+#: builtin/notes.c:372 builtin/notes.c:659
#, c-format
msgid "No note found for object %s."
msgstr "Inga anteckningar hittades för objektet %s."
-#: builtin/notes.c:392 builtin/notes.c:555
+#: builtin/notes.c:393 builtin/notes.c:556
msgid "note contents as a string"
msgstr "anteckningsinnehåll som sträng"
-#: builtin/notes.c:395 builtin/notes.c:558
+#: builtin/notes.c:396 builtin/notes.c:559
msgid "note contents in a file"
msgstr "anteckningsinnehåll i en fil"
-#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
-#: builtin/notes.c:563 builtin/tag.c:628
+#: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561
+#: builtin/notes.c:564 builtin/tag.c:630
msgid "object"
msgstr "objekt"
-#: builtin/notes.c:398 builtin/notes.c:561
+#: builtin/notes.c:399 builtin/notes.c:562
msgid "reuse and edit specified note object"
msgstr "återanvänd och redigera angivet anteckningsobjekt"
-#: builtin/notes.c:401 builtin/notes.c:564
+#: builtin/notes.c:402 builtin/notes.c:565
msgid "reuse specified note object"
msgstr "återanvänd angivet anteckningsobjekt"
-#: builtin/notes.c:404 builtin/notes.c:567
+#: builtin/notes.c:405 builtin/notes.c:568
msgid "allow storing empty note"
msgstr "tillåt lagra tom anteckning"
-#: builtin/notes.c:405 builtin/notes.c:476
+#: builtin/notes.c:406 builtin/notes.c:477
msgid "replace existing notes"
msgstr "ersätt befintliga anteckningar"
-#: builtin/notes.c:430
+#: builtin/notes.c:431
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"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:445 builtin/notes.c:524
+#: builtin/notes.c:446 builtin/notes.c:525
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Skriver över befintliga anteckningar för objektet %s\n"
-#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
+#: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882
#, c-format
msgid "Removing note for object %s\n"
msgstr "Tar bort anteckning för objektet %s\n"
-#: builtin/notes.c:477
+#: builtin/notes.c:478
msgid "read objects from stdin"
msgstr "läs objekt från standard in"
-#: builtin/notes.c:479
+#: builtin/notes.c:480
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"
-#: builtin/notes.c:497
+#: builtin/notes.c:498
msgid "too few parameters"
msgstr "för få parametrar"
-#: builtin/notes.c:518
+#: builtin/notes.c:519
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "
"%s. Använd \"-f\" för att skriva över befintliga anteckningar"
-#: builtin/notes.c:530
+#: builtin/notes.c:531
#, c-format
msgid "Missing notes on source object %s. Cannot copy."
msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera."
-#: builtin/notes.c:582
+#: builtin/notes.c:583
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"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:750
+#: builtin/notes.c:764
msgid "General options"
msgstr "Allmänna flaggor"
-#: builtin/notes.c:752
+#: builtin/notes.c:766
msgid "Merge options"
msgstr "Flaggor för sammanslagning"
-#: builtin/notes.c:754
+#: builtin/notes.c:768
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
"läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:756
+#: builtin/notes.c:770
msgid "Committing unmerged notes"
msgstr "Checkar in ej sammanslagna anteckningar"
-#: builtin/notes.c:758
+#: builtin/notes.c:772
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:760
+#: builtin/notes.c:774
msgid "Aborting notes merge resolution"
msgstr "Avbryt lösning av sammanslagning av anteckningar"
-#: builtin/notes.c:762
+#: builtin/notes.c:776
msgid "abort notes merge"
msgstr "avbryt sammanslagning av anteckningar"
-#: builtin/notes.c:857
+#: builtin/notes.c:853
+#, 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:880
#, c-format
msgid "Object %s has no note\n"
msgstr "Objektet %s har ingen anteckning\n"
-#: builtin/notes.c:869
+#: builtin/notes.c:892
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:872
+#: builtin/notes.c:895
msgid "read object names from the standard input"
msgstr "läs objektnamn från standard in"
-#: builtin/notes.c:953
+#: builtin/notes.c:976
msgid "notes-ref"
msgstr "anteckningar-ref"
-#: builtin/notes.c:954
-msgid "use notes from <notes_ref>"
+#: builtin/notes.c:977
+msgid "use notes from <notes-ref>"
msgstr "använd anteckningar från <anteckningsref>"
-#: builtin/notes.c:989 builtin/remote.c:1621
+#: builtin/notes.c:1012 builtin/remote.c:1588
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Okänt underkommando: %s"
#: builtin/pack-objects.c:28
-msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
-msgstr "git pack-objects --stdout [flaggor...] [< reflista | < objektlista]"
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]"
#: builtin/pack-objects.c:29
-msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
-msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]"
+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:175 builtin/pack-objects.c:178
#, c-format
msgid "deflate error (%d)"
msgstr "fel i deflate (%d)"
-#: builtin/pack-objects.c:773
+#: builtin/pack-objects.c:771
msgid "Writing objects"
msgstr "Skriver objekt"
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1011
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:2175
+#: builtin/pack-objects.c:2171
msgid "Compressing objects"
msgstr "Komprimerar objekt"
-#: builtin/pack-objects.c:2572
+#: builtin/pack-objects.c:2568
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:2576
+#: builtin/pack-objects.c:2572
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:2599
-#, c-format
-msgid "option %s does not accept negative form"
-msgstr "flaggan %s godtar inte negativ form"
-
-#: builtin/pack-objects.c:2603
-#, c-format
-msgid "unable to parse value '%s' for option %s"
-msgstr "kunde inte tolka värdet \"%s\" för flaggan %s"
-
-#: builtin/pack-objects.c:2623
+#: builtin/pack-objects.c:2602
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/pack-objects.c:2625
+#: builtin/pack-objects.c:2604
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/pack-objects.c:2627
+#: builtin/pack-objects.c:2606
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
-#: builtin/pack-objects.c:2630
+#: builtin/pack-objects.c:2609
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsmätaren visas"
-#: builtin/pack-objects.c:2631
+#: builtin/pack-objects.c:2610
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2632
+#: builtin/pack-objects.c:2611
msgid "write the pack index file in the specified idx format version"
msgstr "skriv paketindexfilen i angiven indexformatversion"
-#: builtin/pack-objects.c:2635
+#: builtin/pack-objects.c:2614
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:2637
+#: builtin/pack-objects.c:2616
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorera lånade objekt från alternativa objektlager"
-#: builtin/pack-objects.c:2639
+#: builtin/pack-objects.c:2618
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:2641
+#: builtin/pack-objects.c:2620
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:2643
+#: builtin/pack-objects.c:2622
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:2645
+#: builtin/pack-objects.c:2624
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:2647
+#: builtin/pack-objects.c:2626
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:2649
+#: builtin/pack-objects.c:2628
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:2651
+#: builtin/pack-objects.c:2630
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:2653
+#: builtin/pack-objects.c:2632
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:2655
+#: builtin/pack-objects.c:2634
msgid "do not create an empty pack output"
msgstr "försök inte skapa tom paketutdata"
-#: builtin/pack-objects.c:2657
+#: builtin/pack-objects.c:2636
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2638
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:2662
+#: builtin/pack-objects.c:2641
msgid "include objects reachable from any reference"
msgstr "inkludera objekt som kan nås från någon referens"
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2644
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:2668
+#: builtin/pack-objects.c:2647
msgid "include objects referred to by the index"
msgstr "inkludera objekt som refereras från indexet"
-#: builtin/pack-objects.c:2671
+#: builtin/pack-objects.c:2650
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2652
msgid "include tag objects that refer to objects to be packed"
msgstr "inkludera taggobjekt som refererar objekt som skall packas"
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2654
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:2676 parse-options.h:140
+#: builtin/pack-objects.c:2655 parse-options.h:142
msgid "time"
msgstr "tid"
-#: builtin/pack-objects.c:2677
+#: builtin/pack-objects.c:2656
msgid "unpack unreachable objects newer than <time>"
msgstr "packa upp onåbara objekt nyare än <tid>"
-#: builtin/pack-objects.c:2680
+#: builtin/pack-objects.c:2659
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:2682
+#: builtin/pack-objects.c:2661
msgid "create packs suitable for shallow fetches"
msgstr "skapa packfiler lämpade för grunda hämtningar"
-#: builtin/pack-objects.c:2684
+#: builtin/pack-objects.c:2663
msgid "ignore packs that have companion .keep file"
msgstr "ignorera paket som har tillhörande .keep-fil"
-#: builtin/pack-objects.c:2686
+#: builtin/pack-objects.c:2665
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:2688
+#: builtin/pack-objects.c:2667
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
-#: builtin/pack-objects.c:2690
+#: builtin/pack-objects.c:2669
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:2692
+#: builtin/pack-objects.c:2671
msgid "write a bitmap index together with the pack index"
msgstr "använd bitkartindex tillsammans med packindexet"
-#: builtin/pack-objects.c:2783
+#: builtin/pack-objects.c:2762
msgid "Counting objects"
msgstr "Räknar objekt"
#: builtin/pack-refs.c:6
-msgid "git pack-refs [options]"
-msgstr "git pack-refs [flaggor]"
+msgid "git pack-refs [<options>]"
+msgstr "git pack-refs [<flaggor>]"
#: builtin/pack-refs.c:14
msgid "pack everything"
msgstr "ta bort lösa referenser (standard)"
#: builtin/prune-packed.c:7
-msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
-msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
#: builtin/prune-packed.c:40
msgid "Removing duplicate objects"
msgstr "Tar bort duplicerade objekt"
-#: builtin/prune.c:12
+#: builtin/prune.c:11
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]"
-#: builtin/prune.c:106
+#: builtin/prune.c:105 builtin/worktree.c:121
msgid "do not remove, show only"
msgstr "ta inte bort, bara visa"
-#: builtin/prune.c:107
+#: builtin/prune.c:106 builtin/worktree.c:122
msgid "report pruned objects"
msgstr "rapportera borttagna objekt"
-#: builtin/prune.c:110
+#: builtin/prune.c:109 builtin/worktree.c:124
msgid "expire objects older than <time>"
msgstr "låt tid gå ut för objekt äldre än <tid>"
-#: builtin/push.c:14
+#: builtin/pull.c:69
+msgid "git pull [options] [<repository> [<refspec>...]]"
+msgstr "git pull [flaggor] [<arkiv> [<refspec>...]]"
+
+#: builtin/pull.c:113
+msgid "Options related to merging"
+msgstr "Alternativ gällande sammanslagning"
+
+#: builtin/pull.c:115
+msgid "false|true|preserve"
+msgstr "false|true|preserve"
+
+#: builtin/pull.c:116
+msgid "incorporate changes by rebasing rather than merging"
+msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
+
+#: builtin/pull.c:140 builtin/revert.c:105
+msgid "allow fast-forward"
+msgstr "tillåt snabbspolning"
+
+#: builtin/pull.c:146
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
+
+#: builtin/pull.c:160
+msgid "Options related to fetching"
+msgstr "Alternativ gällande hämtningar"
+
+#: builtin/pull.c:268
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr "Felaktigt värde för pull.ff: %s"
+
+#: builtin/pull.c:352
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr "Kan inte hämta med ombasering: Du har oköade ändringar."
+
+#: builtin/pull.c:358
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Dessutom innehåller dit index ändringar som inte har checkats in."
+
+#: builtin/pull.c:360
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+"Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar."
+
+#: builtin/pull.c:436
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+"Det finns ingen kandidat för ombasering bland referenserna du precis har "
+"hämtat."
+
+#: builtin/pull.c:438
+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:439
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+"Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
+"motsvarade något i fjärränden."
+
+#: builtin/pull.c:442
+#, c-format
+msgid ""
+"You asked to pull from the remote '%s', but did not specify\n"
+"a branch. Because this is not the default configured remote\n"
+"for your current branch, you must specify a branch on the command line."
+msgstr ""
+"Du bad om att hämta från fjärren \"%s\", men angav inte någon\n"
+"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:447
+msgid "You are not currently on a branch."
+msgstr "Du är inte på någon gren för närvarande."
+
+#: builtin/pull.c:449 builtin/pull.c:464
+msgid "Please specify which branch you want to rebase against."
+msgstr "Ange vilken gren du vill ombasera mot."
+
+#: builtin/pull.c:451 builtin/pull.c:466
+msgid "Please specify which branch you want to merge with."
+msgstr "Ange vilken gren du vill slå samman med."
+
+#: builtin/pull.c:452 builtin/pull.c:467
+msgid "See git-pull(1) for details."
+msgstr "Se git-pull(1) för detaljer."
+
+#: builtin/pull.c:462
+msgid "There is no tracking information for the current branch."
+msgstr "Det finns ingen spårningsinformation för aktuell gren."
+
+#: builtin/pull.c:471
+#, c-format
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+" git branch --set-upstream-to=%s/<branch> %s\n"
+msgstr ""
+"Om du vill ange spårningsinformation för grenen kan du göra det med:\n"
+"\n"
+" git branch --set-upstream-to=%s/<gren> %s\n"
+
+#: builtin/pull.c:476
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+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:830
+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:859
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"fetch uppdaterade huvudet för aktuell gren.\n"
+"snabbspolar din arbetskatalog från\n"
+"incheckningen %s."
+
+#: builtin/pull.c:864
+#, c-format
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr ""
+"Kan inte snabbspola din arbetskatalog.\n"
+"När du är säker på att du har sparat allt värdefullt i utdata från\n"
+"$ git diff %s\n"
+"kör du\n"
+"$ git reset --hard\n"
+"för att återgå."
+
+#: builtin/pull.c:879
+msgid "Cannot merge multiple branches into empty head."
+msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
+
+#: builtin/pull.c:883
+msgid "Cannot rebase onto multiple branches."
+msgstr "Kan inte ombasera ovanpå flera grenar."
+
+#: builtin/push.c:15
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/push.c:85
+#: builtin/push.c:86
msgid "tag shorthand without <tag>"
msgstr "taggförkortning utan <tagg>"
-#: builtin/push.c:95
+#: builtin/push.c:96
msgid "--delete only accepts plain target ref names"
msgstr "--delete godtar endast enkla målreferensnamn"
-#: builtin/push.c:139
+#: builtin/push.c:140
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
"För att välja ett av alternativen permanent, se push.default i \"git help "
"config\"."
-#: builtin/push.c:142
+#: builtin/push.c:143
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
" git push %s %s\n"
"%s"
-#: builtin/push.c:157
+#: builtin/push.c:158
#, c-format
msgid ""
"You are not currently on a branch.\n"
"\n"
" git push %s HEAD:<namn-på-fjärrgren>\n"
-#: builtin/push.c:171
+#: builtin/push.c:172
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:179
+#: builtin/push.c:180
#, 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:182
+#: builtin/push.c:183
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
"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:205
+#: builtin/push.c:206
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
"liknande läget \"current\" istället för \"simple\" om du ibland använder\n"
"äldre versioner av Git.)"
-#: builtin/push.c:272
+#: builtin/push.c:273
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:279
+#: builtin/push.c:280
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
"\"git pull ....\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
-#: builtin/push.c:285
+#: builtin/push.c:286
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"
"\"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
-#: builtin/push.c:291
+#: builtin/push.c:292
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"
"(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:298
+#: builtin/push.c:299
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:301
+#: builtin/push.c:302
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"
"pekar på något som inte är en incheckning, utan att använda flaggan\n"
"\"--force\".\n"
-#: builtin/push.c:360
+#: builtin/push.c:361
#, c-format
msgid "Pushing to %s\n"
msgstr "Sänder till %s\n"
-#: builtin/push.c:364
+#: builtin/push.c:365
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "misslyckades sända vissa referenser till \"%s\""
-#: builtin/push.c:394
+#: builtin/push.c:395
#, c-format
msgid "bad repository '%s'"
msgstr "felaktigt arkiv \"%s\""
-#: builtin/push.c:395
+#: builtin/push.c:396
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
"\n"
" git push <namn>\n"
-#: builtin/push.c:410
+#: builtin/push.c:411
msgid "--all and --tags are incompatible"
msgstr "--all och --tags är inkompatibla"
-#: builtin/push.c:411
+#: builtin/push.c:412
msgid "--all can't be combined with refspecs"
msgstr "--all kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:416
+#: builtin/push.c:417
msgid "--mirror and --tags are incompatible"
msgstr "--mirror och --tags är inkompatibla"
-#: builtin/push.c:417
+#: builtin/push.c:418
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:422
+#: builtin/push.c:423
msgid "--all and --mirror are incompatible"
msgstr "--all och --mirror är inkompatibla"
-#: builtin/push.c:493
+#: builtin/push.c:539
msgid "repository"
msgstr "arkiv"
-#: builtin/push.c:494
+#: builtin/push.c:540 builtin/send-pack.c:161
msgid "push all refs"
msgstr "sänd alla referenser"
-#: builtin/push.c:495
+#: builtin/push.c:541 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "spegla alla referenser"
-#: builtin/push.c:497
+#: builtin/push.c:543
msgid "delete refs"
msgstr "ta bort referenser"
-#: builtin/push.c:498
+#: builtin/push.c:544
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:501
+#: builtin/push.c:547 builtin/send-pack.c:164
msgid "force updates"
msgstr "tvinga uppdateringar"
-#: builtin/push.c:503
+#: builtin/push.c:549 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "refnamn>:<förvänta"
-#: builtin/push.c:504
+#: builtin/push.c:550 builtin/send-pack.c:176
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:507
+#: builtin/push.c:553
msgid "control recursive pushing of submodules"
msgstr "styr rekursiv insändning av undermoduler"
-#: builtin/push.c:509
+#: builtin/push.c:555 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "använd tunna paket"
-#: builtin/push.c:510 builtin/push.c:511
+#: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158
+#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "program för att ta emot paket"
-#: builtin/push.c:512
+#: builtin/push.c:558
msgid "set upstream for git pull/status"
msgstr "ställ in uppström för git pull/status"
-#: builtin/push.c:515
+#: builtin/push.c:561
msgid "prune locally removed refs"
msgstr "ta bort lokalt borttagna referenser"
-#: builtin/push.c:517
+#: builtin/push.c:563
msgid "bypass pre-push hook"
msgstr "förbigå pre-push-krok"
-#: builtin/push.c:518
+#: builtin/push.c:564
msgid "push missing but relevant tags"
msgstr "sänd in saknade men relevanta taggar"
-#: builtin/push.c:520
+#: builtin/push.c:567 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "GPG-signera insändningen"
-#: builtin/push.c:529
+#: builtin/push.c:569 builtin/send-pack.c:170
+msgid "request atomic transaction on remote side"
+msgstr "begär atomiska transaktioner på fjärrsidan"
+
+#: builtin/push.c:579
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete är inkompatibel med --all, --mirror och --tags"
-#: builtin/push.c:531
+#: builtin/push.c:581
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kan inte användas utan referenser"
#: builtin/read-tree.c:37
msgid ""
-"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
-"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])"
msgid "debug unpack-trees"
msgstr "felsök unpack-trees"
-#: builtin/reflog.c:499
+#: builtin/reflog.c:432
#, c-format
-msgid "%s' for '%s' is not a valid timestamp"
+msgid "'%s' for '%s' is not a valid timestamp"
msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
-#: builtin/reflog.c:615 builtin/reflog.c:620
+#: builtin/reflog.c:549 builtin/reflog.c:554
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "\"%s\" är inte en giltig tidsstämpel"
#: builtin/remote.c:13
msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
msgstr ""
-"git remote add [-t <gren>] [-m <master>] [-f] [--tags|--no-tags] [--"
+"git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <namn> <url>"
#: builtin/remote.c:14 builtin/remote.c:33
msgid "git remote remove <name>"
msgstr "git remote remove <namn>"
-#: builtin/remote.c:16
-msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
+#: builtin/remote.c:16 builtin/remote.c:43
+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
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<flaggor>] <namn> <url>"
-#: builtin/remote.c:43
-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:48
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <namn> <gren>..."
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:187 builtin/remote.c:643
+#: builtin/remote.c:187 builtin/remote.c:637
#, c-format
msgid "remote %s already exists."
msgstr "fjärrarkivet %s finns redan."
-#: builtin/remote.c:191 builtin/remote.c:647
+#: builtin/remote.c:191 builtin/remote.c:641
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
msgid "(delete)"
msgstr "(ta bort)"
-#: builtin/remote.c:592 builtin/remote.c:598 builtin/remote.c:604
+#: builtin/remote.c:588 builtin/remote.c:594 builtin/remote.c:600
#, c-format
msgid "Could not append '%s' to '%s'"
msgstr "Kunde inte tillämpa \"%s\" på \"%s\""
-#: builtin/remote.c:636 builtin/remote.c:795 builtin/remote.c:895
+#: builtin/remote.c:630 builtin/remote.c:769 builtin/remote.c:869
#, c-format
msgid "No such remote: %s"
msgstr "Inget sådant fjärrarkiv: %s"
-#: builtin/remote.c:653
+#: builtin/remote.c:647
#, 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:847
+#: builtin/remote.c:653 builtin/remote.c:821
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
-#: builtin/remote.c:674
+#: builtin/remote.c:668
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tUppdatera konfigurationen manuellt om nödvändigt."
-#: builtin/remote.c:680
+#: builtin/remote.c:674
#, c-format
msgid "Could not append '%s'"
msgstr "Kunde inte lägga till på \"%s\""
-#: builtin/remote.c:691
+#: builtin/remote.c:685
#, c-format
msgid "Could not set '%s'"
msgstr "Kunde inte sätta \"%s\""
-#: builtin/remote.c:713
+#: builtin/remote.c:707
#, c-format
msgid "deleting '%s' failed"
msgstr "misslyckades ta bort \"%s\""
-#: builtin/remote.c:747
+#: builtin/remote.c:741
#, c-format
msgid "creating '%s' failed"
msgstr "misslyckades skapa \"%s\""
-#: builtin/remote.c:766
-#, c-format
-msgid "Could not remove branch %s"
-msgstr "Kunde inte ta bort grenen %s"
-
-#: builtin/remote.c:833
+#: builtin/remote.c:807
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
"Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"
"för att ta bort dem, använd:"
-#: builtin/remote.c:948
+#: builtin/remote.c:922
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " ny (nästa hämtning sparar i remotes/%s)"
-#: builtin/remote.c:951
+#: builtin/remote.c:925
msgid " tracked"
msgstr " spårad"
-#: builtin/remote.c:953
+#: builtin/remote.c:927
msgid " stale (use 'git remote prune' to remove)"
msgstr " förlegad (använd \"git remote prune\" för att ta bort)"
-#: builtin/remote.c:955
+#: builtin/remote.c:929
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:996
+#: builtin/remote.c:970
#, 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:1003
+#: builtin/remote.c:977
#, c-format
msgid "rebases onto remote %s"
msgstr "ombaseras på fjärren %s"
-#: builtin/remote.c:1006
+#: builtin/remote.c:980
#, c-format
msgid " merges with remote %s"
msgstr " sammanslås med fjärren %s"
-#: builtin/remote.c:1007
+#: builtin/remote.c:981
msgid " and with remote"
msgstr " och med fjärren"
-#: builtin/remote.c:1009
+#: builtin/remote.c:983
#, c-format
msgid "merges with remote %s"
msgstr "sammanslås med fjärren %s"
-#: builtin/remote.c:1010
+#: builtin/remote.c:984
msgid " and with remote"
msgstr " och med fjärren"
-#: builtin/remote.c:1056
+#: builtin/remote.c:1030
msgid "create"
msgstr "skapa"
-#: builtin/remote.c:1059
+#: builtin/remote.c:1033
msgid "delete"
msgstr "ta bort"
-#: builtin/remote.c:1063
+#: builtin/remote.c:1037
msgid "up to date"
msgstr "àjour"
-#: builtin/remote.c:1066
+#: builtin/remote.c:1040
msgid "fast-forwardable"
msgstr "kan snabbspolas"
-#: builtin/remote.c:1069
+#: builtin/remote.c:1043
msgid "local out of date"
msgstr "lokal föråldrad"
-#: builtin/remote.c:1076
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s tvingar till %-*s (%s)"
-#: builtin/remote.c:1079
+#: builtin/remote.c:1053
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s sänder till %-*s (%s)"
-#: builtin/remote.c:1083
+#: builtin/remote.c:1057
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s tvingar till %s"
-#: builtin/remote.c:1086
+#: builtin/remote.c:1060
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s sänder till %s"
-#: builtin/remote.c:1154
+#: builtin/remote.c:1128
msgid "do not query remotes"
msgstr "fråga inte fjärrar"
-#: builtin/remote.c:1181
+#: builtin/remote.c:1155
#, c-format
msgid "* remote %s"
msgstr "* fjärr %s"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1156
#, c-format
msgid " Fetch URL: %s"
msgstr " Hämt-URL: %s"
-#: builtin/remote.c:1183 builtin/remote.c:1334
+#: builtin/remote.c:1157 builtin/remote.c:1308
msgid "(no URL)"
msgstr "(ingen URL)"
-#: builtin/remote.c:1192 builtin/remote.c:1194
+#: builtin/remote.c:1166 builtin/remote.c:1168
#, c-format
msgid " Push URL: %s"
msgstr " Sänd-URL: %s"
-#: builtin/remote.c:1196 builtin/remote.c:1198 builtin/remote.c:1200
+#: builtin/remote.c:1170 builtin/remote.c:1172 builtin/remote.c:1174
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD-gren: %s"
-#: builtin/remote.c:1202
+#: builtin/remote.c:1176
#, 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:1214
+#: builtin/remote.c:1188
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Fjärrgren:%s"
msgstr[1] " Fjärrgrenar:%s"
-#: builtin/remote.c:1217 builtin/remote.c:1244
+#: builtin/remote.c:1191 builtin/remote.c:1218
msgid " (status not queried)"
msgstr " (status inte förfrågad)"
-#: builtin/remote.c:1226
+#: builtin/remote.c:1200
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:1234
+#: builtin/remote.c:1208
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokala referenser speglas av \"git push\""
-#: builtin/remote.c:1241
+#: builtin/remote.c:1215
#, 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:1262
+#: builtin/remote.c:1236
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
-#: builtin/remote.c:1264
+#: builtin/remote.c:1238
msgid "delete refs/remotes/<name>/HEAD"
msgstr "ta bort refs/remotes/<namn>/HEAD"
-#: builtin/remote.c:1279
+#: builtin/remote.c:1253
msgid "Cannot determine remote HEAD"
msgstr "Kan inte bestämma HEAD på fjärren"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1255
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:1291
+#: builtin/remote.c:1265
#, c-format
msgid "Could not delete %s"
msgstr "Kunde inte ta bort %s"
-#: builtin/remote.c:1299
+#: builtin/remote.c:1273
#, c-format
msgid "Not a valid ref: %s"
msgstr "Inte en giltig referens: %s"
-#: builtin/remote.c:1301
+#: builtin/remote.c:1275
#, c-format
msgid "Could not setup %s"
msgstr "Kunde inte ställa in %s"
-#: builtin/remote.c:1319
+#: builtin/remote.c:1293
#, c-format
msgid " %s will become dangling!"
msgstr " %s kommer bli dinglande!"
-#: builtin/remote.c:1320
+#: builtin/remote.c:1294
#, c-format
msgid " %s has become dangling!"
msgstr " %s har blivit dinglande!"
-#: builtin/remote.c:1330
+#: builtin/remote.c:1304
#, c-format
msgid "Pruning %s"
msgstr "Rensar %s"
-#: builtin/remote.c:1331
+#: builtin/remote.c:1305
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1354
+#: builtin/remote.c:1321
#, c-format
msgid " * [would prune] %s"
msgstr " * [skulle rensa] %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1324
#, c-format
msgid " * [pruned] %s"
msgstr " * [rensad] %s"
-#: builtin/remote.c:1402
+#: builtin/remote.c:1369
msgid "prune remotes after fetching"
msgstr "rensa fjärrar efter hämtning"
-#: builtin/remote.c:1468 builtin/remote.c:1542
+#: builtin/remote.c:1435 builtin/remote.c:1509
#, c-format
msgid "No such remote '%s'"
msgstr "Ingen sådan fjärr \"%s\""
-#: builtin/remote.c:1488
+#: builtin/remote.c:1455
msgid "add branch"
msgstr "lägg till gren"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1462
msgid "no remote specified"
msgstr "ingen fjärr angavs"
-#: builtin/remote.c:1517
+#: builtin/remote.c:1484
msgid "manipulate push URLs"
msgstr "manipulera URL:ar för sändning"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1486
msgid "add URL"
msgstr "lägg till URL"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1488
msgid "delete URLs"
msgstr "ta bort URL:ar"
-#: builtin/remote.c:1528
+#: builtin/remote.c:1495
msgid "--add --delete doesn't make sense"
msgstr "--add --delete ger ingen mening"
-#: builtin/remote.c:1568
+#: builtin/remote.c:1535
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Felaktig gammalt URL-mönster: %s"
-#: builtin/remote.c:1576
+#: builtin/remote.c:1543
#, c-format
msgid "No such URL found: %s"
msgstr "Ingen sådan URL hittades: %s"
-#: builtin/remote.c:1578
+#: builtin/remote.c:1545
msgid "Will not delete all non-push URLs"
msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
-#: builtin/remote.c:1592
+#: builtin/remote.c:1559
msgid "be verbose; must be placed before a subcommand"
msgstr "var pratsam; måste skrivas före ett underkommando"
#: builtin/repack.c:17
-msgid "git repack [options]"
-msgstr "git repack [flaggor]"
+msgid "git repack [<options>]"
+msgstr "git repack [<flaggor>]"
#: builtin/repack.c:159
msgid "pack everything in a single pack"
msgid "repack objects in packs marked with .keep"
msgstr "packa om objekt i paket märkta med .keep"
-#: builtin/repack.c:371
+#: builtin/repack.c:378
#, c-format
msgid "removing '%s' failed"
msgstr "misslyckades ta bort \"%s\""
msgstr "använd detta format"
#: builtin/rerere.c:12
-msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
-msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
#: builtin/rerere.c:57
msgid "register clean resolutions in index"
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Kunde inte slå upp \"%s\" som en giltig revision."
-#: builtin/reset.c:308 builtin/reset.c:316
-#, c-format
-msgid "Could not parse object '%s'."
-msgstr "Kan inte tolka objektet \"%s\""
-
#: builtin/reset.c:313
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgid "Could not write new index file."
msgstr "Kunde inte skriva ny indexfil."
+#: builtin/rev-list.c:354
+msgid "rev-list does not support display of notes"
+msgstr "rev-list stöder inte visning av anteckningar"
+
#: builtin/rev-parse.c:361
-msgid "git rev-parse --parseopt [
options] -- [<args>...]"
-msgstr "git rev-parse --parseopt [
options] -- [<argument>...]"
+msgid "git rev-parse --parseopt [
<options>] -- [<args>...]"
+msgstr "git rev-parse --parseopt [
<options>] -- [<argument>...]"
#: builtin/rev-parse.c:366
msgid "keep the `--` passed as an arg"
msgid "output in stuck long form"
msgstr "utdata fast i lång form"
-#: builtin/rev-parse.c:499
+#: builtin/rev-parse.c:502
msgid ""
-"git rev-parse --parseopt [
options] -- [<args>...]\n"
+"git rev-parse --parseopt [
<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
-" or: git rev-parse [
options] [<arg>...]\n"
+" or: git rev-parse [
<options>] [<arg>...]\n"
"\n"
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
-"git rev-parse --parseopt [
flaggor] -- [<argument>...]\n"
+"git rev-parse --parseopt [
<flaggor>] -- [<argument>...]\n"
" eller: git rev-parse --sq-quote [<argument>...]\n"
-" eller: git rev-parse [
flaggor] [<argument>...]\n"
+" eller: git rev-parse [
<flaggor>] [<argument>...]\n"
"\n"
"Kör \"git rev-parse --parseopt -h\" för mer information om den första "
"varianten."
#: builtin/revert.c:22
-msgid "git revert [options] <commit-ish>..."
-msgstr "git revert [flaggor] <incheckning-igt>..."
+msgid "git revert [<options>] <commit-ish>..."
+msgstr "git revert [<flaggor>] <incheckning-igt>..."
#: builtin/revert.c:23
msgid "git revert <subcommand>"
msgstr "git revert <underkommando>"
#: builtin/revert.c:28
-msgid "git cherry-pick [options] <commit-ish>..."
-msgstr "git cherry-pick [flaggor] <incheckning-igt>..."
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr "git cherry-pick [<flaggor>] <incheckning-igt>..."
#: builtin/revert.c:29
msgid "git cherry-pick <subcommand>"
msgid "append commit name"
msgstr "lägg till incheckningsnamn"
-#: builtin/revert.c:105
-msgid "allow fast-forward"
-msgstr "tillåt snabbspolning"
-
#: builtin/revert.c:106
msgid "preserve initially empty commits"
msgstr "behåll incheckningar som börjar som tomma"
msgstr "\"cherry-pick\" misslyckades"
#: builtin/rm.c:17
-msgid "git rm [options] [--] <file>..."
-msgstr "git rm [flaggor] [--] <fil>..."
+msgid "git rm [<options>] [--] <file>..."
+msgstr "git rm [<flaggor>] [--] <fil>..."
#: builtin/rm.c:65
msgid ""
"\n"
"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
-#: builtin/rm.c:231
+#: builtin/rm.c:230
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
msgstr[1] ""
"följande filer har köat innehåll som skiljer sig både från filen och HEAD:"
-#: builtin/rm.c:236
+#: builtin/rm.c:235
msgid ""
"\n"
"(use -f to force removal)"
"\n"
"(använd -f för att tvinga borttagning)"
-#: builtin/rm.c:240
+#: builtin/rm.c:239
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:244 builtin/rm.c:255
+#: builtin/rm.c:243 builtin/rm.c:254
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
"\n"
"(använd --cached för att behålla filen eller -f för att tvinga borttagning)"
-#: builtin/rm.c:252
+#: builtin/rm.c:251
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:270
+#: builtin/rm.c:269
msgid "do not list removed files"
msgstr "lista inte borttagna filer"
-#: builtin/rm.c:271
+#: builtin/rm.c:270
msgid "only remove from the index"
msgstr "ta bara bort från indexet"
-#: builtin/rm.c:272
+#: builtin/rm.c:271
msgid "override the up-to-date check"
msgstr "överstyr àjour-testet"
-#: builtin/rm.c:273
+#: builtin/rm.c:272
msgid "allow recursive removal"
msgstr "tillåt rekursiv borttagning"
-#: builtin/rm.c:275
+#: builtin/rm.c:274
msgid "exit with a zero status even if nothing matched"
msgstr "avsluta med nollstatus även om inget träffades"
-#: builtin/rm.c:318
+#: builtin/rm.c:317
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/rm.c:336
+#: builtin/rm.c:335
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "tar inte bort \"%s\" rekursivt utan -r"
-#: builtin/rm.c:375
+#: builtin/rm.c:374
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: kan inte ta bort %s"
+#: builtin/send-pack.c:18
+msgid ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
+" --all and explicit <ref> specification are mutually exclusive."
+msgstr ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<värd>:]<katalog> "
+"[<ref>...]\n"
+" --all och explicit angiven <ref> är ömsesidigt uteslutande."
+
+#: builtin/send-pack.c:160
+msgid "remote name"
+msgstr "fjärrnamn"
+
+#: builtin/send-pack.c:171
+msgid "use stateless RPC protocol"
+msgstr "använd tillståndslöst RPC-protokoll"
+
+#: builtin/send-pack.c:172
+msgid "read refs from stdin"
+msgstr "läs referenser från standard in"
+
+#: builtin/send-pack.c:173
+msgid "print status from remote helper"
+msgstr "visa status från fjärrhjälpare"
+
#: builtin/shortlog.c:13
-msgid "git shortlog [<options>] [<revision
range>] [[--] [<path>...]]"
+msgid "git shortlog [<options>] [<revision
-range>] [[--] [<path>...]]"
msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
#: builtin/shortlog.c:131
#: builtin/show-branch.c:9
msgid ""
-"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
-"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<när>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
#: builtin/show-branch.c:13
-msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
-msgstr "git show-branch (-g|--reflog)[=<n>[,<bas>]] [--list] [<ref>]"
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:659
msgid "show remote-tracking and local branches"
msgstr "visa fjärrspårande och lokala grenar"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:661
msgid "show remote-tracking branches"
msgstr "visa fjärrspårande grenar"
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:663
msgid "color '*!+-' corresponding to the branch"
msgstr "färga \"*!+-\" enligt grenen"
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:665
msgid "show <n> more commits after the common ancestor"
msgstr "visa <n> ytterligare incheckningar efter gemensam anfader"
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:667
msgid "synonym to more=-1"
msgstr "synonym till more=-1"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:668
msgid "suppress naming strings"
msgstr "undertyck namnsträngar"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:670
msgid "include the current branch"
msgstr "inkludera aktuell gren"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:672
msgid "name commits with their object names"
msgstr "namnge incheckningar med deras objektnamn"
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:674
msgid "show possible merge bases"
msgstr "visa möjliga sammanslagningsbaser"
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:676
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:671
+#: builtin/show-branch.c:678
msgid "show commits in topological order"
msgstr "visa incheckningar i topologisk ordning"
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:681
msgid "show only commits not on the first branch"
msgstr "visa endast incheckningar inte på den första grenen"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:683
msgid "show merges reachable from only one tip"
msgstr "visa sammanslagningar som endast kan nås från en spets"
-#: builtin/show-branch.c:678
+#: builtin/show-branch.c:685
msgid "topologically sort, maintaining date order where possible"
msgstr "sortera topologiskt, behåll datumordning när möjligt"
-#: builtin/show-branch.c:681
+#: builtin/show-branch.c:688
msgid "<n>[,<base>]"
msgstr "<n>[,<bas>]"
-#: builtin/show-branch.c:682
+#: builtin/show-branch.c:689
msgid "show <n> most recent ref-log entries starting at base"
msgstr "visa <n> nyaste refloggposter med början på bas"
#: builtin/show-ref.c:10
msgid ""
-"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr ""
-"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] "
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mönster>...]"
#: builtin/show-ref.c:11
msgid "git show-ref --exclude-existing[=pattern] < ref-list"
msgstr "git show-ref --exclude-existing[=mönster] < reflista"
-#: builtin/show-ref.c:168
+#: builtin/show-ref.c:170
msgid "only show tags (can be combined with heads)"
msgstr "visa endast taggar (kan kombineras med huvuden)"
-#: builtin/show-ref.c:169
+#: builtin/show-ref.c:171
msgid "only show heads (can be combined with tags)"
msgstr "visa endast huvuden (kan kombineras med taggar)"
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:172
msgid "stricter reference checking, requires exact ref path"
msgstr "striktare referenskontroll, kräver exakt referenssökväg"
-#: builtin/show-ref.c:173 builtin/show-ref.c:175
+#: builtin/show-ref.c:175 builtin/show-ref.c:177
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "visa HEAD-refrens, även när den skulle filtreras ut"
-#: builtin/show-ref.c:177
+#: builtin/show-ref.c:179
msgid "dereference tags into object IDs"
msgstr "avreferera taggar till objekt-id"
-#: builtin/show-ref.c:179
+#: builtin/show-ref.c:181
msgid "only show SHA1 hash using <n> digits"
msgstr "visa SHA1-hash endast med <n> siffror"
-#: builtin/show-ref.c:183
+#: builtin/show-ref.c:185
msgid "do not print results to stdout (useful with --verify)"
msgstr "visa inte resultat på standard ut (användbart med --verify)"
-#: builtin/show-ref.c:185
+#: builtin/show-ref.c:187
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/symbolic-ref.c:7
-msgid "git symbolic-ref [options] name [ref]"
-msgstr "git symbolic-ref [flaggor] namn [ref]"
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
+msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]"
#: builtin/symbolic-ref.c:8
-msgid "git symbolic-ref -d [-q] name"
-msgstr "git symbolic-ref -d [-q] namn"
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr "git symbolic-ref -d [-q] <namn>"
#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgid "shorten ref output"
msgstr "förkorta ref-utdata"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "skäl"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "skäl till uppdateringen"
#: builtin/tag.c:22
msgid ""
-"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
msgstr ""
-"git tag [-a|-s|-u <nyckel-id>] [-f] [-m <medd>|-F <fil>] <taggnamn> [<huvud>]"
+"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>] <taggnamn> "
+"[<huvud>]"
#: builtin/tag.c:23
msgid "git tag -d <tagname>..."
#: builtin/tag.c:24
msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
+"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
"\t\t[<pattern>...]"
msgstr ""
-"git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>] \n"
+"git tag -l [-n[<antal>]] [--contains <incheckning>] [--points-at <objekt>]\n"
"\t\t[<mönster>...]"
#: builtin/tag.c:26
msgid "malformed object name '%s'"
msgstr "felformat objektnamn \"%s\""
-#: builtin/tag.c:589
+#: builtin/tag.c:590
msgid "list tag names"
msgstr "lista taggnamn"
-#: builtin/tag.c:591
+#: builtin/tag.c:592
msgid "print <n> lines of each tag message"
msgstr "visa <n> rader från varje taggmeddelande"
-#: builtin/tag.c:593
+#: builtin/tag.c:594
msgid "delete tags"
msgstr "ta bort taggar"
-#: builtin/tag.c:594
+#: builtin/tag.c:595
msgid "verify tags"
msgstr "verifiera taggar"
-#: builtin/tag.c:596
+#: builtin/tag.c:597
msgid "Tag creation options"
msgstr "Alternativ för att skapa taggar"
-#: builtin/tag.c:598
+#: builtin/tag.c:599
msgid "annotated tag, needs a message"
msgstr "annoterad tagg, behöver meddelande"
-#: builtin/tag.c:600
+#: builtin/tag.c:601
msgid "tag message"
msgstr "taggmeddelande"
-#: builtin/tag.c:602
+#: builtin/tag.c:603
msgid "annotated and GPG-signed tag"
msgstr "annoterad och GPG-signerad tagg"
-#: builtin/tag.c:606
+#: builtin/tag.c:607
msgid "use another key to sign the tag"
msgstr "använd annan nyckel för att signera taggen"
-#: builtin/tag.c:607
+#: builtin/tag.c:608
msgid "replace the tag if exists"
msgstr "ersätt taggen om den finns"
-#: builtin/tag.c:608
+#: builtin/tag.c:609 builtin/update-ref.c:368
+msgid "create_reflog"
+msgstr "create_reflog"
+
+#: builtin/tag.c:611
+msgid "Tag listing options"
+msgstr "Alternativ för listning av taggar"
+
+#: builtin/tag.c:612
msgid "show tag list in columns"
msgstr "lista taggar i spalter"
-#: builtin/tag.c:610
+#: builtin/tag.c:614
msgid "sort tags"
msgstr "sortera taggar"
-#: builtin/tag.c:614
-msgid "Tag listing options"
-msgstr "Alternativ för listning av taggar"
-
-#: builtin/tag.c:617 builtin/tag.c:623
+#: builtin/tag.c:619 builtin/tag.c:625
msgid "print only tags that contain the commit"
msgstr "visa endast taggar som innehåller incheckningen"
-#: builtin/tag.c:629
+#: builtin/tag.c:631
msgid "print only tags of the object"
msgstr "visa endast taggar för objektet"
-#: builtin/tag.c:655
+#: builtin/tag.c:657
msgid "--column and -n are incompatible"
msgstr "--column och -n är inkompatibla"
-#: builtin/tag.c:667
+#: builtin/tag.c:669
msgid "--sort and -n are incompatible"
msgstr "--sort och -n är inkompatibla"
-#: builtin/tag.c:674
+#: builtin/tag.c:676
msgid "-n option is only allowed with -l."
msgstr "Flaggan -n är endast tillåten tillsammans med -l."
-#: builtin/tag.c:676
+#: builtin/tag.c:678
msgid "--contains option is only allowed with -l."
msgstr "Flaggan --contains är endast tillåten tillsammans med -l"
-#: builtin/tag.c:678
+#: builtin/tag.c:680
msgid "--points-at option is only allowed with -l."
msgstr "Flaggan --points-at är endast tillåten tillsammans med -l."
-#: builtin/tag.c:686
+#: builtin/tag.c:688
msgid "only one -F or -m option is allowed."
msgstr "endast en av flaggorna -F eller -m tillåts."
-#: builtin/tag.c:706
+#: builtin/tag.c:708
msgid "too many params"
msgstr "för många parametrar"
-#: builtin/tag.c:712
+#: builtin/tag.c:714
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "\"%s\" är inte ett giltigt taggnamn."
-#: builtin/tag.c:717
-#, c-format
-msgid "tag '%s' already exists"
-msgstr "taggen \"%s\" finns redan"
+#: builtin/tag.c:719
+#, c-format
+msgid "tag '%s' already exists"
+msgstr "taggen \"%s\" finns redan"
+
+#: builtin/tag.c:744
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
+
+#: builtin/unpack-objects.c:490
+msgid "Unpacking objects"
+msgstr "Packar upp objekt"
+
+#: builtin/update-index.c:70
+#, c-format
+msgid "failed to create directory %s"
+msgstr "misslyckades skapa katalogen %s"
+
+#: builtin/update-index.c:76
+#, c-format
+msgid "failed to stat %s"
+msgstr "misslyckades ta status på %s"
+
+#: builtin/update-index.c:86
+#, c-format
+msgid "failed to create file %s"
+msgstr "misslyckades skapa filen %s"
+
+#: builtin/update-index.c:94
+#, c-format
+msgid "failed to delete file %s"
+msgstr "misslyckades ta bort filen %s"
+
+#: builtin/update-index.c:101 builtin/update-index.c:203
+#, c-format
+msgid "failed to delete directory %s"
+msgstr "misslyckades ta bort katalogen %s"
+
+#: builtin/update-index.c:124
+#, c-format
+msgid "Testing "
+msgstr "Testar"
+
+#: builtin/update-index.c:136
+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:149
+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:162
+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:173
+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/tag.c:741
-#, c-format
-msgid "Updated tag '%s' (was %s)\n"
-msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
+#: builtin/update-index.c:184
+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/unpack-objects.c:489
-msgid "Unpacking objects"
-msgstr "Packar upp objekt"
+#: builtin/update-index.c:197
+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:204
+msgid " OK"
+msgstr " OK"
-#: builtin/update-index.c:403
-msgid "git update-index [options] [--] [<file>...]"
-msgstr "git update-index [flaggor] [--] [<fil>...]"
+#: builtin/update-index.c:564
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr "git update-index [<flaggor>] [--] [<fil>...]"
-#: builtin/update-index.c:756
+#: builtin/update-index.c:918
msgid "continue refresh even when index needs update"
msgstr "fortsätt uppdatera även när index inte är àjour"
-#: builtin/update-index.c:759
+#: builtin/update-index.c:921
msgid "refresh: ignore submodules"
msgstr "refresh: ignorera undermoduler"
-#: builtin/update-index.c:762
+#: builtin/update-index.c:924
msgid "do not ignore new files"
msgstr "ignorera inte nya filer"
-#: builtin/update-index.c:764
+#: builtin/update-index.c:926
msgid "let files replace directories and vice-versa"
msgstr "låt filer ersätta kataloger och omvänt"
-#: builtin/update-index.c:766
+#: builtin/update-index.c:928
msgid "notice files missing from worktree"
msgstr "lägg märke till filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:768
+#: builtin/update-index.c:930
msgid "refresh even if index contains unmerged entries"
msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"
-#: builtin/update-index.c:771
+#: builtin/update-index.c:933
msgid "refresh stat information"
msgstr "uppdatera statusinformation"
-#: builtin/update-index.c:775
+#: builtin/update-index.c:937
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "som --refresh, men ignorera assume-unchanged-inställning"
-#: builtin/update-index.c:779
+#: builtin/update-index.c:941
msgid "<mode>,<object>,<path>"
msgstr "<läge>,<objekt>,<sökväg>"
-#: builtin/update-index.c:780
+#: builtin/update-index.c:942
msgid "add the specified entry to the index"
msgstr "lägg till angiven post i indexet"
-#: builtin/update-index.c:784
+#: builtin/update-index.c:946
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/update-index.c:785
+#: builtin/update-index.c:947
msgid "override the executable bit of the listed files"
msgstr "överstyr exekveringsbiten för angivna filer"
-#: builtin/update-index.c:789
+#: builtin/update-index.c:951
msgid "mark files as \"not changing\""
msgstr "markera filer som \"ändras inte\""
-#: builtin/update-index.c:792
+#: builtin/update-index.c:954
msgid "clear assumed-unchanged bit"
msgstr "rensa \"assume-unchanged\"-biten"
-#: builtin/update-index.c:795
+#: builtin/update-index.c:957
msgid "mark files as \"index-only\""
msgstr "markera filer som \"endast index\""
-#: builtin/update-index.c:798
+#: builtin/update-index.c:960
msgid "clear skip-worktree bit"
msgstr "töm \"skip-worktree\"-biten"
-#: builtin/update-index.c:801
+#: builtin/update-index.c:963
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:803
+#: builtin/update-index.c:965
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:805
+#: builtin/update-index.c:967
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "med --stdin: indatarader termineras med null-byte"
-#: builtin/update-index.c:807
+#: builtin/update-index.c:969
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:811
+#: builtin/update-index.c:973
msgid "add entries from standard input to the index"
msgstr "lägg poster från standard in till indexet"
-#: builtin/update-index.c:815
+#: builtin/update-index.c:977
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:819
+#: builtin/update-index.c:981
msgid "only update entries that differ from HEAD"
msgstr "uppdatera endast poster som skiljer sig från HEAD"
-#: builtin/update-index.c:823
+#: builtin/update-index.c:985
msgid "ignore files missing from worktree"
msgstr "ignorera filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:826
+#: builtin/update-index.c:988
msgid "report actions to standard output"
msgstr "rapportera åtgärder på standard ut"
-#: builtin/update-index.c:828
+#: builtin/update-index.c:990
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(för porslin) glöm sparade olösta konflikter"
-#: builtin/update-index.c:832
+#: builtin/update-index.c:994
msgid "write index in this format"
msgstr "skriv index i detta format"
-#: builtin/update-index.c:834
+#: builtin/update-index.c:996
msgid "enable or disable split index"
msgstr "aktivera eller inaktivera delat index"
+#: builtin/update-index.c:998
+msgid "enable/disable untracked cache"
+msgstr "aktivera/inaktivera ospårad cache"
+
+#: builtin/update-index.c:1000
+msgid "enable untracked cache without testing the filesystem"
+msgstr "aktivera ospårad cache utan att testa filsystemet"
+
#: builtin/update-ref.c:9
-msgid "git update-ref [options] -d <refname> [<oldval>]"
-msgstr "git update-ref [flaggor] -d <refnamn> [<gammaltvärde>]"
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+msgstr "git update-ref [<flaggor>] -d <refnamn> [<gammaltvärde>]"
#: builtin/update-ref.c:10
-msgid "git update-ref [options] <refname> <newval> [<oldval>]"
-msgstr "git update-ref [flaggor] <refnamn> <gammaltvärde> [<nyttvärde>]"
+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
-msgid "git update-ref [options] --stdin [-z]"
-msgstr "git update-ref [flaggor] --stdin [-z]"
+msgid "git update-ref [<options>] --stdin [-z]"
+msgstr "git update-ref [<flaggor>] --stdin [-z]"
-#: builtin/update-ref.c:359
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "ta bort referensen"
-#: builtin/update-ref.c:361
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "uppdatera <refnamn> inte det den pekar på"
-#: builtin/update-ref.c:362
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr "standard in har NUL-terminerade argument"
-#: builtin/update-ref.c:363
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr "läs uppdateringar från standard in"
msgstr "uppdatera informationsfilerna från grunden"
#: builtin/verify-commit.c:17
-msgid "git verify-commit [-v|--verbose] <commit>..."
-msgstr "git verify-commit [-v|--verbose] <incheckning>..."
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr "git verify-commit [-v | --verbose] <incheckning>..."
-#: builtin/verify-commit.c:75
+#: builtin/verify-commit.c:72
msgid "print commit contents"
msgstr "visa innehåll för incheckning"
+#: builtin/verify-commit.c:73 builtin/verify-tag.c:84
+msgid "print raw gpg status output"
+msgstr "visa råa gpg-statusdata"
+
#: builtin/verify-pack.c:54
-msgid "git verify-pack [-v
|--verbose] [-s|--stat-only] <pack>..."
-msgstr "git verify-pack [-v
|--verbose] [-s|--stat-only] <paket>..."
+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
msgid "verbose"
msgstr "visa endast statistik"
#: builtin/verify-tag.c:17
-msgid "git verify-tag [-v|--verbose] <tag>..."
-msgstr "git verify-tag [-v|--verbose] <tagg>..."
+msgid "git verify-tag [-v | --verbose] <tag>..."
+msgstr "git verify-tag [-v | --verbose] <tagg>..."
-#: builtin/verify-tag.c:73
+#: builtin/verify-tag.c:83
msgid "print tag contents"
msgstr "visa innehåll för tag"
+#: builtin/worktree.c:13
+msgid "git worktree add [<options>] <path> <branch>"
+msgstr "git worktree add [<flaggor>] <sökväg> <gren>"
+
+#: builtin/worktree.c:14
+msgid "git worktree prune [<options>]"
+msgstr "git worktree prune [<flaggor>]"
+
+#: builtin/worktree.c:36
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
+msgstr "Tar bort worktrees/%s: inte en giltig katalog"
+
+#: builtin/worktree.c:42
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
+msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
+
+#: builtin/worktree.c:47
+#, 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:58
+#, c-format
+msgid "Removing worktrees/%s: invalid gitdir file"
+msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
+
+#: builtin/worktree.c:74
+#, 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:109
+#, c-format
+msgid "failed to remove: %s"
+msgstr "misslyckades ta bort: %s"
+
+#: builtin/worktree.c:198
+#, c-format
+msgid "'%s' already exists"
+msgstr "\"%s\" finns redan"
+
+#: builtin/worktree.c:232
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr "kunde inte skapa katalogen \"%s\""
+
+#: builtin/worktree.c:268
+#, c-format
+msgid "Preparing %s (identifier %s)"
+msgstr "Förbereder %s (identifieraren %s)"
+
+#: builtin/worktree.c:316
+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:318
+msgid "create a new branch"
+msgstr "skapa en ny gren"
+
+#: builtin/worktree.c:320
+msgid "create or reset a branch"
+msgstr "skapa eller återställ en gren"
+
+#: builtin/worktree.c:321
+msgid "detach HEAD at named commit"
+msgstr "koppla från HEAD vid namngiven incheckning"
+
+#: builtin/worktree.c:328
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr "-b, -B och --detach är ömsesidigt uteslutande"
+
#: builtin/write-tree.c:13
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgid "only useful for debugging"
msgstr "endast användbart vid felsökning"
-#: credential-cache--daemon.c:267
+#: credential-cache--daemon.c:255
msgid "print debugging messages to stderr"
msgstr "skriv felsökningsmeddelanden på standard fel"
"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
"<koncept>\" för att läsa mer om specifika underkommandon och koncept."
-#: common-cmds.h:8
+#: common-cmds.h:9
+msgid "start a working area (see also: git help tutorial)"
+msgstr "starta arbetskatalog (se också: git help tutorial)"
+
+#: common-cmds.h:10
+msgid "work on the current change (see also: git help everyday)"
+msgstr "jobba med aktuell förändring (se också: git help everyday)"
+
+#: common-cmds.h:11
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "utforska historiken och tillståndet (se också: git help revisions)"
+
+#: common-cmds.h:12
+msgid "grow, mark and tweak your common history"
+msgstr "utöka, markera och justera din gemensamma historik"
+
+#: common-cmds.h:13
+msgid "collaborate (see also: git help workflows)"
+msgstr "samarbeta (se också: git help workflows)"
+
+#: common-cmds.h:17
msgid "Add file contents to the index"
msgstr "Lägg filinnehåll till indexet"
-#: common-cmds.h:9
-msgid "Find by binary search the change that introduced a bug"
-msgstr "Binärsök för att hitta ändringen som introducerade ett fel"
+#: common-cmds.h:18
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr "Använd binärsökning för att hitta ändringen som introducerade ett fel"
-#: common-cmds.h:10
+#: common-cmds.h:19
msgid "List, create, or delete branches"
msgstr "Visa, skapa eller ta bort grenar"
-#: common-cmds.h:11
-msgid "Checkout a branch or paths to the working tree"
-msgstr "Checka ut en gren eller filer i arbetskatalogen"
+#: common-cmds.h:20
+msgid "Switch branches or restore working tree files"
+msgstr "Byt till en ny gren eller återställ filer i arbetskatalogen"
-#: common-cmds.h:12
+#: common-cmds.h:21
msgid "Clone a repository into a new directory"
msgstr "Klona ett arkiv till en ny katalog"
-#: common-cmds.h:13
+#: common-cmds.h:22
msgid "Record changes to the repository"
msgstr "Protokollför ändringar i arkivet"
-#: common-cmds.h:14
+#: common-cmds.h:23
msgid "Show changes between commits, commit and working tree, etc"
msgstr "Visa ändringar mellan incheckningar, med arbetskatalogen, osv"
-#: common-cmds.h:15
+#: common-cmds.h:24
msgid "Download objects and refs from another repository"
msgstr "Hämta objekt och referenser från annat arkiv"
-#: common-cmds.h:16
+#: common-cmds.h:25
msgid "Print lines matching a pattern"
msgstr "Visa rader som motsvarar mönster"
-#: common-cmds.h:17
+#: common-cmds.h:26
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt"
-#: common-cmds.h:18
+#: common-cmds.h:27
msgid "Show commit logs"
msgstr "Visa incheckningsloggar"
-#: common-cmds.h:19
+#: common-cmds.h:28
msgid "Join two or more development histories together"
msgstr "Slå ihop två eller flera utvecklingshistorier"
-#: common-cmds.h:20
+#: common-cmds.h:29
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk"
-#: common-cmds.h:21
+#: common-cmds.h:30
msgid "Fetch from and integrate with another repository or a local branch"
msgstr "Hämta från och integrera med annat arkiv eller en lokal gren"
-#: common-cmds.h:22
+#: common-cmds.h:31
msgid "Update remote refs along with associated objects"
msgstr "Uppdatera fjärr-referenser och tillhörande objekt"
-#: common-cmds.h:23
+#: common-cmds.h:32
msgid "Forward-port local commits to the updated upstream head"
msgstr "Framåtanpassa lokala kommandon på uppdaterat uppströmshuvud"
-#: common-cmds.h:24
+#: common-cmds.h:33
msgid "Reset current HEAD to the specified state"
msgstr "Återställ aktuell HEAD till angivet tillstånd"
-#: common-cmds.h:25
+#: common-cmds.h:34
msgid "Remove files from the working tree and from the index"
msgstr "Ta bort filer från arbetskatalogen och från indexet"
-#: common-cmds.h:26
+#: common-cmds.h:35
msgid "Show various types of objects"
msgstr "Visa olika sorters objekt"
-#: common-cmds.h:27
+#: common-cmds.h:36
msgid "Show the working tree status"
msgstr "Visa status för arbetskatalogen"
-#: common-cmds.h:28
+#: common-cmds.h:37
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt"
-#: parse-options.h:143
+#: parse-options.h:145
msgid "expiry-date"
msgstr "giltig-till"
-#: parse-options.h:158
+#: parse-options.h:160
msgid "no-op (backward compatibility)"
msgstr "ingen funktion (bakåtkompatibilitet)"
-#: parse-options.h:232
+#: parse-options.h:236
msgid "be more verbose"
msgstr "var mer pratsam"
-#: parse-options.h:234
+#: parse-options.h:238
msgid "be more quiet"
msgstr "var mer tyst"
-#: parse-options.h:240
+#: parse-options.h:244
msgid "use <n> digits to display SHA-1s"
msgstr "använd <n> siffror för att visa SHA-1:or"
-#: rerere.h:27
+#: rerere.h:28
msgid "update the index with reused conflict resolution if possible"
msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt"
-#: git-am.sh:53
-msgid "You need to set your committer info first"
-msgstr "Du måste ställa in din incheckarinformation först"
-
-#: git-am.sh:98
-msgid ""
-"You seem to have moved HEAD since the last 'am' failure.\n"
-"Not rewinding to ORIG_HEAD"
-msgstr ""
-"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
-"Återställer inte till ORIG_HEAD"
-
-#: git-am.sh:108
-#, sh-format
-msgid ""
-"When you have resolved this problem, run \"$cmdline --continue\".\n"
-"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
-"To restore the original branch and stop patching, run \"$cmdline --abort\"."
-msgstr ""
-"När du har löst problemet kör du \"$cmdline --continue\".\n"
-"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"
-"För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."
-
-#: git-am.sh:124
-msgid "Cannot fall back to three-way merge."
-msgstr "Kan inte falla tillbaka på trevägssammanslagning."
-
-#: git-am.sh:140
-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."
-
-#: git-am.sh:142
-msgid "Using index info to reconstruct a base tree..."
-msgstr "Använder indexinfo för att återskapa ett basträd..."
-
-#: git-am.sh:157
-msgid ""
-"Did you hand edit your patch?\n"
-"It does not apply to blobs recorded in its index."
-msgstr ""
-"Har du handredigerat din patch?\n"
-"Den kan inte tillämpas på blobbar som antecknats i dess index."
-
-#: git-am.sh:166
-msgid "Falling back to patching base and 3-way merge..."
-msgstr ""
-"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-
-#: git-am.sh:182
-msgid "Failed to merge in the changes."
-msgstr "Misslyckades slå ihop ändringarna."
-
-#: git-am.sh:277
-msgid "Only one StGIT patch series can be applied at once"
-msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
-
-#: git-am.sh:364
-#, sh-format
-msgid "Patch format $patch_format is not supported."
-msgstr "Patchformatet $patch_format stöds inte."
-
-#: git-am.sh:366
-msgid "Patch format detection failed."
-msgstr "Misslyckades detektera patchformat."
-
-#: git-am.sh:398
-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."
-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."
-
-#: git-am.sh:496
-#, sh-format
-msgid "previous rebase directory $dotest still exists but mbox given."
-msgstr "tidigare rebase-katalog $dotest finns fortfarande, men mbox angavs."
-
-#: git-am.sh:501
-msgid "Please make up your mind. --skip or --abort?"
-msgstr "Bestäm dig. --skip eller --abort?"
-
-#: git-am.sh:537
-#, sh-format
-msgid ""
-"Stray $dotest directory found.\n"
-"Use \"git am --abort\" to remove it."
-msgstr ""
-"Kvarbliven katalog $dotest hittades.\n"
-"Använd \"git am --abort\" för att ta bort den."
-
-#: git-am.sh:545
-msgid "Resolve operation not in progress, we are not resuming."
-msgstr "Lösningsoperation pågår inte, vi återupptar inte."
-
-#: git-am.sh:612
-#, sh-format
-msgid "Dirty index: cannot apply patches (dirty: $files)"
-msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: $files)"
-
-#: git-am.sh:722
-#, sh-format
-msgid ""
-"Patch is empty. Was it split wrong?\n"
-"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
-"To restore the original branch and stop patching run \"$cmdline --abort\"."
-msgstr ""
-"Patchen är tom. Delades den upp felaktigt?\n"
-"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"
-"För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."
-
-#: git-am.sh:749
-msgid "Patch does not have a valid e-mail address."
-msgstr "Patchen har inte någon giltig e-postadress."
-
-#: git-am.sh:796
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr ""
-"kan inte vara interaktiv om standard in inte är ansluten till en terminal."
-
-#: git-am.sh:800
-msgid "Commit Body is:"
-msgstr "Incheckningskroppen är:"
-
-#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
-#. in your translation. The program will only accept English
-#. input at this point.
-#: git-am.sh:807
-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 "
-
-#: git-am.sh:843
-#, sh-format
-msgid "Applying: $FIRSTLINE"
-msgstr "Tillämpar: $FIRSTLINE"
-
-#: git-am.sh:864
-msgid ""
-"No changes - did you forget to use 'git add'?\n"
-"If there is nothing left to stage, chances are that something else\n"
-"already introduced the same changes; you might want to skip this patch."
-msgstr ""
-"Inga ändringar - glömde du använda \"git add\"?\n"
-"Om det inte är något kvar att köa kan det hända att något annat redan\n"
-"introducerat samma ändringar; kanske du bör hoppa över patchen."
-
-#: git-am.sh:872
-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\"?"
-
-#: git-am.sh:888
-msgid "No changes -- Patch already applied."
-msgstr "Inga ändringar -- Patchen har redan tillämpats."
-
-#: git-am.sh:898
-#, sh-format
-msgid "Patch failed at $msgnum $FIRSTLINE"
-msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE"
-
-#: git-am.sh:901
-#, sh-format
-msgid ""
-"The copy of the patch that failed is found in:\n"
-" $dotest/patch"
-msgstr ""
-"En kopia av patchen som misslyckades finns i:\n"
-" $dotest/patch"
-
-#: git-am.sh:919
-msgid "applying to an empty history"
-msgstr "tillämpar på en tom historik"
-
-#: git-bisect.sh:48
+#: git-bisect.sh:50
msgid "You need to start by \"git bisect start\""
msgstr "Du måste starta med \"git bisect start\""
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:54
+#: git-bisect.sh:56
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]?"
-#: git-bisect.sh:95
+#: git-bisect.sh:99
#, sh-format
msgid "unrecognised option: '$arg'"
msgstr "flaggan känns inte igen: \"$arg\""
-#: git-bisect.sh:99
+#: git-bisect.sh:103
#, sh-format
msgid "'$arg' does not appear to be a valid revision"
msgstr "\"$arg\" verkar inte vara en giltig revision"
-#: git-bisect.sh:117
+#: git-bisect.sh:132
msgid "Bad HEAD - I need a HEAD"
msgstr "Felaktigt HEAD - Jag behöver ett HEAD"
-#: git-bisect.sh:130
+#: git-bisect.sh:145
#, sh-format
msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
+"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
msgstr ""
"Misslyckades checka ut \"$start_head\". Försök \"git bisect reset "
-"<giltiggren>\""
+"<giltig_gren>\""
# cogito-relaterat
-#: git-bisect.sh:140
+#: git-bisect.sh:155
msgid "won't bisect on cg-seek'ed tree"
msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts"
-#: git-bisect.sh:144
+#: git-bisect.sh:159
msgid "Bad HEAD - strange symbolic ref"
msgstr "Felaktigt HEAD - konstig symbolisk referens"
-#: git-bisect.sh:189
+#: git-bisect.sh:211
#, sh-format
msgid "Bad bisect_write argument: $state"
msgstr "Felaktigt argument till bisect_write: $state"
-#: git-bisect.sh:218
+#: git-bisect.sh:240
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Felaktig rev-indata: $arg"
-#: git-bisect.sh:232
+#: git-bisect.sh:255
msgid "Please call 'bisect_state' with at least one argument."
msgstr "Anropa \"bisect_state\" med minst ett argument."
-#: git-bisect.sh:244
+#: git-bisect.sh:267
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Felaktig rev-indata: $rev"
-#: git-bisect.sh:253
-msgid "'git bisect bad' can take only one argument."
-msgstr "\"git bisect bad\" kan bara ta ett argument."
-
#: git-bisect.sh:276
-msgid "Warning: bisecting only with a bad commit."
-msgstr "Varning: utför \"bisect\" med endast en dålig incheckning"
+#, sh-format
+msgid "'git bisect $TERM_BAD' can take only one argument."
+msgstr "\"git bisect $TERM_BAD\" kan bara ta ett argument."
+
+#: git-bisect.sh:299
+#, sh-format
+msgid "Warning: bisecting only with a $TERM_BAD commit."
+msgstr ""
+"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
#. at this point.
-#: git-bisect.sh:282
+#: git-bisect.sh:305
msgid "Are you sure [Y/n]? "
msgstr "Är du säker [Y=ja/N=nej]? "
-#: git-bisect.sh:292
+#: git-bisect.sh:317
+#, sh-format
msgid ""
-"You need to give me at least one good and one bad revision.\n"
-"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
+"You need to give me at least one $bad_syn and one $good_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr ""
-"Du måste ange åtminstone en bra och en dålig version.\n"
-"(Du kan använda \"git bisect bad\" och \"git bisect good\" för detta.)"
+"Du måste ange åtminstone en dålig (\"$bad_syn\") och en bra (\"$good_syn\") "
+"version.\n"
+"(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för "
+"detta.)"
-#: git-bisect.sh:295
+#: git-bisect.sh:320
+#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one good and one bad revision.\n"
-"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
+"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr ""
"Du måste starta med \"git bisect start\".\n"
-"Du måste sedan ange åtminstone en bra och en dålig version.\n"
-"(Du kan använda \"git bisect bad\" och \"git bisect good\" för detta.)"
+"Du måste sedan ange åtminstone en bra (\"$good_syn\") och en dålig "
+"(\"$bad_syn\") version.\n"
+"(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för "
+"detta.)"
-#: git-bisect.sh:366 git-bisect.sh:493
+#: git-bisect.sh:391 git-bisect.sh:521
msgid "We are not bisecting."
msgstr "Vi utför ingen bisect för tillfället."
-#: git-bisect.sh:373
+#: git-bisect.sh:398
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "\"$invalid\" är inte en giltig incheckning"
-#: git-bisect.sh:382
+#: git-bisect.sh:407
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
"Kunde inte checka ut original-HEAD \"$branch\".\n"
"Försök \"git bisect reset <incheckning>\"."
-#: git-bisect.sh:409
+#: git-bisect.sh:435
msgid "No logfile given"
msgstr "Ingen loggfil angiven"
-#: git-bisect.sh:410
+#: git-bisect.sh:436
#, sh-format
msgid "cannot read $file for replaying"
msgstr "kan inte läsa $file för uppspelning"
-#: git-bisect.sh:427
+#: git-bisect.sh:455
msgid "?? what are you talking about?"
msgstr "?? vad menar du?"
-#: git-bisect.sh:439
+#: git-bisect.sh:467
#, sh-format
msgid "running $command"
msgstr "kör $command"
-#: git-bisect.sh:446
+#: git-bisect.sh:474
#, sh-format
msgid ""
"bisect run failed:\n"
"\"bisect\"-körningen misslyckades:\n"
"felkod $res från \"$command\" är < 0 eller >= 128"
-#: git-bisect.sh:472
+#: git-bisect.sh:500
msgid "bisect run cannot continue any more"
msgstr "\"bisect\"-körningen kan inte fortsätta längre"
-#: git-bisect.sh:478
+#: git-bisect.sh:506
#, sh-format
msgid ""
"bisect run failed:\n"
"\"bisect\"-körningen misslyckades:\n"
"\"bisect_state $state\" avslutades med felkoden $res"
-#: git-bisect.sh:485
+#: git-bisect.sh:513
msgid "bisect run success"
msgstr "\"bisect\"-körningen lyckades"
-#: git-pull.sh:21
-msgid ""
-"Pull is not possible because you have unmerged files.\n"
-"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
-"as appropriate to mark resolution and make a commit."
-msgstr ""
-"Du kan inte göra en \"pull\" då du har ändringar som inte checkats in.\n"
-"Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
-"där det är lämpligt för att ange lösning och checka in."
-
-#: git-pull.sh:25
-msgid "Pull is not possible because you have unmerged files."
-msgstr "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in."
-
-#: git-pull.sh:31
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you can merge."
-msgstr ""
-"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
-"Checka in dina ändringar innan du kan slå ihop."
-
-#: git-pull.sh:245
-msgid "updating an unborn branch with changes added to the index"
-msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet"
-
-#: git-pull.sh:269
+#: git-bisect.sh:548
#, sh-format
-msgid ""
-"Warning: fetch updated the current branch head.\n"
-"Warning: fast-forwarding your working tree from\n"
-"Warning: commit $orig_head."
+msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr ""
-"Varning: fetch uppdaterade huvudet för aktuell gren.\n"
-"Varning: snabbspolar din arbetskatalog från\n"
-"Varning: incheckningen $orig_head."
-
-#: git-pull.sh:294
-msgid "Cannot merge multiple branches into empty head"
-msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
-
-#: git-pull.sh:298
-msgid "Cannot rebase onto multiple branches"
-msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar"
+"Ogiltigt kommando: du utför just nu en \"bisect\" med $TERM_BAD/$TERM_GOOD."
#: git-rebase.sh:57
msgid ""
msgid "Cannot record working tree state"
msgstr "Kan inte registrera tillstånd för arbetskatalog"
-#: git-stash.sh:191
+#: git-stash.sh:189
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
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:239
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
"fel: felaktig flagga för \"stash save\": $option\n"
" För att ange ett meddelande, använd git stash save -- \"$option\""
-#: git-stash.sh:259
+#: git-stash.sh:260
msgid "No local changes to save"
msgstr "Inga lokala ändringar att spara"
-#: git-stash.sh:263
+#: git-stash.sh:264
msgid "Cannot initialize stash"
msgstr "Kan inte initiera \"stash\""
-#: git-stash.sh:267
+#: git-stash.sh:268
msgid "Cannot save the current status"
msgstr "Kan inte spara aktuell status"
-#: git-stash.sh:285
+#: git-stash.sh:286
msgid "Cannot remove worktree changes"
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-#: git-stash.sh:384
+#: git-stash.sh:387
+#, sh-format
+msgid "unknown option: $opt"
+msgstr "okänd flagga: $opt"
+
+#: git-stash.sh:397
msgid "No stash found."
msgstr "Ingen \"stash\" hittades."
-#: git-stash.sh:391
+#: git-stash.sh:404
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "För många revisioner angivna: $REV"
-#: git-stash.sh:397
+#: git-stash.sh:410
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference är inte en giltig referens"
-#: git-stash.sh:425
+#: git-stash.sh:438
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
-#: git-stash.sh:436
+#: git-stash.sh:449
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "\"$args\" är inte en \"stash\"-referens"
-#: git-stash.sh:444
+#: git-stash.sh:457
msgid "unable to refresh index"
msgstr "kan inte uppdatera indexet"
-#: git-stash.sh:448
+#: git-stash.sh:461
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:456
+#: git-stash.sh:469
msgid "Conflicts in index. Try without --index."
msgstr "Konflikter i indexet. Testa utan --index."
-#: git-stash.sh:458
+#: git-stash.sh:471
msgid "Could not save index tree"
msgstr "Kunde inte spara indexträd"
-#: git-stash.sh:492
+#: git-stash.sh:505
msgid "Cannot unstage modified files"
msgstr "Kan inte ta bort ändrade filer ur kön"
-#: git-stash.sh:507
+#: git-stash.sh:520
msgid "Index was not unstashed."
msgstr "Indexet har inte tagits ur kön."
-#: git-stash.sh:530
+#: git-stash.sh:543
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Kastade ${REV} ($s)"
-#: git-stash.sh:531
+#: git-stash.sh:544
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Kunde inte kasta \"stash\"-post"
-#: git-stash.sh:539
+#: git-stash.sh:552
msgid "No branch name specified"
msgstr "Inget grennamn angavs"
-#: git-stash.sh:611
+#: git-stash.sh:624
msgid "(To restore them type \"git stash apply\")"
msgstr "(För att återställa dem, skriv \"git stash apply\")"
#: git-submodule.sh:907
#, sh-format
msgid ""
-"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
+"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
msgstr ""
"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$prefix$sm_path\""
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synkroniserar undermodul-url för \"$displaypath\""
+#~ msgid "BUG: reopen a lockfile that is still open"
+#~ msgstr "FEL: återöppna en låsfil som fortfarande är öppen"
+
+#~ msgid "BUG: reopen a lockfile that has been committed"
+#~ msgstr "FEL: återöppna en låsfil som har överlämnats"
+
+#~ msgid "option %s does not accept negative form"
+#~ msgstr "flaggan %s godtar inte negativ form"
+
+#~ msgid "unable to parse value '%s' for option %s"
+#~ msgstr "kunde inte tolka värdet \"%s\" för flaggan %s"
+
+#~ msgid "unable to resolve HEAD"
+#~ msgstr "kan inte bestämma HEAD"
+
+#~ msgid "-b and -B are mutually exclusive"
+#~ msgstr "-b och -B kan inte användas samtidigt"
+
+#~ msgid "You need to set your committer info first"
+#~ msgstr "Du måste ställa in din incheckarinformation först"
+
+#~ msgid ""
+#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
+#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
+#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
+#~ "\"."
+#~ msgstr ""
+#~ "När du har löst problemet kör du \"$cmdline --continue\".\n"
+#~ "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"
+#~ "För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."
+
+#~ msgid "Patch format $patch_format is not supported."
+#~ msgstr "Patchformatet $patch_format stöds inte."
+
+#~ msgid "Please make up your mind. --skip or --abort?"
+#~ msgstr "Bestäm dig. --skip eller --abort?"
+
+#~ msgid ""
+#~ "Patch is empty. Was it split wrong?\n"
+#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
+#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
+#~ msgstr ""
+#~ "Patchen är tom. Delades den upp felaktigt?\n"
+#~ "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"
+#~ "För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."
+
+#~ msgid "Patch does not have a valid e-mail address."
+#~ msgstr "Patchen har inte någon giltig e-postadress."
+
+#~ msgid "Applying: $FIRSTLINE"
+#~ msgstr "Tillämpar: $FIRSTLINE"
+
+#~ msgid "Patch failed at $msgnum $FIRSTLINE"
+#~ msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE"
+
+#~ msgid ""
+#~ "Pull is not possible because you have unmerged files.\n"
+#~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
+#~ "as appropriate to mark resolution and make a commit."
+#~ msgstr ""
+#~ "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in.\n"
+#~ "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
+#~ "där det är lämpligt för att ange lösning och checka in."
+
+#~ msgid "Pull is not possible because you have unmerged files."
+#~ msgstr ""
+#~ "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in."
+
+#~ msgid ""
+#~ "You have not concluded your merge (MERGE_HEAD exists).\n"
+#~ "Please, commit your changes before you can merge."
+#~ msgstr ""
+#~ "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
+#~ "Checka in dina ändringar innan du kan slå ihop."
+
+#~ msgid "no branch specified"
+#~ msgstr "inget grennamn angavs"
+
+#~ msgid "check a branch out in a separate working directory"
+#~ msgstr "checka ut en gren i separat arbetskatalog"
+
+#~ msgid "prune .git/worktrees"
+#~ msgstr "rensa .git/worktrees"
+
+#~ msgid "--worktrees does not take extra arguments"
+#~ msgstr "--worktrees tar inte ytterligare argument"
+
+#~ msgid "The most commonly used git commands are:"
+#~ msgstr "De mest använda git-kommandona är:"
+
+#~ msgid "No such branch: '%s'"
+#~ msgstr "Okänd gren: \"%s\""
+
+#~ msgid "Could not create git link %s"
+#~ msgstr "Kunde inte skapa gitlänk %s"
+
+#~ msgid "Invalid gc.pruneexpire: '%s'"
+#~ msgstr "Ogiltig gc.pruneexpire: '%s'"
+
+#~ msgid "(detached from %s)"
+#~ msgstr "(frånkopplad från %s)"
+
+#~ msgid "No existing author found with '%s'"
+#~ msgstr "Hittade ingen befintlig författare med \"%s\""
+
+#~ msgid "search also in ignored files"
+#~ msgstr "sök även i ignorerade filer"
+
+#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
+#~ msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
+
#~ msgid "no files added"
#~ msgstr "inga filer har lagts till"
#~ msgid "cannot update HEAD ref"
#~ msgstr "kunde inte uppdatera HEAD-referens"
-#~ msgid "Invalid %s: '%s'"
-#~ msgstr "Felaktigt %s: \"%s\""
-
#~ msgid "cannot tell cwd"
#~ msgstr "kan inte läsa aktuell katalog (cwd)"
#~ msgid "cherry-pick"
#~ msgstr "cherry-pick"
-#~ msgid "Please enter the commit message for your changes."
-#~ msgstr "Ange ett incheckningsmeddelande för dina ändringar."
-
#~ msgid "Could not extract email from committer identity."
#~ msgstr "Kunde inte extrahera e-postadress från incheckarens identitet."