d8455d17af · matheusbsbs/matheus-bagliano

@@ -5,10 +5,10 @@

5 #

6 msgid ""

7 msgstr ""

8 -"Project-Id-Version: git 2.5.0\n"

8 +"Project-Id-Version: git 2.6.0\n"

9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

10 -"POT-Creation-Date: 2015-07-14 07:19+0800\n"

11 -"PO-Revision-Date: 2015-07-15 12:51+0100\n"

10 +"POT-Creation-Date: 2015-09-05 09:16+0800\n"

11 +"PO-Revision-Date: 2015-09-09 21:45+0100\n"

12 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"

13 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"

14 "Language: sv\n"

@@ -31,95 +31,107 @@ msgstr ""

31 "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"

32 "som lämpligt för att ange lösning och checka in."

33

34 -#: archive.c:11

34 +#: advice.c:101 builtin/merge.c:1227

35 +msgid "You have not concluded your merge (MERGE_HEAD exists)."

36 +msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."

37 +

38 +#: advice.c:103

39 +msgid "Please, commit your changes before you can merge."

40 +msgstr "Ange ett incheckningsmeddelande för dina ändringar."

41 +

42 +#: advice.c:104

43 +msgid "Exiting because of unfinished merge."

44 +msgstr "Avslutar på grund av ofullbordad sammanslagning."

45 +

46 +#: archive.c:12

47 msgid "git archive [<options>] <tree-ish> [<path>...]"

48 msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]"

49

38 -#: archive.c:12

50 +#: archive.c:13

51 msgid "git archive --list"

52 msgstr "git archive --list"

53

42 -#: archive.c:13

54 +#: archive.c:14

55 msgid ""

56 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"

57 msgstr ""

58 "git archive --remote <arkiv> [--exec <kmd>] [<flaggor>] <träd-igt> "

59 "[<sökväg>...]"

60

49 -#: archive.c:14

61 +#: archive.c:15

62 msgid "git archive --remote <repo> [--exec <cmd>] --list"

63 msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"

64

53 -#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327

65 +#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327

66 #, c-format

67 msgid "pathspec '%s' did not match any files"

68 msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"

69

58 -#: archive.c:427

70 +#: archive.c:428

71 msgid "fmt"

72 msgstr "fmt"

73

62 -#: archive.c:427

74 +#: archive.c:428

75 msgid "archive format"

76 msgstr "arkivformat"

77

66 -#: archive.c:428 builtin/log.c:1204

78 +#: archive.c:429 builtin/log.c:1229

79 msgid "prefix"

80 msgstr "prefix"

81

70 -#: archive.c:429

82 +#: archive.c:430

83 msgid "prepend prefix to each pathname in the archive"

84 msgstr "lägg till prefix till varje sökväg i arkivet"

85

74 -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516

75 -#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986

76 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99

77 -#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394

78 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150

86 +#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516

87 +#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987

88 +#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99

89 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395

90 +#: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153

91 msgid "file"

92 msgstr "fil"

93

82 -#: archive.c:431 builtin/archive.c:89

94 +#: archive.c:432 builtin/archive.c:89

95 msgid "write the archive to this file"

96 msgstr "skriv arkivet till filen"

97

86 -#: archive.c:433

98 +#: archive.c:434

99 msgid "read .gitattributes in working directory"

100 msgstr "läs .gitattributes i arbetskatalogen"

101

90 -#: archive.c:434

102 +#: archive.c:435

103 msgid "report archived files on stderr"

104 msgstr "rapportera arkiverade filer på standard fel"

105

94 -#: archive.c:435

106 +#: archive.c:436

107 msgid "store only"

108 msgstr "endast spara"

109

98 -#: archive.c:436

110 +#: archive.c:437

111 msgid "compress faster"

112 msgstr "komprimera snabbare"

113

102 -#: archive.c:444

114 +#: archive.c:445

115 msgid "compress better"

116 msgstr "komprimera bättre"

117

106 -#: archive.c:447

118 +#: archive.c:448

119 msgid "list supported archive formats"

120 msgstr "visa understödda arkivformat"

121

110 -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77

122 +#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77

123 msgid "repo"

124 msgstr "arkiv"

125

114 -#: archive.c:450 builtin/archive.c:91

126 +#: archive.c:451 builtin/archive.c:91

127 msgid "retrieve the archive from remote repository <repo>"

128 msgstr "hämta arkivet från fjärrarkivet <arkiv>"

129

118 -#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478

130 +#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479

131 msgid "command"

132 msgstr "kommando"

133

122 -#: archive.c:452 builtin/archive.c:93

134 +#: archive.c:453 builtin/archive.c:93

135 msgid "path to the remote git-upload-archive command"

136 msgstr "sökväg till kommandot git-upload-archive på fjärren"

137

@@ -242,6 +254,11 @@ msgstr "Objektnamnet är tvetydigt: \"%s\"."

254 msgid "Not a valid branch point: '%s'."

255 msgstr "Avgreningspunkten är inte giltig: \"%s\""

256

257 +#: branch.c:399

258 +#, c-format

259 +msgid "'%s' is already checked out at '%s'"

260 +msgstr "\"%s\" är redan utcheckad på \"%s\""

261 +

262 #: bundle.c:34

263 #, c-format

264 msgid "'%s' does not look like a v2 bundle file"

@@ -252,7 +269,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"

269 msgid "unrecognized header: %s%s (%d)"

270 msgstr "okänt huvud: %s%s (%d)"

271

255 -#: bundle.c:87 builtin/commit.c:766

272 +#: bundle.c:87 builtin/commit.c:765

273 #, c-format

274 msgid "could not open '%s'"

275 msgstr "kunde inte öppna \"%s\""

@@ -261,9 +278,9 @@ msgstr "kunde inte öppna \"%s\""

278 msgid "Repository lacks these prerequisite commits:"

279 msgstr "Arkivet saknar dessa nödvändiga incheckningar:"

280

264 -#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705

265 -#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330

266 -#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358

281 +#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708

282 +#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334

283 +#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358

284 #: builtin/shortlog.c:158

285 msgid "revision walk setup failed"

286 msgstr "misslyckades skapa revisionstraversering"

@@ -286,38 +303,38 @@ msgid_plural "The bundle requires these %d refs:"

303 msgstr[0] "Paketet (bundlen) kräver denna referens:"

304 msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"

305

289 -#: bundle.c:251

306 +#: bundle.c:253

307 msgid "Could not spawn pack-objects"

308 msgstr "Kunde inte starta pack-objects"

309

293 -#: bundle.c:269

310 +#: bundle.c:264

311 msgid "pack-objects died"

312 msgstr "pack-objects misslyckades"

313

297 -#: bundle.c:309

314 +#: bundle.c:304

315 msgid "rev-list died"

316 msgstr "rev-list dog"

317

301 -#: bundle.c:358

318 +#: bundle.c:353

319 #, c-format

320 msgid "ref '%s' is excluded by the rev-list options"

321 msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"

322

306 -#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261

323 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261

324 #, c-format

325 msgid "unrecognized argument: %s"

326 msgstr "okänt argument: %s"

327

311 -#: bundle.c:443

328 +#: bundle.c:449

329 msgid "Refusing to create empty bundle."

330 msgstr "Vägrar skapa ett tomt paket (bundle)."

331

315 -#: bundle.c:453

332 +#: bundle.c:459

333 #, c-format

334 msgid "cannot create '%s'"

335 msgstr "kan inte skapa \"%s\""

336

320 -#: bundle.c:474

337 +#: bundle.c:480

338 msgid "index-pack died"

339 msgstr "index-pack dog"

340

@@ -326,7 +343,8 @@ msgstr "index-pack dog"

343 msgid "invalid color value: %.*s"

344 msgstr "felaktigt färgvärde: %.*s"

345

329 -#: commit.c:40

346 +#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1489

347 +#: builtin/am.c:2101

348 #, c-format

349 msgid "could not parse %s"

350 msgstr "kunde inte tolka %s"

@@ -484,22 +502,22 @@ msgstr "kunde inte läsa orderfilen \"%s\""

502 msgid "Performing inexact rename detection"

503 msgstr "Utför onöjaktig namnbytesdetektering"

504

487 -#: diff.c:114

505 +#: diff.c:116

506 #, c-format

507 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

508 msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"

509

492 -#: diff.c:119

510 +#: diff.c:121

511 #, c-format

512 msgid " Unknown dirstat parameter '%s'\n"

513 msgstr " Okänd dirstat-parameter \"%s\"\n"

514

497 -#: diff.c:214

515 +#: diff.c:216

516 #, c-format

517 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

518 msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""

519

502 -#: diff.c:266

520 +#: diff.c:268

521 #, c-format

522 msgid ""

523 "Found errors in 'diff.dirstat' config variable:\n"

@@ -508,16 +526,16 @@ msgstr ""

526 "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"

527 "%s"

528

511 -#: diff.c:2997

529 +#: diff.c:2998

530 #, c-format

531 msgid "external diff died, stopping at %s"

532 msgstr "extern diff dog, stannar vid %s"

533

516 -#: diff.c:3393

534 +#: diff.c:3394

535 msgid "--follow requires exactly one pathspec"

536 msgstr "--follow kräver exakt en sökvägsangivelse"

537

520 -#: diff.c:3556

538 +#: diff.c:3557

539 #, c-format

540 msgid ""

541 "Failed to parse --dirstat/-X option parameter:\n"

@@ -526,37 +544,37 @@ msgstr ""

544 "Misslyckades tolka argument till flaggan --dirstat/-X;\n"

545 "%s"

546

529 -#: diff.c:3570

547 +#: diff.c:3571

548 #, c-format

549 msgid "Failed to parse --submodule option parameter: '%s'"

550 msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""

551

534 -#: dir.c:1852

552 +#: dir.c:1853

553 msgid "failed to get kernel name and information"

554 msgstr "misslyckades hämta kärnans namn och information"

555

538 -#: dir.c:1945

556 +#: dir.c:1936

557 msgid "Untracked cache is disabled on this system."

558 msgstr "Ospårad cache är inaktiverad på detta system."

559

542 -#: gpg-interface.c:129 gpg-interface.c:200

560 +#: gpg-interface.c:166 gpg-interface.c:237

561 msgid "could not run gpg."

562 msgstr "kunde inte köra gpg."

563

546 -#: gpg-interface.c:141

564 +#: gpg-interface.c:178

565 msgid "gpg did not accept the data"

566 msgstr "gpg godtog inte data"

567

550 -#: gpg-interface.c:152

568 +#: gpg-interface.c:189

569 msgid "gpg failed to sign the data"

570 msgstr "gpg misslyckades signera data"

571

554 -#: gpg-interface.c:185

572 +#: gpg-interface.c:222

573 #, c-format

574 msgid "could not create temporary file '%s': %s"

575 msgstr "kunde inte skapa temporära filen \"%s\": %s"

576

559 -#: gpg-interface.c:188

577 +#: gpg-interface.c:225

578 #, c-format

579 msgid "failed writing detached signature to '%s': %s"

580 msgstr "misslyckades skriva fristående signatur till \"%s\": %s"

@@ -640,20 +658,12 @@ msgstr[1] ""

658 msgid "%s: %s - %s"

659 msgstr "%s: %s - %s"

660

643 -#: lockfile.c:345

644 -msgid "BUG: reopen a lockfile that is still open"

645 -msgstr "FEL: återöppna en låsfil som fortfarande är öppen"

646 -

647 -#: lockfile.c:347

648 -msgid "BUG: reopen a lockfile that has been committed"

649 -msgstr "FEL: återöppna en låsfil som har överlämnats"

650 -

661 #: merge.c:41

662 msgid "failed to read the cache"

663 msgstr "misslyckades läsa cachen"

664

655 -#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587

656 -#: builtin/clone.c:647

665 +#: merge.c:94 builtin/am.c:1974 builtin/am.c:2009 builtin/checkout.c:375

666 +#: builtin/checkout.c:586 builtin/clone.c:715

667 msgid "unable to write new index file"

668 msgstr "kunde inte skriva ny indexfil"

669

@@ -700,7 +710,7 @@ msgstr "kan inte läsa objektet %s: \"%s\""

710 msgid "blob expected for %s '%s'"

711 msgstr "blob förväntades för %s \"%s\""

712

703 -#: merge-recursive.c:788 builtin/clone.c:306

713 +#: merge-recursive.c:788 builtin/clone.c:364

714 #, c-format

715 msgid "failed to open '%s'"

716 msgstr "misslyckades öppna \"%s\""

@@ -913,19 +923,19 @@ msgstr "Kunde inte skriva indexet."

923 msgid "Cannot commit uninitialized/unreferenced notes tree"

924 msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"

925

916 -#: notes-utils.c:82

926 +#: notes-utils.c:100

927 #, c-format

928 msgid "Bad notes.rewriteMode value: '%s'"

929 msgstr "Felaktigt värde för notes.rewriteMode: '%s'"

930

921 -#: notes-utils.c:92

931 +#: notes-utils.c:110

932 #, c-format

933 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

934 msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

935

936 #. TRANSLATORS: The first %s is the name of the

937 #. environment variable, the second %s is its value

928 -#: notes-utils.c:119

938 +#: notes-utils.c:137

939 #, c-format

940 msgid "Bad %s value: '%s'"

941 msgstr "Felaktigt värde på %s: \"%s\""

@@ -935,28 +945,28 @@ msgstr "Felaktigt värde på %s: \"%s\""

945 msgid "unable to parse object: %s"

946 msgstr "kunde inte tolka objektet: %s"

947

938 -#: parse-options.c:546

948 +#: parse-options.c:563

949 msgid "..."

950 msgstr "..."

951

942 -#: parse-options.c:564

952 +#: parse-options.c:581

953 #, c-format

954 msgid "usage: %s"

955 msgstr "användning: %s"

956

957 #. TRANSLATORS: the colon here should align with the

958 #. one in "usage: %s" translation

949 -#: parse-options.c:568

959 +#: parse-options.c:585

960 #, c-format

961 msgid " or: %s"

962 msgstr " eller: %s"

963

954 -#: parse-options.c:571

964 +#: parse-options.c:588

965 #, c-format

966 msgid " %s"

967 msgstr " %s"

968

959 -#: parse-options.c:605

969 +#: parse-options.c:622

970 msgid "-NUM"

971 msgstr "-TAL"

972

@@ -1025,7 +1035,7 @@ msgstr ""

1035 "Ingenting att exkludera från med :(exkludera)-mönster.\n"

1036 "Glömde du kanske att antingen lägga till \":/\" eller \".\"?"

1037

1028 -#: pretty.c:968

1038 +#: pretty.c:969

1039 msgid "unable to parse --pretty format"

1040 msgstr "kunde inte tolka format för --pretty"

1041

@@ -1033,7 +1043,7 @@ msgstr "kunde inte tolka format för --pretty"

1043 msgid "done"

1044 msgstr "klart"

1045

1036 -#: read-cache.c:1295

1046 +#: read-cache.c:1296

1047 #, c-format

1048 msgid ""

1049 "index.version set, but the value is invalid.\n"

@@ -1042,7 +1052,7 @@ msgstr ""

1052 "index.version satt, men värdet är ogiltigt.\n"

1053 "Använder version %i"

1054

1045 -#: read-cache.c:1305

1055 +#: read-cache.c:1306

1056 #, c-format

1057 msgid ""

1058 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -1051,6 +1061,31 @@ msgstr ""

1061 "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"

1062 "Använder version %i"

1063

1064 +#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1065 +#: builtin/merge.c:983

1066 +#, c-format

1067 +msgid "Could not open '%s' for writing"

1068 +msgstr "Kunde inte öppna \"%s\" för skrivning"

1069 +

1070 +#: refs.c:3001

1071 +#, c-format

1072 +msgid "could not delete reference %s: %s"

1073 +msgstr "kunde inte ta bort referensen %s: %s"

1074 +

1075 +#: refs.c:3004

1076 +#, c-format

1077 +msgid "could not delete references: %s"

1078 +msgstr "kunde inte ta bort referenser: %s"

1079 +

1080 +#: refs.c:3013

1081 +#, c-format

1082 +msgid "could not remove reference %s"

1083 +msgstr "kunde inte ta bort referensen %s"

1084 +

1085 +#: ref-filter.c:660

1086 +msgid "unable to parse format"

1087 +msgstr "kan inte tolka formatet"

1088 +

1089 #: remote.c:792

1090 #, c-format

1091 msgid "Cannot fetch both %s and %s to %s"

@@ -1170,7 +1205,16 @@ msgstr[1] ""

1205 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

1206 msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"

1207

1173 -#: revision.c:2366

1208 +#: revision.c:2198

1209 +msgid "your current branch appears to be broken"

1210 +msgstr "din nuvarande gren verkar vara trasig"

1211 +

1212 +#: revision.c:2201

1213 +#, c-format

1214 +msgid "your current branch '%s' does not have any commits yet"

1215 +msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"

1216 +

1217 +#: revision.c:2395

1218 msgid "--first-parent is incompatible with --bisect"

1219 msgstr "--first-parent är inkompatibelt med --bisect"

1220

@@ -1183,31 +1227,27 @@ msgstr "misslyckades öppna /dev/null"

1227 msgid "dup2(%d,%d) failed"

1228 msgstr "dup2(%d,%d) misslyckades"

1229

1186 -#: send-pack.c:272

1230 +#: send-pack.c:295

1231 msgid "failed to sign the push certificate"

1232 msgstr "misslyckades underteckna push-certifikatet"

1233

1190 -#: send-pack.c:378

1234 +#: send-pack.c:404

1235 msgid "the receiving end does not support --signed push"

1236 msgstr "mottagarsidan stöder inte push med --signed"

1237

1194 -#: send-pack.c:389

1238 +#: send-pack.c:406

1239 +msgid ""

1240 +"not sending a push certificate since the receiving end does not support --"

1241 +"signed push"

1242 +msgstr ""

1243 +"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"

1244 +"signed"

1245 +

1246 +#: send-pack.c:418

1247 msgid "the receiving end does not support --atomic push"

1248 msgstr "mottagarsidan stöder inte push med --atomic"

1249

1198 -#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1199 -#: builtin/merge.c:983

1200 -#, c-format

1201 -msgid "Could not open '%s' for writing"

1202 -msgstr "Kunde inte öppna \"%s\" för skrivning"

1203 -

1204 -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975

1205 -#: builtin/merge.c:988

1206 -#, c-format

1207 -msgid "Could not write to '%s'"

1208 -msgstr "Kunde inte skriva till \"%s\""

1209 -

1210 -#: sequencer.c:195

1250 +#: sequencer.c:183

1251 msgid ""

1252 "after resolving the conflicts, mark the corrected paths\n"

1253 "with 'git add <paths>' or 'git rm <paths>'"

@@ -1215,7 +1255,7 @@ msgstr ""

1255 "efter att ha löst konflikterna, markera de rättade sökvägarna\n"

1256 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\""

1257

1218 -#: sequencer.c:198

1258 +#: sequencer.c:186

1259 msgid ""

1260 "after resolving the conflicts, mark the corrected paths\n"

1261 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -1225,220 +1265,220 @@ msgstr ""

1265 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"

1266 "och checka in resultatet med \"git commit\""

1267

1228 -#: sequencer.c:211 sequencer.c:861 sequencer.c:944

1268 +#: sequencer.c:199 sequencer.c:842 sequencer.c:922

1269 #, c-format

1270 msgid "Could not write to %s"

1271 msgstr "Kunde inte skriva till %s"

1272

1233 -#: sequencer.c:214

1273 +#: sequencer.c:202

1274 #, c-format

1275 msgid "Error wrapping up %s"

1276 msgstr "Fel vid ombrytning av %s"

1277

1238 -#: sequencer.c:229

1278 +#: sequencer.c:217

1279 msgid "Your local changes would be overwritten by cherry-pick."

1280 msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"."

1281

1242 -#: sequencer.c:231

1282 +#: sequencer.c:219

1283 msgid "Your local changes would be overwritten by revert."

1284 msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"."

1285

1246 -#: sequencer.c:234

1286 +#: sequencer.c:222

1287 msgid "Commit your changes or stash them to proceed."

1288 msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta."

1289

1290 #. TRANSLATORS: %s will be "revert" or "cherry-pick"

1251 -#: sequencer.c:321

1291 +#: sequencer.c:309

1292 #, c-format

1293 msgid "%s: Unable to write new index file"

1294 msgstr "%s: Kunde inte skriva ny indexfil"

1295

1256 -#: sequencer.c:339

1296 +#: sequencer.c:327

1297 msgid "Could not resolve HEAD commit\n"

1298 msgstr "Kunde inte bestämma HEAD:s incheckning\n"

1299

1260 -#: sequencer.c:359

1300 +#: sequencer.c:347

1301 msgid "Unable to update cache tree\n"

1302 msgstr "Kan inte uppdatera cacheträd\n"

1303

1264 -#: sequencer.c:411

1304 +#: sequencer.c:399

1305 #, c-format

1306 msgid "Could not parse commit %s\n"

1307 msgstr "Kunde inte tolka incheckningen %s\n"

1308

1269 -#: sequencer.c:416

1309 +#: sequencer.c:404

1310 #, c-format

1311 msgid "Could not parse parent commit %s\n"

1312 msgstr "Kunde inte tolka föräldraincheckningen %s\n"

1313

1274 -#: sequencer.c:482

1314 +#: sequencer.c:469

1315 msgid "Your index file is unmerged."

1316 msgstr "Din indexfil har inte slagits ihop."

1317

1278 -#: sequencer.c:501

1318 +#: sequencer.c:488

1319 #, c-format

1320 msgid "Commit %s is a merge but no -m option was given."

1321 msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte."

1322

1283 -#: sequencer.c:509

1323 +#: sequencer.c:496

1324 #, c-format

1325 msgid "Commit %s does not have parent %d"

1326 msgstr "Incheckning %s har inte förälder %d"

1327

1288 -#: sequencer.c:513

1328 +#: sequencer.c:500

1329 #, c-format

1330 msgid "Mainline was specified but commit %s is not a merge."

1331 msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning"

1332

1333 #. TRANSLATORS: The first %s will be "revert" or

1334 #. "cherry-pick", the second %s a SHA1

1295 -#: sequencer.c:526

1335 +#: sequencer.c:513

1336 #, c-format

1337 msgid "%s: cannot parse parent commit %s"

1338 msgstr "%s: kan inte tolka föräldraincheckningen %s"

1339

1300 -#: sequencer.c:530

1340 +#: sequencer.c:517

1341 #, c-format

1342 msgid "Cannot get commit message for %s"

1343 msgstr "Kan inte hämta incheckningsmeddelande för %s"

1344

1305 -#: sequencer.c:616

1345 +#: sequencer.c:603

1346 #, c-format

1347 msgid "could not revert %s... %s"

1348 msgstr "kunde inte ångra %s... %s"

1349

1310 -#: sequencer.c:617

1350 +#: sequencer.c:604

1351 #, c-format

1352 msgid "could not apply %s... %s"

1353 msgstr "kunde inte tillämpa %s... %s"

1354

1315 -#: sequencer.c:653

1355 +#: sequencer.c:639

1356 msgid "empty commit set passed"

1357 msgstr "den angivna uppsättningen incheckningar är tom"

1358

1319 -#: sequencer.c:661

1359 +#: sequencer.c:647

1360 #, c-format

1361 msgid "git %s: failed to read the index"

1362 msgstr "git %s: misslyckades läsa indexet"

1363

1324 -#: sequencer.c:665

1364 +#: sequencer.c:651

1365 #, c-format

1366 msgid "git %s: failed to refresh the index"

1367 msgstr "git %s: misslyckades uppdatera indexet"

1368

1329 -#: sequencer.c:725

1369 +#: sequencer.c:711

1370 #, c-format

1371 msgid "Cannot %s during a %s"

1372 msgstr "kan inte %s under en %s"

1373

1334 -#: sequencer.c:747

1374 +#: sequencer.c:733

1375 #, c-format

1376 msgid "Could not parse line %d."

1377 msgstr "Kan inte tolka rad %d."

1378

1339 -#: sequencer.c:752

1379 +#: sequencer.c:738

1380 msgid "No commits parsed."

1381 msgstr "Inga incheckningar lästes."

1382

1343 -#: sequencer.c:765

1383 +#: sequencer.c:750

1384 #, c-format

1385 msgid "Could not open %s"

1386 msgstr "Kunde inte öppna %s"

1387

1348 -#: sequencer.c:769

1388 +#: sequencer.c:754

1389 #, c-format

1390 msgid "Could not read %s."

1391 msgstr "kunde inte läsa %s."

1392

1353 -#: sequencer.c:776

1393 +#: sequencer.c:761

1394 #, c-format

1395 msgid "Unusable instruction sheet: %s"

1396 msgstr "Oanvändbart manus: %s"

1397

1358 -#: sequencer.c:806

1398 +#: sequencer.c:791

1399 #, c-format

1400 msgid "Invalid key: %s"

1401 msgstr "Felaktig nyckel: %s"

1402

1363 -#: sequencer.c:809

1403 +#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49

1404 #, c-format

1405 msgid "Invalid value for %s: %s"

1406 msgstr "Felaktigt värde för %s: %s"

1407

1368 -#: sequencer.c:821

1408 +#: sequencer.c:804

1409 #, c-format

1410 msgid "Malformed options sheet: %s"

1411 msgstr "Trasigt manus: %s"

1412

1373 -#: sequencer.c:842

1413 +#: sequencer.c:823

1414 msgid "a cherry-pick or revert is already in progress"

1415 msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"

1416

1377 -#: sequencer.c:843

1417 +#: sequencer.c:824

1418 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

1419 msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""

1420

1381 -#: sequencer.c:847

1421 +#: sequencer.c:828

1422 #, c-format

1423 msgid "Could not create sequencer directory %s"

1424 msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\""

1425

1386 -#: sequencer.c:863 sequencer.c:948

1426 +#: sequencer.c:844 sequencer.c:926

1427 #, c-format

1428 msgid "Error wrapping up %s."

1429 msgstr "Fel vid ombrytning av %s."

1430

1391 -#: sequencer.c:882 sequencer.c:1018

1431 +#: sequencer.c:863 sequencer.c:996

1432 msgid "no cherry-pick or revert in progress"

1433 msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"

1434

1395 -#: sequencer.c:884

1435 +#: sequencer.c:865

1436 msgid "cannot resolve HEAD"

1437 msgstr "kan inte bestämma HEAD"

1438

1399 -#: sequencer.c:886

1439 +#: sequencer.c:867

1440 msgid "cannot abort from a branch yet to be born"

1441 msgstr "kan inte avbryta från en gren som ännu inte är född"

1442

1403 -#: sequencer.c:908 builtin/apply.c:4291

1443 +#: sequencer.c:887 builtin/apply.c:4291

1444 #, c-format

1445 msgid "cannot open %s: %s"

1446 msgstr "kan inte öppna %s: %s"

1447

1408 -#: sequencer.c:911

1448 +#: sequencer.c:890

1449 #, c-format

1450 msgid "cannot read %s: %s"

1451 msgstr "kan inte läsa %s: %s"

1452

1413 -#: sequencer.c:912

1453 +#: sequencer.c:891

1454 msgid "unexpected end of file"

1455 msgstr "oväntat filslut"

1456

1417 -#: sequencer.c:918

1457 +#: sequencer.c:897

1458 #, c-format

1459 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

1460 msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"

1461

1422 -#: sequencer.c:941

1462 +#: sequencer.c:919

1463 #, c-format

1464 msgid "Could not format %s."

1465 msgstr "Kunde inte formatera %s."

1466

1427 -#: sequencer.c:1086

1467 +#: sequencer.c:1064

1468 #, c-format

1469 msgid "%s: can't cherry-pick a %s"

1470 msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""

1471

1432 -#: sequencer.c:1089

1472 +#: sequencer.c:1067

1473 #, c-format

1474 msgid "%s: bad revision"

1475 msgstr "%s: felaktig revision"

1476

1437 -#: sequencer.c:1123

1477 +#: sequencer.c:1101

1478 msgid "Can't revert as initial commit"

1479 msgstr "Kan inte ångra som första incheckning"

1480

1441 -#: sequencer.c:1124

1481 +#: sequencer.c:1102

1482 msgid "Can't cherry-pick into empty head"

1483 msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"

1484

@@ -1469,32 +1509,32 @@ msgstr ""

1509 "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"

1510 "genom att köra \"git config advice.objectNameWarning false\""

1511

1472 -#: submodule.c:64 submodule.c:98

1512 +#: submodule.c:61 submodule.c:95

1513 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

1514 msgstr ""

1515 "Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "

1516 "sammanslagningskonflikter först"

1517

1478 -#: submodule.c:68 submodule.c:102

1518 +#: submodule.c:65 submodule.c:99

1519 #, c-format

1520 msgid "Could not find section in .gitmodules where path=%s"

1521 msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"

1522

1483 -#: submodule.c:76

1523 +#: submodule.c:73

1524 #, c-format

1525 msgid "Could not update .gitmodules entry %s"

1526 msgstr "Kunde inte uppdatera .gitmodules-posten %s"

1527

1488 -#: submodule.c:109

1528 +#: submodule.c:106

1529 #, c-format

1530 msgid "Could not remove .gitmodules entry for %s"

1531 msgstr "Kunde inte ta bort .gitmodules-posten för %s"

1532

1493 -#: submodule.c:120

1533 +#: submodule.c:117

1534 msgid "staging updated .gitmodules failed"

1535 msgstr "misslyckades köa uppdaterad .gitmodules"

1536

1497 -#: submodule.c:1115

1537 +#: submodule.c:1045

1538 #, c-format

1539 msgid "Could not set core.worktree in %s"

1540 msgstr "Kunde inte sätta core.worktree i %s"

@@ -1524,6 +1564,11 @@ msgstr "kunde inte läsa indatafilen \"%s\""

1564 msgid "could not read from stdin"

1565 msgstr "Kunde inte läsa från standard in"

1566

1567 +#: transport-helper.c:1025

1568 +#, c-format

1569 +msgid "Could not read ref %s"

1570 +msgstr "Kunde inte läsa referensen %s"

1571 +

1572 #: unpack-trees.c:203

1573 msgid "Checking out files"

1574 msgstr "Checkar ut filer"

@@ -1557,196 +1602,212 @@ msgstr "felaktigt portnummer"

1602 msgid "invalid '..' path segment"

1603 msgstr "felaktigt \"..\"-sökvägssegment"

1604

1560 -#: wrapper.c:523

1605 +#: wrapper.c:219 wrapper.c:362

1606 +#, c-format

1607 +msgid "could not open '%s' for reading and writing"

1608 +msgstr "kunde inte öppna \"%s\" för läsning och skrivning"

1609 +

1610 +#: wrapper.c:221 wrapper.c:364

1611 +#, c-format

1612 +msgid "could not open '%s' for writing"

1613 +msgstr "kunde inte öppna \"%s\" för skrivning"

1614 +

1615 +#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688

1616 +#: builtin/merge.c:1076 builtin/pull.c:380

1617 +#, c-format

1618 +msgid "could not open '%s' for reading"

1619 +msgstr "kunde inte öppna \"%s\" för läsning"

1620 +

1621 +#: wrapper.c:579

1622 #, c-format

1623 msgid "unable to access '%s': %s"

1624 msgstr "kan inte komma åt \"%s\": %s"

1625

1565 -#: wrapper.c:544

1626 +#: wrapper.c:600

1627 #, c-format

1628 msgid "unable to access '%s'"

1629 msgstr "kan inte komma åt \"%s\""

1630

1570 -#: wrapper.c:555

1631 +#: wrapper.c:611

1632 #, c-format

1633 msgid "unable to look up current user in the passwd file: %s"

1634 msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"

1635

1575 -#: wrapper.c:556

1636 +#: wrapper.c:612

1637 msgid "no such user"

1638 msgstr "okänd användare"

1639

1579 -#: wrapper.c:564

1640 +#: wrapper.c:620

1641 msgid "unable to get current working directory"

1642 msgstr "kan inte hämta aktuell arbetskatalog"

1643

1583 -#: wrapper.c:575

1644 +#: wrapper.c:631

1645 #, c-format

1646 msgid "could not open %s for writing"

1647 msgstr "kunde inte öppna %s för skrivning"

1648

1588 -#: wrapper.c:587

1649 +#: wrapper.c:642 builtin/am.c:424

1650 #, c-format

1651 msgid "could not write to %s"

1652 msgstr "kunde inte skriva till %s"

1653

1593 -#: wrapper.c:593

1654 +#: wrapper.c:648

1655 #, c-format

1656 msgid "could not close %s"

1657 msgstr "kunde inte stänga %s"

1658

1598 -#: wt-status.c:150

1659 +#: wt-status.c:149

1660 msgid "Unmerged paths:"

1661 msgstr "Ej sammanslagna sökvägar:"

1662

1602 -#: wt-status.c:177 wt-status.c:204

1663 +#: wt-status.c:176 wt-status.c:203

1664 #, c-format

1665 msgid " (use \"git reset %s <file>...\" to unstage)"

1666 msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"

1667

1607 -#: wt-status.c:179 wt-status.c:206

1668 +#: wt-status.c:178 wt-status.c:205

1669 msgid " (use \"git rm --cached <file>...\" to unstage)"

1670 msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"

1671

1611 -#: wt-status.c:183

1672 +#: wt-status.c:182

1673 msgid " (use \"git add <file>...\" to mark resolution)"

1674 msgstr " (använd \"git add <fil>...\" för att ange lösning)"

1675

1615 -#: wt-status.c:185 wt-status.c:189

1676 +#: wt-status.c:184 wt-status.c:188

1677 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

1678 msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"

1679

1619 -#: wt-status.c:187

1680 +#: wt-status.c:186

1681 msgid " (use \"git rm <file>...\" to mark resolution)"

1682 msgstr " (använd \"git rm <fil>...\" för att ange lösning)"

1683

1623 -#: wt-status.c:198 wt-status.c:881

1684 +#: wt-status.c:197 wt-status.c:880

1685 msgid "Changes to be committed:"

1686 msgstr "Ändringar att checka in:"

1687

1627 -#: wt-status.c:216 wt-status.c:890

1688 +#: wt-status.c:215 wt-status.c:889

1689 msgid "Changes not staged for commit:"

1690 msgstr "Ändringar ej i incheckningskön:"

1691

1631 -#: wt-status.c:220

1692 +#: wt-status.c:219

1693 msgid " (use \"git add <file>...\" to update what will be committed)"

1694 msgstr ""

1695 " (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"

1696

1636 -#: wt-status.c:222

1697 +#: wt-status.c:221

1698 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

1699 msgstr ""

1700 " (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"

1701

1641 -#: wt-status.c:223

1702 +#: wt-status.c:222

1703 msgid ""

1704 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

1705 msgstr ""

1706 " (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "

1707 "arbetskatalogen)"

1708

1648 -#: wt-status.c:225

1709 +#: wt-status.c:224

1710 msgid " (commit or discard the untracked or modified content in submodules)"

1711 msgstr ""

1712 " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"

1713

1653 -#: wt-status.c:237

1714 +#: wt-status.c:236

1715 #, c-format

1716 msgid " (use \"git %s <file>...\" to include in what will be committed)"

1717 msgstr ""

1718 " (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)"

1719

1659 -#: wt-status.c:252

1720 +#: wt-status.c:251

1721 msgid "both deleted:"

1722 msgstr "borttaget av bägge:"

1723

1663 -#: wt-status.c:254

1724 +#: wt-status.c:253

1725 msgid "added by us:"

1726 msgstr "tillagt av oss:"

1727

1667 -#: wt-status.c:256

1728 +#: wt-status.c:255

1729 msgid "deleted by them:"

1730 msgstr "borttaget av dem:"

1731

1671 -#: wt-status.c:258

1732 +#: wt-status.c:257

1733 msgid "added by them:"

1734 msgstr "tillagt av dem:"

1735

1675 -#: wt-status.c:260

1736 +#: wt-status.c:259

1737 msgid "deleted by us:"

1738 msgstr "borttaget av oss:"

1739

1679 -#: wt-status.c:262

1740 +#: wt-status.c:261

1741 msgid "both added:"

1742 msgstr "tillagt av bägge:"

1743

1683 -#: wt-status.c:264

1744 +#: wt-status.c:263

1745 msgid "both modified:"

1746 msgstr "ändrat av bägge:"

1747

1687 -#: wt-status.c:266

1748 +#: wt-status.c:265

1749 #, c-format

1750 msgid "bug: unhandled unmerged status %x"

1751 msgstr "programfel: ej hanterad \"unmerged\"-status %x"

1752

1692 -#: wt-status.c:274

1753 +#: wt-status.c:273

1754 msgid "new file:"

1755 msgstr "ny fil:"

1756

1696 -#: wt-status.c:276

1757 +#: wt-status.c:275

1758 msgid "copied:"

1759 msgstr "kopierad:"

1760

1700 -#: wt-status.c:278

1761 +#: wt-status.c:277

1762 msgid "deleted:"

1763 msgstr "borttagen:"

1764

1704 -#: wt-status.c:280

1765 +#: wt-status.c:279

1766 msgid "modified:"

1767 msgstr "ändrad:"

1768

1708 -#: wt-status.c:282

1769 +#: wt-status.c:281

1770 msgid "renamed:"

1771 msgstr "namnbytt:"

1772

1712 -#: wt-status.c:284

1773 +#: wt-status.c:283

1774 msgid "typechange:"

1775 msgstr "typbyte:"

1776

1716 -#: wt-status.c:286

1777 +#: wt-status.c:285

1778 msgid "unknown:"

1779 msgstr "okänd:"

1780

1720 -#: wt-status.c:288

1781 +#: wt-status.c:287

1782 msgid "unmerged:"

1783 msgstr "osammanslagen:"

1784

1724 -#: wt-status.c:370

1785 +#: wt-status.c:369

1786 msgid "new commits, "

1787 msgstr "nya incheckningar, "

1788

1728 -#: wt-status.c:372

1789 +#: wt-status.c:371

1790 msgid "modified content, "

1791 msgstr "ändrat innehåll, "

1792

1732 -#: wt-status.c:374

1793 +#: wt-status.c:373

1794 msgid "untracked content, "

1795 msgstr "ospårat innehåll, "

1796

1736 -#: wt-status.c:391

1797 +#: wt-status.c:390

1798 #, c-format

1799 msgid "bug: unhandled diff status %c"

1800 msgstr "programfel: diff-status %c ej hanterad"

1801

1741 -#: wt-status.c:755

1802 +#: wt-status.c:754

1803 msgid "Submodules changed but not updated:"

1804 msgstr "Undermoduler ändrade men inte uppdaterade:"

1805

1745 -#: wt-status.c:757

1806 +#: wt-status.c:756

1807 msgid "Submodule changes to be committed:"

1808 msgstr "Undermodulers ändringar att checka in:"

1809

1749 -#: wt-status.c:838

1810 +#: wt-status.c:837

1811 msgid ""

1812 "Do not touch the line above.\n"

1813 "Everything below will be removed."

@@ -1754,68 +1815,99 @@ msgstr ""

1815 "Rör inte raden ovan.\n"

1816 "Allt nedan kommer tas bort."

1817

1757 -#: wt-status.c:949

1818 +#: wt-status.c:948

1819 msgid "You have unmerged paths."

1820 msgstr "Du har ej sammanslagna sökvägar."

1821

1761 -#: wt-status.c:952

1822 +#: wt-status.c:951

1823 msgid " (fix conflicts and run \"git commit\")"

1824 msgstr " (rätta konflikter och kör \"git commit\")"

1825

1765 -#: wt-status.c:955

1826 +#: wt-status.c:954

1827 msgid "All conflicts fixed but you are still merging."

1828 msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."

1829

1769 -#: wt-status.c:958

1830 +#: wt-status.c:957

1831 msgid " (use \"git commit\" to conclude merge)"

1832 msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"

1833

1773 -#: wt-status.c:968

1834 +#: wt-status.c:967

1835 msgid "You are in the middle of an am session."

1836 msgstr "Du är i mitten av en körning av \"git am\"."

1837

1777 -#: wt-status.c:971

1838 +#: wt-status.c:970

1839 msgid "The current patch is empty."

1840 msgstr "Aktuell patch är tom."

1841

1781 -#: wt-status.c:975

1842 +#: wt-status.c:974

1843 msgid " (fix conflicts and then run \"git am --continue\")"

1844 msgstr " (rätta konflikter och kör sedan \"git am --continue\")"

1845

1785 -#: wt-status.c:977

1846 +#: wt-status.c:976

1847 msgid " (use \"git am --skip\" to skip this patch)"

1848 msgstr " (använd \"git am --skip\" för att hoppa över patchen)"

1849

1789 -#: wt-status.c:979

1850 +#: wt-status.c:978

1851 msgid " (use \"git am --abort\" to restore the original branch)"

1852 msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"

1853

1793 -#: wt-status.c:1039 wt-status.c:1056

1854 +#: wt-status.c:1105

1855 +msgid "No commands done."

1856 +msgstr "Inga kommandon utförda."

1857 +

1858 +#: wt-status.c:1108

1859 +#, c-format

1860 +msgid "Last command done (%d command done):"

1861 +msgid_plural "Last commands done (%d commands done):"

1862 +msgstr[0] "Sista kommandot utfört (%d kommando utfört):"

1863 +msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"

1864 +

1865 +#: wt-status.c:1119

1866 +#, c-format

1867 +msgid " (see more in file %s)"

1868 +msgstr " (se fler i filen %s)"

1869 +

1870 +#: wt-status.c:1124

1871 +msgid "No commands remaining."

1872 +msgstr "Inga kommandon återstår."

1873 +

1874 +#: wt-status.c:1127

1875 +#, c-format

1876 +msgid "Next command to do (%d remaining command):"

1877 +msgid_plural "Next commands to do (%d remaining commands):"

1878 +msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"

1879 +msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"

1880 +

1881 +#: wt-status.c:1135

1882 +msgid " (use \"git rebase --edit-todo\" to view and edit)"

1883 +msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"

1884 +

1885 +#: wt-status.c:1148

1886 #, c-format

1887 msgid "You are currently rebasing branch '%s' on '%s'."

1888 msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."

1889

1798 -#: wt-status.c:1044 wt-status.c:1061

1890 +#: wt-status.c:1153

1891 msgid "You are currently rebasing."

1892 msgstr "Du håller på med en ombasering."

1893

1802 -#: wt-status.c:1047

1894 +#: wt-status.c:1167

1895 msgid " (fix conflicts and then run \"git rebase --continue\")"

1896 msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"

1897

1806 -#: wt-status.c:1049

1898 +#: wt-status.c:1169

1899 msgid " (use \"git rebase --skip\" to skip this patch)"

1900 msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"

1901

1810 -#: wt-status.c:1051

1902 +#: wt-status.c:1171

1903 msgid " (use \"git rebase --abort\" to check out the original branch)"

1904 msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"

1905

1814 -#: wt-status.c:1064

1906 +#: wt-status.c:1177

1907 msgid " (all conflicts fixed: run \"git rebase --continue\")"

1908 msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"

1909

1818 -#: wt-status.c:1068

1910 +#: wt-status.c:1181

1911 #, c-format

1912 msgid ""

1913 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

@@ -1823,118 +1915,122 @@ msgstr ""

1915 "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "

1916 "ovanpå \"%s\"."

1917

1826 -#: wt-status.c:1073

1918 +#: wt-status.c:1186

1919 msgid "You are currently splitting a commit during a rebase."

1920 msgstr "Du håller på att dela upp en incheckning i en ombasering."

1921

1830 -#: wt-status.c:1076

1922 +#: wt-status.c:1189

1923 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

1924 msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"

1925

1834 -#: wt-status.c:1080

1926 +#: wt-status.c:1193

1927 #, c-format

1928 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

1929 msgstr ""

1930 "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "

1931 "ovanpå \"%s\"."

1932

1841 -#: wt-status.c:1085

1933 +#: wt-status.c:1198

1934 msgid "You are currently editing a commit during a rebase."

1935 msgstr "Du håller på att redigera en incheckning under en ombasering."

1936

1845 -#: wt-status.c:1088

1937 +#: wt-status.c:1201

1938 msgid " (use \"git commit --amend\" to amend the current commit)"

1939 msgstr ""

1940 " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"

1941

1850 -#: wt-status.c:1090

1942 +#: wt-status.c:1203

1943 msgid ""

1944 " (use \"git rebase --continue\" once you are satisfied with your changes)"

1945 msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"

1946

1855 -#: wt-status.c:1100

1947 +#: wt-status.c:1213

1948 #, c-format

1949 msgid "You are currently cherry-picking commit %s."

1950 msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."

1951

1860 -#: wt-status.c:1105

1952 +#: wt-status.c:1218

1953 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

1954 msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"

1955

1864 -#: wt-status.c:1108

1956 +#: wt-status.c:1221

1957 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

1958 msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"

1959

1868 -#: wt-status.c:1110

1960 +#: wt-status.c:1223

1961 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

1962 msgstr ""

1963 " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"

1964 "operationen)"

1965

1874 -#: wt-status.c:1119

1966 +#: wt-status.c:1232

1967 #, c-format

1968 msgid "You are currently reverting commit %s."

1969 msgstr "Du håller på med att ångra incheckningen %s."

1970

1879 -#: wt-status.c:1124

1971 +#: wt-status.c:1237

1972 msgid " (fix conflicts and run \"git revert --continue\")"

1973 msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"

1974

1883 -#: wt-status.c:1127

1975 +#: wt-status.c:1240

1976 msgid " (all conflicts fixed: run \"git revert --continue\")"

1977 msgstr " (alla konflikter rättade: kör \"git revert --continue\")"

1978

1887 -#: wt-status.c:1129

1979 +#: wt-status.c:1242

1980 msgid " (use \"git revert --abort\" to cancel the revert operation)"

1981 msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"

1982

1891 -#: wt-status.c:1140

1983 +#: wt-status.c:1253

1984 #, c-format

1985 msgid "You are currently bisecting, started from branch '%s'."

1986 msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."

1987

1896 -#: wt-status.c:1144

1988 +#: wt-status.c:1257

1989 msgid "You are currently bisecting."

1990 msgstr "Du håller på med en \"bisect\"."

1991

1900 -#: wt-status.c:1147

1992 +#: wt-status.c:1260

1993 msgid " (use \"git bisect reset\" to get back to the original branch)"

1994 msgstr ""

1995 " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"

1996

1905 -#: wt-status.c:1324

1997 +#: wt-status.c:1437

1998 msgid "On branch "

1999 msgstr "På grenen "

2000

1909 -#: wt-status.c:1331

2001 +#: wt-status.c:1445

2002 +msgid "interactive rebase in progress; onto "

2003 +msgstr "interaktiv ombasering pågår; ovanpå"

2004 +

2005 +#: wt-status.c:1447

2006 msgid "rebase in progress; onto "

2007 msgstr "ombasering pågår; ovanpå"

2008

1913 -#: wt-status.c:1336

2009 +#: wt-status.c:1452

2010 msgid "HEAD detached at "

2011 msgstr "HEAD frånkopplad vid "

2012

1917 -#: wt-status.c:1338

2013 +#: wt-status.c:1454

2014 msgid "HEAD detached from "

2015 msgstr "HEAD frånkopplad från "

2016

1921 -#: wt-status.c:1341

2017 +#: wt-status.c:1457

2018 msgid "Not currently on any branch."

2019 msgstr "Inte på någon gren för närvarande."

2020

1925 -#: wt-status.c:1358

2021 +#: wt-status.c:1474

2022 msgid "Initial commit"

2023 msgstr "Första incheckning"

2024

1929 -#: wt-status.c:1372

2025 +#: wt-status.c:1488

2026 msgid "Untracked files"

2027 msgstr "Ospårade filer"

2028

1933 -#: wt-status.c:1374

2029 +#: wt-status.c:1490

2030 msgid "Ignored files"

2031 msgstr "Ignorerade filer"

2032

1937 -#: wt-status.c:1378

2033 +#: wt-status.c:1494

2034 #, c-format

2035 msgid ""

2036 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -1946,32 +2042,32 @@ msgstr ""

2042 "lägga till nya filer själv (se \"git help status\")."

2043

2044 # %s är nästa sträng eller tom.

1949 -#: wt-status.c:1384

2045 +#: wt-status.c:1500

2046 #, c-format

2047 msgid "Untracked files not listed%s"

2048 msgstr "Ospårade filer visas ej%s"

2049

1954 -#: wt-status.c:1386

2050 +#: wt-status.c:1502

2051 msgid " (use -u option to show untracked files)"

2052 msgstr " (använd flaggan -u för att visa ospårade filer)"

2053

1958 -#: wt-status.c:1392

2054 +#: wt-status.c:1508

2055 msgid "No changes"

2056 msgstr "Inga ändringar"

2057

1962 -#: wt-status.c:1397

2058 +#: wt-status.c:1513

2059 #, c-format

2060 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

2061 msgstr ""

2062 "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"

2063 "\")\n"

2064

1969 -#: wt-status.c:1400

2065 +#: wt-status.c:1516

2066 #, c-format

2067 msgid "no changes added to commit\n"

2068 msgstr "inga ändringar att checka in\n"

2069

1974 -#: wt-status.c:1403

2070 +#: wt-status.c:1519

2071 #, c-format

2072 msgid ""

2073 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -1980,48 +2076,48 @@ msgstr ""

2076 "inget köat för incheckning, men ospårade filer finns (spåra med \"git add"

2077 "\")\n"

2078

1983 -#: wt-status.c:1406

2079 +#: wt-status.c:1522

2080 #, c-format

2081 msgid "nothing added to commit but untracked files present\n"

2082 msgstr "inget köat för incheckning, men ospårade filer finns\n"

2083

1988 -#: wt-status.c:1409

2084 +#: wt-status.c:1525

2085 #, c-format

2086 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

2087 msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"

2088

1993 -#: wt-status.c:1412 wt-status.c:1417

2089 +#: wt-status.c:1528 wt-status.c:1533

2090 #, c-format

2091 msgid "nothing to commit\n"

2092 msgstr "inget att checka in\n"

2093

1998 -#: wt-status.c:1415

2094 +#: wt-status.c:1531

2095 #, c-format

2096 msgid "nothing to commit (use -u to show untracked files)\n"

2097 msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"

2098

2003 -#: wt-status.c:1419

2099 +#: wt-status.c:1535

2100 #, c-format

2101 msgid "nothing to commit, working directory clean\n"

2102 msgstr "inget att checka in, arbetskatalogen ren\n"

2103

2008 -#: wt-status.c:1528

2104 +#: wt-status.c:1644

2105 msgid "HEAD (no branch)"

2106 msgstr "HEAD (ingen gren)"

2107

2012 -#: wt-status.c:1534

2108 +#: wt-status.c:1650

2109 msgid "Initial commit on "

2110 msgstr "Första incheckning på "

2111

2016 -#: wt-status.c:1561

2112 +#: wt-status.c:1677

2113 msgid "gone"

2114 msgstr "försvunnen"

2115

2020 -#: wt-status.c:1563 wt-status.c:1571

2116 +#: wt-status.c:1679 wt-status.c:1687

2117 msgid "behind "

2118 msgstr "efter "

2119

2024 -#: compat/precompose_utf8.c:55 builtin/clone.c:345

2120 +#: compat/precompose_utf8.c:55 builtin/clone.c:403

2121 #, c-format

2122 msgid "failed to unlink '%s'"

2123 msgstr "misslyckades ta bort länken \"%s\""

@@ -2048,7 +2144,7 @@ msgstr "ta bort \"%s\"\n"

2144 msgid "Unstaged changes after refreshing the index:"

2145 msgstr "Ospårade ändringar efter att ha uppdaterat indexet:"

2146

2051 -#: builtin/add.c:194 builtin/rev-parse.c:796

2147 +#: builtin/add.c:194 builtin/rev-parse.c:799

2148 msgid "Could not read the index"

2149 msgstr "Kunde inte läsa indexet"

2150

@@ -2083,15 +2179,15 @@ msgstr "Kunde inte tillämpa \"%s\""

2179 msgid "The following paths are ignored by one of your .gitignore files:\n"

2180 msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"

2181

2086 -#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110

2087 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369

2088 -#: builtin/rm.c:268

2182 +#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110

2183 +#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545

2184 +#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162

2185 msgid "dry run"

2186 msgstr "testkörning"

2187

2188 #: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19

2093 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616

2094 -#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114

2189 +#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636

2190 +#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114

2191 msgid "be verbose"

2192 msgstr "var pratsam"

2193

@@ -2099,7 +2195,7 @@ msgstr "var pratsam"

2195 msgid "interactive picking"

2196 msgstr "plocka interaktivt"

2197

2102 -#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286

2198 +#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286

2199 msgid "select hunks interactively"

2200 msgstr "välj stycken interaktivt"

2201

@@ -2166,15 +2262,422 @@ msgstr "Inget angivet, inget tillagt.\n"

2262 msgid "Maybe you wanted to say 'git add .'?\n"

2263 msgstr "Kanske menade du att skriva \"git add .\"?\n"

2264

2169 -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918

2170 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2265 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940

2266 +#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2267 msgid "index file corrupt"

2268 msgstr "indexfilen trasig"

2269

2174 -#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2270 +#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2271 msgid "Unable to write new index file"

2272 msgstr "Kunde inte skriva ny indexfil"

2273

2274 +#: builtin/am.c:41

2275 +#, c-format

2276 +msgid "could not stat %s"

2277 +msgstr "kunde inte ta status på %s"

2278 +

2279 +#: builtin/am.c:270 builtin/am.c:1318 builtin/commit.c:737

2280 +#: builtin/merge.c:1079

2281 +#, c-format

2282 +msgid "could not read '%s'"

2283 +msgstr "kunde inte läsa \"%s\""

2284 +

2285 +#: builtin/am.c:444

2286 +msgid "could not parse author script"

2287 +msgstr "kunde inte tolka författarskript"

2288 +

2289 +#: builtin/am.c:521

2290 +#, c-format

2291 +msgid "'%s' was deleted by the applypatch-msg hook"

2292 +msgstr "\"%s\" togs bort av kroken applypatch-msg"

2293 +

2294 +#: builtin/am.c:562 builtin/notes.c:300

2295 +#, c-format

2296 +msgid "Malformed input line: '%s'."

2297 +msgstr "Felaktig indatarad: \"%s\"."

2298 +

2299 +#: builtin/am.c:599 builtin/notes.c:315

2300 +#, c-format

2301 +msgid "Failed to copy notes from '%s' to '%s'"

2302 +msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""

2303 +

2304 +#: builtin/am.c:625

2305 +msgid "fseek failed"

2306 +msgstr "\"fseek\" misslyckades"

2307 +

2308 +#: builtin/am.c:786 builtin/am.c:874

2309 +#, c-format

2310 +msgid "could not open '%s' for reading: %s"

2311 +msgstr "kunde inte öppna \"%s\" för läsning: %s"

2312 +

2313 +#: builtin/am.c:793

2314 +#, c-format

2315 +msgid "could not open '%s' for writing: %s"

2316 +msgstr "Kunde inte öppna \"%s\" för skrivning: %s"

2317 +

2318 +#: builtin/am.c:802

2319 +#, c-format

2320 +msgid "could not parse patch '%s'"

2321 +msgstr "kunde inte tolka patchen \"%s\""

2322 +

2323 +#: builtin/am.c:867

2324 +msgid "Only one StGIT patch series can be applied at once"

2325 +msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"

2326 +

2327 +#: builtin/am.c:915

2328 +msgid "invalid timestamp"

2329 +msgstr "ogiltig tidsstämpel"

2330 +

2331 +#: builtin/am.c:918 builtin/am.c:926

2332 +msgid "invalid Date line"

2333 +msgstr "ogiltig \"Date\"-rad"

2334 +

2335 +#: builtin/am.c:923

2336 +msgid "invalid timezone offset"

2337 +msgstr "ogiltig tidszons-offset"

2338 +

2339 +#: builtin/am.c:1010

2340 +msgid "Patch format detection failed."

2341 +msgstr "Misslyckades detektera patchformat."

2342 +

2343 +#: builtin/am.c:1015 builtin/clone.c:368

2344 +#, c-format

2345 +msgid "failed to create directory '%s'"

2346 +msgstr "misslyckades skapa katalogen \"%s\""

2347 +

2348 +#: builtin/am.c:1019

2349 +msgid "Failed to split patches."

2350 +msgstr "Misslyckades dela patchar."

2351 +

2352 +#: builtin/am.c:1151 builtin/commit.c:362

2353 +msgid "unable to write index file"

2354 +msgstr "kan inte skriva indexfil"

2355 +

2356 +#: builtin/am.c:1202

2357 +#, c-format

2358 +msgid "When you have resolved this problem, run \"%s --continue\"."

2359 +msgstr "När du har löst problemet, kör \"%s --continue\"."

2360 +

2361 +#: builtin/am.c:1203

2362 +#, c-format

2363 +msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

2364 +msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."

2365 +

2366 +#: builtin/am.c:1204

2367 +#, c-format

2368 +msgid "To restore the original branch and stop patching, run \"%s --abort\"."

2369 +msgstr ""

2370 +"För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."

2371 +

2372 +#: builtin/am.c:1312

2373 +msgid "Patch is empty. Was it split wrong?"

2374 +msgstr "Patchen är tom. Delades den upp felaktigt?"

2375 +

2376 +#: builtin/am.c:1386 builtin/log.c:1345

2377 +#, c-format

2378 +msgid "invalid ident line: %s"

2379 +msgstr "ogiltig ident-rad: %s"

2380 +

2381 +#: builtin/am.c:1413

2382 +#, c-format

2383 +msgid "unable to parse commit %s"

2384 +msgstr "kunde inte tolka incheckningen %s"

2385 +

2386 +#: builtin/am.c:1587

2387 +msgid "Repository lacks necessary blobs to fall back on 3-way merge."

2388 +msgstr ""

2389 +"Arkivet saknar objekt som behövs för att falla tillbaka på 3-"

2390 +"vägssammanslagning."

2391 +

2392 +#: builtin/am.c:1589

2393 +msgid "Using index info to reconstruct a base tree..."

2394 +msgstr "Använder indexinfo för att återskapa ett basträd..."

2395 +

2396 +#: builtin/am.c:1608

2397 +msgid ""

2398 +"Did you hand edit your patch?\n"

2399 +"It does not apply to blobs recorded in its index."

2400 +msgstr ""

2401 +"Har du handredigerat din patch?\n"

2402 +"Den kan inte tillämpas på blobbar som antecknats i dess index."

2403 +

2404 +#: builtin/am.c:1614

2405 +msgid "Falling back to patching base and 3-way merge..."

2406 +msgstr ""

2407 +"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."

2408 +

2409 +#: builtin/am.c:1639

2410 +msgid "Failed to merge in the changes."

2411 +msgstr "Misslyckades slå ihop ändringarna."

2412 +

2413 +#: builtin/am.c:1664 builtin/merge.c:632

2414 +msgid "git write-tree failed to write a tree"

2415 +msgstr "git write-tree misslyckades skriva ett träd"

2416 +

2417 +#: builtin/am.c:1671

2418 +msgid "applying to an empty history"

2419 +msgstr "tillämpar på en tom historik"

2420 +

2421 +#: builtin/am.c:1684 builtin/commit.c:1752 builtin/merge.c:829

2422 +#: builtin/merge.c:854

2423 +msgid "failed to write commit object"

2424 +msgstr "kunde inte skriva incheckningsobjekt"

2425 +

2426 +#: builtin/am.c:1716 builtin/am.c:1720

2427 +#, c-format

2428 +msgid "cannot resume: %s does not exist."

2429 +msgstr "kan inte återuppta: %s finns inte."

2430 +

2431 +#: builtin/am.c:1736

2432 +msgid "cannot be interactive without stdin connected to a terminal."

2433 +msgstr ""

2434 +"kan inte vara interaktiv om standard in inte är ansluten till en terminal."

2435 +

2436 +#: builtin/am.c:1741

2437 +msgid "Commit Body is:"

2438 +msgstr "Incheckningskroppen är:"

2439 +

2440 +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]

2441 +#. in your translation. The program will only accept English

2442 +#. input at this point.

2443 +#.

2444 +#: builtin/am.c:1751

2445 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

2446 +msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "

2447 +

2448 +#: builtin/am.c:1801

2449 +#, c-format

2450 +msgid "Dirty index: cannot apply patches (dirty: %s)"

2451 +msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"

2452 +

2453 +#: builtin/am.c:1836 builtin/am.c:1907

2454 +#, c-format

2455 +msgid "Applying: %.*s"

2456 +msgstr "Tillämpar: %.*s"

2457 +

2458 +#: builtin/am.c:1852

2459 +msgid "No changes -- Patch already applied."

2460 +msgstr "Inga ändringar -- Patchen har redan tillämpats."

2461 +

2462 +#: builtin/am.c:1860

2463 +#, c-format

2464 +msgid "Patch failed at %s %.*s"

2465 +msgstr "Patch misslyckades på %s %.*s"

2466 +

2467 +#: builtin/am.c:1866

2468 +#, c-format

2469 +msgid "The copy of the patch that failed is found in: %s"

2470 +msgstr "En kopia av patchen som misslyckades finns i: %s"

2471 +

2472 +#: builtin/am.c:1910

2473 +msgid ""

2474 +"No changes - did you forget to use 'git add'?\n"

2475 +"If there is nothing left to stage, chances are that something else\n"

2476 +"already introduced the same changes; you might want to skip this patch."

2477 +msgstr ""

2478 +"Inga ändringar - glömde du använda \"git add\"?\n"

2479 +"Om det inte är något kvar att köa kan det hända att något annat redan\n"

2480 +"introducerat samma ändringar; kanske du bör hoppa över patchen."

2481 +

2482 +#: builtin/am.c:1917

2483 +msgid ""

2484 +"You still have unmerged paths in your index.\n"

2485 +"Did you forget to use 'git add'?"

2486 +msgstr ""

2487 +"Du har fortfarande sökvägar som inte slagits samman i ditt index.\n"

2488 +"Glömde du använda \"git add\"?"

2489 +

2490 +#: builtin/am.c:2025 builtin/am.c:2029 builtin/am.c:2041 builtin/reset.c:308

2491 +#: builtin/reset.c:316

2492 +#, c-format

2493 +msgid "Could not parse object '%s'."

2494 +msgstr "Kan inte tolka objektet \"%s\""

2495 +

2496 +#: builtin/am.c:2077

2497 +msgid "failed to clean index"

2498 +msgstr "misslyckades städa upp indexet"

2499 +

2500 +#: builtin/am.c:2111

2501 +msgid ""

2502 +"You seem to have moved HEAD since the last 'am' failure.\n"

2503 +"Not rewinding to ORIG_HEAD"

2504 +msgstr ""

2505 +"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"

2506 +"Återställer inte till ORIG_HEAD"

2507 +

2508 +#: builtin/am.c:2172

2509 +#, c-format

2510 +msgid "Invalid value for --patch-format: %s"

2511 +msgstr "Felaktigt värde för --patch-format: %s"

2512 +

2513 +#: builtin/am.c:2194

2514 +msgid "git am [options] [(<mbox>|<Maildir>)...]"

2515 +msgstr "git am [flaggor] [(<mbox>|<Maildir>)...]"

2516 +

2517 +#: builtin/am.c:2195

2518 +msgid "git am [options] (--continue | --skip | --abort)"

2519 +msgstr "git am [flaggor] (--continue | --skip | --abort)"

2520 +

2521 +#: builtin/am.c:2201

2522 +msgid "run interactively"

2523 +msgstr "kör interaktivt"

2524 +

2525 +#: builtin/am.c:2203

2526 +msgid "historical option -- no-op"

2527 +msgstr "historisk flagga -- no-op"

2528 +

2529 +#: builtin/am.c:2205

2530 +msgid "allow fall back on 3way merging if needed"

2531 +msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"

2532 +

2533 +#: builtin/am.c:2206 builtin/init-db.c:509 builtin/prune-packed.c:57

2534 +#: builtin/repack.c:171

2535 +msgid "be quiet"

2536 +msgstr "var tyst"

2537 +

2538 +#: builtin/am.c:2208

2539 +msgid "add a Signed-off-by line to the commit message"

2540 +msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"

2541 +

2542 +#: builtin/am.c:2211

2543 +msgid "recode into utf8 (default)"

2544 +msgstr "koda om till utf8 (standard)"

2545 +

2546 +#: builtin/am.c:2213

2547 +msgid "pass -k flag to git-mailinfo"

2548 +msgstr "sänd flaggan -k till git-mailinfo"

2549 +

2550 +#: builtin/am.c:2215

2551 +msgid "pass -b flag to git-mailinfo"

2552 +msgstr "sänd flaggan -b till git-mailinfo"

2553 +

2554 +#: builtin/am.c:2217

2555 +msgid "pass -m flag to git-mailinfo"

2556 +msgstr "sänd flaggan -m till git-mailinfo"

2557 +

2558 +#: builtin/am.c:2219

2559 +msgid "pass --keep-cr flag to git-mailsplit for mbox format"

2560 +msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"

2561 +

2562 +#: builtin/am.c:2222

2563 +msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

2564 +msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"

2565 +

2566 +#: builtin/am.c:2225

2567 +msgid "strip everything before a scissors line"

2568 +msgstr "ta bort allting före en saxlinje"

2569 +

2570 +#: builtin/am.c:2226 builtin/apply.c:4563

2571 +msgid "action"

2572 +msgstr "åtgärd"

2573 +

2574 +#: builtin/am.c:2227 builtin/am.c:2230 builtin/am.c:2233 builtin/am.c:2236

2575 +#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248

2576 +#: builtin/am.c:2254

2577 +msgid "pass it through git-apply"

2578 +msgstr "sänd det genom git-apply"

2579 +

2580 +#: builtin/am.c:2235 builtin/apply.c:4587

2581 +msgid "root"

2582 +msgstr "rot"

2583 +

2584 +#: builtin/am.c:2238 builtin/am.c:2241 builtin/apply.c:4525

2585 +#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93

2586 +#: builtin/pull.c:167

2587 +msgid "path"

2588 +msgstr "sökväg"

2589 +

2590 +#: builtin/am.c:2244 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672

2591 +#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127

2592 +#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664

2593 +#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132

2594 +#: parse-options.h:134 parse-options.h:243

2595 +msgid "n"

2596 +msgstr "n"

2597 +

2598 +#: builtin/am.c:2247 builtin/apply.c:4531

2599 +msgid "num"

2600 +msgstr "antal"

2601 +

2602 +#: builtin/am.c:2250 builtin/for-each-ref.c:34 builtin/replace.c:438

2603 +msgid "format"

2604 +msgstr "format"

2605 +

2606 +#: builtin/am.c:2251

2607 +msgid "format the patch(es) are in"

2608 +msgstr "format för patch(ar)"

2609 +

2610 +#: builtin/am.c:2257

2611 +msgid "override error message when patch failure occurs"

2612 +msgstr "överstyr felmeddelanden när patchfel uppstår"

2613 +

2614 +#: builtin/am.c:2259

2615 +msgid "continue applying patches after resolving a conflict"

2616 +msgstr "fortsätt applicera patchar efter att ha löst en konflikt"

2617 +

2618 +#: builtin/am.c:2262

2619 +msgid "synonyms for --continue"

2620 +msgstr "synonymer till --continue"

2621 +

2622 +#: builtin/am.c:2265

2623 +msgid "skip the current patch"

2624 +msgstr "hoppa över den aktuella grenen"

2625 +

2626 +#: builtin/am.c:2268

2627 +msgid "restore the original branch and abort the patching operation."

2628 +msgstr "återställ originalgrenen och avbryt patchningen."

2629 +

2630 +#: builtin/am.c:2272

2631 +msgid "lie about committer date"

2632 +msgstr "ljug om incheckningsdatum"

2633 +

2634 +#: builtin/am.c:2274

2635 +msgid "use current timestamp for author date"

2636 +msgstr "använd nuvarande tidsstämpel för författardatum"

2637 +

2638 +#: builtin/am.c:2276 builtin/commit.c:1590 builtin/merge.c:225

2639 +#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606

2640 +msgid "key-id"

2641 +msgstr "nyckel-id"

2642 +

2643 +#: builtin/am.c:2277

2644 +msgid "GPG-sign commits"

2645 +msgstr "GPG-signera incheckningar"

2646 +

2647 +#: builtin/am.c:2280

2648 +msgid "(internal use for git-rebase)"

2649 +msgstr "(används internt av git-rebase)"

2650 +

2651 +#: builtin/am.c:2295

2652 +msgid ""

2653 +"The -b/--binary option has been a no-op for long time, and\n"

2654 +"it will be removed. Please do not use it anymore."

2655 +msgstr ""

2656 +"Flaggan -b/--binary har varit utan funktion länge, och\n"

2657 +"kommer tas bort. Vi ber dig att inte använda den längre."

2658 +

2659 +#: builtin/am.c:2302

2660 +msgid "failed to read the index"

2661 +msgstr "misslyckades läsa indexet"

2662 +

2663 +#: builtin/am.c:2317

2664 +#, c-format

2665 +msgid "previous rebase directory %s still exists but mbox given."

2666 +msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."

2667 +

2668 +#: builtin/am.c:2341

2669 +#, c-format

2670 +msgid ""

2671 +"Stray %s directory found.\n"

2672 +"Use \"git am --abort\" to remove it."

2673 +msgstr ""

2674 +"Kvarbliven katalog %s hittades.\n"

2675 +"Använd \"git am --abort\" för att ta bort den."

2676 +

2677 +#: builtin/am.c:2347

2678 +msgid "Resolve operation not in progress, we are not resuming."

2679 +msgstr "Lösningsoperation pågår inte, vi återupptar inte."

2680 +

2681 #: builtin/apply.c:59

2682 msgid "git apply [<options>] [<patch>...]"

2683 msgstr "git apply [<flaggor>] [<patch>...]"

@@ -2438,7 +2941,7 @@ msgstr "%s: patchen kan inte tillämpas"

2941 msgid "Checking patch %s..."

2942 msgstr "Kontrollerar patchen %s..."

2943

2441 -#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135

2944 +#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135

2945 #, c-format

2946 msgid "make_cache_entry failed for path '%s'"

2947 msgstr "make_cache_entry misslyckades för sökvägen \"%s\""

@@ -2517,11 +3020,6 @@ msgstr "indata känns inte igen"

3020 msgid "unable to read index file"

3021 msgstr "kan inte läsa indexfilen"

3022

2520 -#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85

2521 -#: builtin/fetch.c:92

2522 -msgid "path"

2523 -msgstr "sökväg"

2524 -

3023 #: builtin/apply.c:4526

3024 msgid "don't apply changes matching the given path"

3025 msgstr "tillämpa inte ändringar som motsvarar given sökväg"

@@ -2530,10 +3028,6 @@ msgstr "tillämpa inte ändringar som motsvarar given sökväg"

3028 msgid "apply changes matching the given path"

3029 msgstr "tillämpa ändringar som motsvarar given sökväg"

3030

2533 -#: builtin/apply.c:4531

2534 -msgid "num"

2535 -msgstr "antal"

2536 -

3031 #: builtin/apply.c:4532

3032 msgid "remove <num> leading slashes from traditional diff paths"

3033 msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"

@@ -2590,10 +3084,6 @@ msgstr "sökvägar avdelas med NUL-tecken"

3084 msgid "ensure at least <n> lines of context match"

3085 msgstr "se till att åtminstone <n> rader sammanhang är lika"

3086

2593 -#: builtin/apply.c:4563

2594 -msgid "action"

2595 -msgstr "åtgärd"

2596 -

3087 #: builtin/apply.c:4564

3088 msgid "detect new or modified lines that have whitespace errors"

3089 msgstr "detektera nya eller ändrade rader som har fel i blanktecken"

@@ -2626,10 +3116,6 @@ msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

3116 msgid "do not trust the line counts in the hunk headers"

3117 msgstr "lite inte på antalet linjer i styckehuvuden"

3118

2629 -#: builtin/apply.c:4587

2630 -msgid "root"

2631 -msgstr "rot"

2632 -

3119 #: builtin/apply.c:4588

3120 msgid "prepend <root> to all filenames"

3121 msgstr "lägg till <rot> i alla filnamn"

@@ -2712,11 +3198,11 @@ msgstr "utför 'git bisect next'"

3198 msgid "update BISECT_HEAD instead of checking out the current commit"

3199 msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"

3200

2715 -#: builtin/blame.c:31

3201 +#: builtin/blame.c:32

3202 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

3203 msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"

3204

2719 -#: builtin/blame.c:36

3205 +#: builtin/blame.c:37

3206 msgid "<rev-opts> are documented in git-rev-list(1)"

3207 msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"

3208

@@ -2897,321 +3383,321 @@ msgstr "fjärrspårande grenen \"%s\" hittades inte."

3383 msgid "branch '%s' not found."

3384 msgstr "grenen \"%s\" hittades inte."

3385

2900 -#: builtin/branch.c:258

3386 +#: builtin/branch.c:259

3387 #, c-format

3388 msgid "Error deleting remote-tracking branch '%s'"

3389 msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""

3390

2905 -#: builtin/branch.c:259

3391 +#: builtin/branch.c:260

3392 #, c-format

3393 msgid "Error deleting branch '%s'"

3394 msgstr "Fel vid borttagning av grenen \"%s\""

3395

2910 -#: builtin/branch.c:266

3396 +#: builtin/branch.c:267

3397 #, c-format

3398 msgid "Deleted remote-tracking branch %s (was %s).\n"

3399 msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"

3400

2915 -#: builtin/branch.c:267

3401 +#: builtin/branch.c:268

3402 #, c-format

3403 msgid "Deleted branch %s (was %s).\n"

3404 msgstr "Tog bort grenen %s (var %s).\n"

3405

2920 -#: builtin/branch.c:368

3406 +#: builtin/branch.c:369

3407 #, c-format

3408 msgid "branch '%s' does not point at a commit"

3409 msgstr "grenen \"%s\" pekar inte på en incheckning"

3410

2925 -#: builtin/branch.c:451

3411 +#: builtin/branch.c:452

3412 #, c-format

3413 msgid "[%s: gone]"

3414 msgstr "[%s: försvunnen]"

3415

2930 -#: builtin/branch.c:456

3416 +#: builtin/branch.c:457

3417 #, c-format

3418 msgid "[%s]"

3419 msgstr "[%s]"

3420

2935 -#: builtin/branch.c:461

3421 +#: builtin/branch.c:462

3422 #, c-format

3423 msgid "[%s: behind %d]"

3424 msgstr "[%s: bakom %d] "

3425

2940 -#: builtin/branch.c:463

3426 +#: builtin/branch.c:464

3427 #, c-format

3428 msgid "[behind %d]"

3429 msgstr "[bakom %d] "

3430

2945 -#: builtin/branch.c:467

3431 +#: builtin/branch.c:468

3432 #, c-format

3433 msgid "[%s: ahead %d]"

3434 msgstr "[%s: före %d] "

3435

2950 -#: builtin/branch.c:469

3436 +#: builtin/branch.c:470

3437 #, c-format

3438 msgid "[ahead %d]"

3439 msgstr "[före %d] "

3440

2955 -#: builtin/branch.c:472

3441 +#: builtin/branch.c:473

3442 #, c-format

3443 msgid "[%s: ahead %d, behind %d]"

3444 msgstr "[%s: före %d, bakom %d] "

3445

2960 -#: builtin/branch.c:475

3446 +#: builtin/branch.c:476

3447 #, c-format

3448 msgid "[ahead %d, behind %d]"

3449 msgstr "[före %d, bakom %d] "

3450

2965 -#: builtin/branch.c:488

3451 +#: builtin/branch.c:489

3452 msgid " **** invalid ref ****"

3453 msgstr " **** ogiltig ref ****"

3454

2969 -#: builtin/branch.c:579

3455 +#: builtin/branch.c:580

3456 #, c-format

3457 msgid "(no branch, rebasing %s)"

3458 msgstr "(ingen gren, ombaserar %s)"

3459

2974 -#: builtin/branch.c:582

3460 +#: builtin/branch.c:583

3461 #, c-format

3462 msgid "(no branch, bisect started on %s)"

3463 msgstr "(ingen gren, \"bisect\" startad på %s)"

3464

2979 -#: builtin/branch.c:588

3465 +#: builtin/branch.c:589

3466 #, c-format

3467 msgid "(HEAD detached at %s)"

3468 msgstr "(HEAD frånkopplat vid %s)"

3469

2984 -#: builtin/branch.c:591

3470 +#: builtin/branch.c:592

3471 #, c-format

3472 msgid "(HEAD detached from %s)"

3473 msgstr "(HEAD frånkopplat från %s)"

3474

2989 -#: builtin/branch.c:595

3475 +#: builtin/branch.c:596

3476 msgid "(no branch)"

3477 msgstr "(ingen gren)"

3478

2993 -#: builtin/branch.c:642

3479 +#: builtin/branch.c:643

3480 #, c-format

3481 msgid "object '%s' does not point to a commit"

3482 msgstr "objektet \"%s\" pekar på en incheckning"

3483

2998 -#: builtin/branch.c:690

3484 +#: builtin/branch.c:691

3485 msgid "some refs could not be read"

3486 msgstr "vissa referenser kunde inte läsas"

3487

3002 -#: builtin/branch.c:703

3488 +#: builtin/branch.c:704

3489 msgid "cannot rename the current branch while not on any."

3490 msgstr ""

3491 "kunde inte byta namn på aktuell gren när du inte befinner dig på någon."

3492

3007 -#: builtin/branch.c:713

3493 +#: builtin/branch.c:714

3494 #, c-format

3495 msgid "Invalid branch name: '%s'"

3496 msgstr "Felaktigt namn på gren: \"%s\""

3497

3012 -#: builtin/branch.c:728

3498 +#: builtin/branch.c:729

3499 msgid "Branch rename failed"

3500 msgstr "Misslyckades byta namn på gren"

3501

3016 -#: builtin/branch.c:732

3502 +#: builtin/branch.c:733

3503 #, c-format

3504 msgid "Renamed a misnamed branch '%s' away"

3505 msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""

3506

3021 -#: builtin/branch.c:736

3507 +#: builtin/branch.c:737

3508 #, c-format

3509 msgid "Branch renamed to %s, but HEAD is not updated!"

3510 msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"

3511

3026 -#: builtin/branch.c:743

3512 +#: builtin/branch.c:744

3513 msgid "Branch is renamed, but update of config-file failed"

3514 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

3515

3030 -#: builtin/branch.c:758

3516 +#: builtin/branch.c:759

3517 #, c-format

3518 msgid "malformed object name %s"

3519 msgstr "felformat objektnamn %s"

3520

3035 -#: builtin/branch.c:780

3521 +#: builtin/branch.c:781

3522 #, c-format

3523 msgid "could not write branch description template: %s"

3524 msgstr "kunde inte skriva grenbeskrivningsmall: %s"

3525

3040 -#: builtin/branch.c:810

3526 +#: builtin/branch.c:811

3527 msgid "Generic options"

3528 msgstr "Allmänna flaggor"

3529

3044 -#: builtin/branch.c:812

3530 +#: builtin/branch.c:813

3531 msgid "show hash and subject, give twice for upstream branch"

3532 msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"

3533

3048 -#: builtin/branch.c:813

3534 +#: builtin/branch.c:814

3535 msgid "suppress informational messages"

3536 msgstr "undertryck informationsmeddelanden"

3537

3052 -#: builtin/branch.c:814

3538 +#: builtin/branch.c:815

3539 msgid "set up tracking mode (see git-pull(1))"

3540 msgstr "ställ in spårningsläge (se git-pull(1))"

3541

3056 -#: builtin/branch.c:816

3542 +#: builtin/branch.c:817

3543 msgid "change upstream info"

3544 msgstr "ändra uppströmsinformation"

3545

3060 -#: builtin/branch.c:820

3546 +#: builtin/branch.c:821

3547 msgid "use colored output"

3548 msgstr "använd färgad utdata"

3549

3064 -#: builtin/branch.c:821

3550 +#: builtin/branch.c:822

3551 msgid "act on remote-tracking branches"

3552 msgstr "arbeta på fjärrspårande grenar"

3553

3068 -#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851

3069 -#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582

3070 -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616

3071 -#: builtin/tag.c:622

3554 +#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852

3555 +#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581

3556 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618

3557 +#: builtin/tag.c:624

3558 msgid "commit"

3559 msgstr "incheckning"

3560

3075 -#: builtin/branch.c:825 builtin/branch.c:831

3561 +#: builtin/branch.c:826 builtin/branch.c:832

3562 msgid "print only branches that contain the commit"

3563 msgstr "visa endast grenar som innehåller incheckningen"

3564

3079 -#: builtin/branch.c:837

3565 +#: builtin/branch.c:838

3566 msgid "Specific git-branch actions:"

3567 msgstr "Specifika git-branch-åtgärder:"

3568

3083 -#: builtin/branch.c:838

3569 +#: builtin/branch.c:839

3570 msgid "list both remote-tracking and local branches"

3571 msgstr "visa både fjärrspårande och lokala grenar"

3572

3087 -#: builtin/branch.c:840

3573 +#: builtin/branch.c:841

3574 msgid "delete fully merged branch"

3575 msgstr "ta bort helt sammanslagen gren"

3576

3091 -#: builtin/branch.c:841

3577 +#: builtin/branch.c:842

3578 msgid "delete branch (even if not merged)"

3579 msgstr "ta bort gren (även om inte helt sammanslagen)"

3580

3095 -#: builtin/branch.c:842

3581 +#: builtin/branch.c:843

3582 msgid "move/rename a branch and its reflog"

3583 msgstr "flytta/ta bort en gren och dess reflogg"

3584

3099 -#: builtin/branch.c:843

3585 +#: builtin/branch.c:844

3586 msgid "move/rename a branch, even if target exists"

3587 msgstr "flytta/ta bort en gren, även om målet finns"

3588

3103 -#: builtin/branch.c:844

3589 +#: builtin/branch.c:845

3590 msgid "list branch names"

3591 msgstr "lista namn på grenar"

3592

3107 -#: builtin/branch.c:845

3593 +#: builtin/branch.c:846

3594 msgid "create the branch's reflog"

3595 msgstr "skapa grenens reflogg"

3596

3111 -#: builtin/branch.c:847

3597 +#: builtin/branch.c:848

3598 msgid "edit the description for the branch"

3599 msgstr "redigera beskrivning för grenen"

3600

3115 -#: builtin/branch.c:848

3601 +#: builtin/branch.c:849

3602 msgid "force creation, move/rename, deletion"

3603 msgstr "tvinga skapande, flytt/namnändring, borttagande"

3604

3119 -#: builtin/branch.c:851

3605 +#: builtin/branch.c:852

3606 msgid "print only not merged branches"

3607 msgstr "visa endast ej sammanslagna grenar"

3608

3123 -#: builtin/branch.c:857

3609 +#: builtin/branch.c:858

3610 msgid "print only merged branches"

3611 msgstr "visa endast sammanslagna grenar"

3612

3127 -#: builtin/branch.c:861

3613 +#: builtin/branch.c:862

3614 msgid "list branches in columns"

3615 msgstr "visa grenar i spalter"

3616

3131 -#: builtin/branch.c:874

3617 +#: builtin/branch.c:875

3618 msgid "Failed to resolve HEAD as a valid ref."

3619 msgstr "Misslyckades slå upp HEAD som giltig referens"

3620

3135 -#: builtin/branch.c:878 builtin/clone.c:622

3621 +#: builtin/branch.c:879 builtin/clone.c:690

3622 msgid "HEAD not found below refs/heads!"

3623 msgstr "HEAD hittades inte under refs/heads!"

3624

3139 -#: builtin/branch.c:900

3625 +#: builtin/branch.c:901

3626 msgid "--column and --verbose are incompatible"

3627 msgstr "--column och --verbose är inkompatibla"

3628

3143 -#: builtin/branch.c:911 builtin/branch.c:950

3629 +#: builtin/branch.c:912 builtin/branch.c:951

3630 msgid "branch name required"

3631 msgstr "grennamn krävs"

3632

3147 -#: builtin/branch.c:926

3633 +#: builtin/branch.c:927

3634 msgid "Cannot give description to detached HEAD"

3635 msgstr "Kan inte beskriva frånkopplad HEAD"

3636

3151 -#: builtin/branch.c:931

3637 +#: builtin/branch.c:932

3638 msgid "cannot edit description of more than one branch"

3639 msgstr "kan inte redigera beskrivning för mer än en gren"

3640

3155 -#: builtin/branch.c:938

3641 +#: builtin/branch.c:939

3642 #, c-format

3643 msgid "No commit on branch '%s' yet."

3644 msgstr "Inga incheckningar på grenen \"%s\" ännu"

3645

3160 -#: builtin/branch.c:941

3646 +#: builtin/branch.c:942

3647 #, c-format

3648 msgid "No branch named '%s'."

3649 msgstr "Ingen gren vid namnet \"%s\"."

3650

3165 -#: builtin/branch.c:956

3651 +#: builtin/branch.c:957

3652 msgid "too many branches for a rename operation"

3653 msgstr "för många grenar för namnbyte"

3654

3169 -#: builtin/branch.c:961

3655 +#: builtin/branch.c:962

3656 msgid "too many branches to set new upstream"

3657 msgstr "för många grenar för att byta uppström"

3658

3173 -#: builtin/branch.c:965

3659 +#: builtin/branch.c:966

3660 #, c-format

3661 msgid ""

3662 "could not set upstream of HEAD to %s when it does not point to any branch."

3663 msgstr ""

3664 "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."

3665

3180 -#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011

3666 +#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012

3667 #, c-format

3668 msgid "no such branch '%s'"

3669 msgstr "okänd gren \"%s\""

3670

3185 -#: builtin/branch.c:972

3671 +#: builtin/branch.c:973

3672 #, c-format

3673 msgid "branch '%s' does not exist"

3674 msgstr "grenen \"%s\" finns inte"

3675

3190 -#: builtin/branch.c:984

3676 +#: builtin/branch.c:985

3677 msgid "too many branches to unset upstream"

3678 msgstr "för många grenar för att ta bort uppström"

3679

3194 -#: builtin/branch.c:988

3680 +#: builtin/branch.c:989

3681 msgid "could not unset upstream of HEAD when it does not point to any branch."

3682 msgstr ""

3683 "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."

3684

3199 -#: builtin/branch.c:994

3685 +#: builtin/branch.c:995

3686 #, c-format

3687 msgid "Branch '%s' has no upstream information"

3688 msgstr "Grenen \"%s\" har ingen uppströmsinformation"

3689

3204 -#: builtin/branch.c:1008

3690 +#: builtin/branch.c:1009

3691 msgid "it does not make sense to create 'HEAD' manually"

3692 msgstr "kan inte skapa \"HEAD\" manuellt"

3693

3208 -#: builtin/branch.c:1014

3694 +#: builtin/branch.c:1015

3695 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

3696 msgstr ""

3697 "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "

3698 "grennamn"

3699

3214 -#: builtin/branch.c:1017

3700 +#: builtin/branch.c:1018

3701 #, c-format

3702 msgid ""

3703 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -3220,7 +3706,7 @@ msgstr ""

3706 "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "

3707 "eller --set-upstream-to\n"

3708

3223 -#: builtin/branch.c:1034

3709 +#: builtin/branch.c:1035

3710 #, c-format

3711 msgid ""

3712 "\n"

@@ -3231,12 +3717,12 @@ msgstr ""

3717 "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"

3718 "\n"

3719

3234 -#: builtin/branch.c:1035

3720 +#: builtin/branch.c:1036

3721 #, c-format

3722 msgid " git branch -d %s\n"

3723 msgstr " git branch -d %s\n"

3724

3239 -#: builtin/branch.c:1036

3725 +#: builtin/branch.c:1037

3726 #, c-format

3727 msgid " git branch --set-upstream-to %s\n"

3728 msgstr " git branch --set-upstream-to %s\n"

@@ -3254,7 +3740,7 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."

3740 msgid "Need a repository to unbundle."

3741 msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."

3742

3257 -#: builtin/cat-file.c:369

3743 +#: builtin/cat-file.c:428

3744 msgid ""

3745 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"

3746 "<type>|--textconv) <object>"

@@ -3262,54 +3748,62 @@ msgstr ""

3748 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"

3749 "<typ>|--textconv) <objekt>"

3750

3265 -#: builtin/cat-file.c:370

3751 +#: builtin/cat-file.c:429

3752 msgid ""

3753 "git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"

3754 "objects>"

3755 msgstr ""

3756 "git cat-file (--batch | --batch-check) [--follow-symlinks] < <objektlista>"

3757

3272 -#: builtin/cat-file.c:407

3758 +#: builtin/cat-file.c:466

3759 msgid "<type> can be one of: blob, tree, commit, tag"

3760 msgstr "<typ> kan vara en av: blob, tree, commit, tag"

3761

3276 -#: builtin/cat-file.c:408

3762 +#: builtin/cat-file.c:467

3763 msgid "show object type"

3764 msgstr "visa objekttyp"

3765

3280 -#: builtin/cat-file.c:409

3766 +#: builtin/cat-file.c:468

3767 msgid "show object size"

3768 msgstr "visa objektstorlek"

3769

3284 -#: builtin/cat-file.c:411

3770 +#: builtin/cat-file.c:470

3771 msgid "exit with zero when there's no error"

3772 msgstr "avsluta med noll när det inte uppstått något fel"

3773

3288 -#: builtin/cat-file.c:412

3774 +#: builtin/cat-file.c:471

3775 msgid "pretty-print object's content"

3776 msgstr "visa objektets innehåll snyggt"

3777

3292 -#: builtin/cat-file.c:414

3778 +#: builtin/cat-file.c:473

3779 msgid "for blob objects, run textconv on object's content"

3780 msgstr "för blob-objekt, kör textconv på objektets innehåll"

3781

3296 -#: builtin/cat-file.c:416

3782 +#: builtin/cat-file.c:475

3783 msgid "allow -s and -t to work with broken/corrupt objects"

3784 msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt"

3785

3300 -#: builtin/cat-file.c:418

3786 +#: builtin/cat-file.c:476

3787 +msgid "buffer --batch output"

3788 +msgstr "buffra utdata från --batch"

3789 +

3790 +#: builtin/cat-file.c:478

3791 msgid "show info and content of objects fed from the standard input"

3792 msgstr "visa information och innehåll för objekt som listas på standard in"

3793

3304 -#: builtin/cat-file.c:421

3794 +#: builtin/cat-file.c:481

3795 msgid "show info about objects fed from the standard input"

3796 msgstr "visa information för objekt som listas på standard in"

3797

3308 -#: builtin/cat-file.c:424

3798 +#: builtin/cat-file.c:484

3799 msgid "follow in-tree symlinks (used with --batch or --batch-check)"

3800 msgstr ""

3801 "följ symboliska länkar i trädet (använd med --batch eller --batch-check)"

3802

3803 +#: builtin/cat-file.c:486

3804 +msgid "show all objects with --batch or --batch-check"

3805 +msgstr "visa alla objekt med --batch eller --batch-check"

3806 +

3807 #: builtin/check-attr.c:11

3808 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."

3809 msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..."

@@ -3334,7 +3828,7 @@ msgstr "läs filnamn från standard in"

3828 msgid "terminate input and output records by a NUL character"

3829 msgstr "avsluta in- och utdataposter med NUL-tecken"

3830

3337 -#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279

3831 +#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267

3832 msgid "suppress progress reporting"

3833 msgstr "undertryck förloppsrapportering"

3834

@@ -3431,113 +3925,113 @@ msgstr "när filer skapas, lägg till <sträng> först"

3925 msgid "copy out the files from named stage"

3926 msgstr "kopiera ut filer från namngiven etapp"

3927

3434 -#: builtin/checkout.c:24

3928 +#: builtin/checkout.c:25

3929 msgid "git checkout [<options>] <branch>"

3930 msgstr "git checkout [<flaggor>] <gren>"

3931

3438 -#: builtin/checkout.c:25

3932 +#: builtin/checkout.c:26

3933 msgid "git checkout [<options>] [<branch>] -- <file>..."

3934 msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..."

3935

3442 -#: builtin/checkout.c:134 builtin/checkout.c:167

3936 +#: builtin/checkout.c:133 builtin/checkout.c:166

3937 #, c-format

3938 msgid "path '%s' does not have our version"

3939 msgstr "sökvägen \"%s\" har inte vår version"

3940

3447 -#: builtin/checkout.c:136 builtin/checkout.c:169

3941 +#: builtin/checkout.c:135 builtin/checkout.c:168

3942 #, c-format

3943 msgid "path '%s' does not have their version"

3944 msgstr "sökvägen \"%s\" har inte deras version"

3945

3452 -#: builtin/checkout.c:152

3946 +#: builtin/checkout.c:151

3947 #, c-format

3948 msgid "path '%s' does not have all necessary versions"

3949 msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"

3950

3457 -#: builtin/checkout.c:196

3951 +#: builtin/checkout.c:195

3952 #, c-format

3953 msgid "path '%s' does not have necessary versions"

3954 msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"

3955

3462 -#: builtin/checkout.c:213

3956 +#: builtin/checkout.c:212

3957 #, c-format

3958 msgid "path '%s': cannot merge"

3959 msgstr "sökväg \"%s\": kan inte slå ihop"

3960

3467 -#: builtin/checkout.c:230

3961 +#: builtin/checkout.c:229

3962 #, c-format

3963 msgid "Unable to add merge result for '%s'"

3964 msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""

3965

3472 -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257

3473 -#: builtin/checkout.c:260

3966 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

3967 +#: builtin/checkout.c:259

3968 #, c-format

3969 msgid "'%s' cannot be used with updating paths"

3970 msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"

3971

3478 -#: builtin/checkout.c:263 builtin/checkout.c:266

3972 +#: builtin/checkout.c:262 builtin/checkout.c:265

3973 #, c-format

3974 msgid "'%s' cannot be used with %s"

3975 msgstr "\"%s\" kan inte användas med %s"

3976

3483 -#: builtin/checkout.c:269

3977 +#: builtin/checkout.c:268

3978 #, c-format

3979 msgid "Cannot update paths and switch to branch '%s' at the same time."

3980 msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."

3981

3488 -#: builtin/checkout.c:280 builtin/checkout.c:474

3982 +#: builtin/checkout.c:279 builtin/checkout.c:473

3983 msgid "corrupt index file"

3984 msgstr "indexfilen är trasig"

3985

3492 -#: builtin/checkout.c:340 builtin/checkout.c:347

3986 +#: builtin/checkout.c:339 builtin/checkout.c:346

3987 #, c-format

3988 msgid "path '%s' is unmerged"

3989 msgstr "sökvägen \"%s\" har inte slagits ihop"

3990

3497 -#: builtin/checkout.c:496

3991 +#: builtin/checkout.c:495

3992 msgid "you need to resolve your current index first"

3993 msgstr "du måste lösa ditt befintliga index först"

3994

3501 -#: builtin/checkout.c:627

3995 +#: builtin/checkout.c:622

3996 #, c-format

3503 -msgid "Can not do reflog for '%s'\n"

3504 -msgstr "Kan inte skapa referenslog för \"%s\"\n"

3997 +msgid "Can not do reflog for '%s': %s\n"

3998 +msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"

3999

3506 -#: builtin/checkout.c:663

4000 +#: builtin/checkout.c:660

4001 msgid "HEAD is now at"

4002 msgstr "HEAD är nu på"

4003

3510 -#: builtin/checkout.c:670

4004 +#: builtin/checkout.c:667

4005 #, c-format

4006 msgid "Reset branch '%s'\n"

4007 msgstr "Återställ gren \"%s\"\n"

4008

3515 -#: builtin/checkout.c:673

4009 +#: builtin/checkout.c:670

4010 #, c-format

4011 msgid "Already on '%s'\n"

4012 msgstr "Redan på \"%s\"\n"

4013

3520 -#: builtin/checkout.c:677

4014 +#: builtin/checkout.c:674

4015 #, c-format

4016 msgid "Switched to and reset branch '%s'\n"

4017 msgstr "Växlade till och nollställde grenen \"%s\"\n"

4018

3525 -#: builtin/checkout.c:679 builtin/checkout.c:1134

4019 +#: builtin/checkout.c:676 builtin/checkout.c:1065

4020 #, c-format

4021 msgid "Switched to a new branch '%s'\n"

4022 msgstr "Växlade till en ny gren \"%s\"\n"

4023

3530 -#: builtin/checkout.c:681

4024 +#: builtin/checkout.c:678

4025 #, c-format

4026 msgid "Switched to branch '%s'\n"

4027 msgstr "Växlade till grenen \"%s\"\n"

4028

3535 -#: builtin/checkout.c:733

4029 +#: builtin/checkout.c:730

4030 #, c-format

4031 msgid " ... and %d more.\n"

4032 msgstr " ... och %d till.\n"

4033

3540 -#: builtin/checkout.c:739

4034 +#: builtin/checkout.c:736

4035 #, c-format

4036 msgid ""

4037 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3560,7 +4054,7 @@ msgstr[1] ""

4054 "\n"

4055 "%s\n"

4056

3563 -#: builtin/checkout.c:758

4057 +#: builtin/checkout.c:755

4058 #, c-format

4059 msgid ""

4060 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -3587,150 +4081,145 @@ msgstr[1] ""

4081 " git branch <nytt_grennamn> %s\n"

4082 "\n"

4083

3590 -#: builtin/checkout.c:794

4084 +#: builtin/checkout.c:791

4085 msgid "internal error in revision walk"

4086 msgstr "internt fel vid genomgång av revisioner (revision walk)"

4087

3594 -#: builtin/checkout.c:798

4088 +#: builtin/checkout.c:795

4089 msgid "Previous HEAD position was"

4090 msgstr "Tidigare position för HEAD var"

4091

3598 -#: builtin/checkout.c:825 builtin/checkout.c:1129

4092 +#: builtin/checkout.c:822 builtin/checkout.c:1060

4093 msgid "You are on a branch yet to be born"

4094 msgstr "Du är på en gren som ännu inte är född"

4095

3602 -#: builtin/checkout.c:931

3603 -#, c-format

3604 -msgid "'%s' is already checked out at '%s'"

3605 -msgstr "\"%s\" är redan utcheckad på \"%s\""

3606 -

3607 -#: builtin/checkout.c:1036

4096 +#: builtin/checkout.c:967

4097 #, c-format

4098 msgid "only one reference expected, %d given."

4099 msgstr "endast en referens förväntades, %d gavs."

4100

3612 -#: builtin/checkout.c:1075

4101 +#: builtin/checkout.c:1006 builtin/worktree.c:210

4102 #, c-format

4103 msgid "invalid reference: %s"

4104 msgstr "felaktig referens: %s"

4105

3617 -#: builtin/checkout.c:1104

4106 +#: builtin/checkout.c:1035

4107 #, c-format

4108 msgid "reference is not a tree: %s"

4109 msgstr "referensen är inte ett träd: %s"

4110

3622 -#: builtin/checkout.c:1143

4111 +#: builtin/checkout.c:1074

4112 msgid "paths cannot be used with switching branches"

4113 msgstr "sökvägar kan inte användas vid byte av gren"

4114

3626 -#: builtin/checkout.c:1146 builtin/checkout.c:1150

4115 +#: builtin/checkout.c:1077 builtin/checkout.c:1081

4116 #, c-format

4117 msgid "'%s' cannot be used with switching branches"

4118 msgstr "\"%s\" kan inte användas vid byte av gren"

4119

3631 -#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162

3632 -#: builtin/checkout.c:1165

4120 +#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093

4121 +#: builtin/checkout.c:1096

4122 #, c-format

4123 msgid "'%s' cannot be used with '%s'"

4124 msgstr "\"%s\" kan inte användas med \"%s\""

4125

3637 -#: builtin/checkout.c:1170

4126 +#: builtin/checkout.c:1101

4127 #, c-format

4128 msgid "Cannot switch branch to a non-commit '%s'"

4129 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""

4130

3642 -#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83

3643 -#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282

3644 -#: builtin/worktree.c:284

4131 +#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83

4132 +#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317

4133 +#: builtin/worktree.c:319

4134 msgid "branch"

4135 msgstr "gren"

4136

3648 -#: builtin/checkout.c:1204

4137 +#: builtin/checkout.c:1135

4138 msgid "create and checkout a new branch"

4139 msgstr "skapa och checka ut en ny gren"

4140

3652 -#: builtin/checkout.c:1206

4141 +#: builtin/checkout.c:1137

4142 msgid "create/reset and checkout a branch"

4143 msgstr "skapa/nollställ och checka ut en gren"

4144

3656 -#: builtin/checkout.c:1207

4145 +#: builtin/checkout.c:1138

4146 msgid "create reflog for new branch"

4147 msgstr "skapa reflogg för ny gren"

4148

3660 -#: builtin/checkout.c:1208

4149 +#: builtin/checkout.c:1139

4150 msgid "detach the HEAD at named commit"

4151 msgstr "koppla från HEAD vid namngiven incheckning"

4152

3664 -#: builtin/checkout.c:1209

4153 +#: builtin/checkout.c:1140

4154 msgid "set upstream info for new branch"

4155 msgstr "sätt uppströmsinformation för ny gren"

4156

3668 -#: builtin/checkout.c:1211

4157 +#: builtin/checkout.c:1142

4158 msgid "new-branch"

4159 msgstr "ny-gren"

4160

3672 -#: builtin/checkout.c:1211

4161 +#: builtin/checkout.c:1142

4162 msgid "new unparented branch"

4163 msgstr "ny gren utan förälder"

4164

3676 -#: builtin/checkout.c:1212

4165 +#: builtin/checkout.c:1143

4166 msgid "checkout our version for unmerged files"

4167 msgstr "checka ut vår version för ej sammanslagna filer"

4168

3680 -#: builtin/checkout.c:1214

4169 +#: builtin/checkout.c:1145

4170 msgid "checkout their version for unmerged files"

4171 msgstr "checka ut deras version för ej sammanslagna filer"

4172

3684 -#: builtin/checkout.c:1216

4173 +#: builtin/checkout.c:1147

4174 msgid "force checkout (throw away local modifications)"

4175 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"

4176

3688 -#: builtin/checkout.c:1217

4177 +#: builtin/checkout.c:1148

4178 msgid "perform a 3-way merge with the new branch"

4179 msgstr "utför en 3-vägssammanslagning för den nya grenen"

4180

3692 -#: builtin/checkout.c:1218 builtin/merge.c:227

4181 +#: builtin/checkout.c:1149 builtin/merge.c:227

4182 msgid "update ignored files (default)"

4183 msgstr "uppdatera ignorerade filer (standard)"

4184

3696 -#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244

4185 +#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249

4186 msgid "style"

4187 msgstr "stil"

4188

3700 -#: builtin/checkout.c:1220

4189 +#: builtin/checkout.c:1151

4190 msgid "conflict style (merge or diff3)"

4191 msgstr "konfliktstil (merge eller diff3)"

4192

3704 -#: builtin/checkout.c:1223

4193 +#: builtin/checkout.c:1154

4194 msgid "do not limit pathspecs to sparse entries only"

4195 msgstr "begränsa inte sökvägar till endast glesa poster"

4196

3708 -#: builtin/checkout.c:1225

4197 +#: builtin/checkout.c:1156

4198 msgid "second guess 'git checkout <no-such-branch>'"

4199 msgstr "förutspå \"git checkout <gren-saknas>\""

4200

3712 -#: builtin/checkout.c:1227

4201 +#: builtin/checkout.c:1158

4202 msgid "do not check if another worktree is holding the given ref"

4203 msgstr ""

4204 "kontrollera inte om en annan arbetskatalog håller den angivna referensen"

4205

3717 -#: builtin/checkout.c:1252

4206 +#: builtin/checkout.c:1181

4207 msgid "-b, -B and --orphan are mutually exclusive"

4208 msgstr "-b, -B och --orphan är ömsesidigt uteslutande"

4209

3721 -#: builtin/checkout.c:1269

4210 +#: builtin/checkout.c:1198

4211 msgid "--track needs a branch name"

4212 msgstr "--track behöver ett namn på en gren"

4213

3725 -#: builtin/checkout.c:1274

4214 +#: builtin/checkout.c:1203

4215 msgid "Missing branch name; try -b"

4216 msgstr "Grennamn saknas; försök med -b"

4217

3729 -#: builtin/checkout.c:1310

4218 +#: builtin/checkout.c:1239

4219 msgid "invalid path specification"

4220 msgstr "felaktig sökvägsangivelse"

4221

3733 -#: builtin/checkout.c:1317

4222 +#: builtin/checkout.c:1246

4223 #, c-format

4224 msgid ""

4225 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3739,12 +4228,12 @@ msgstr ""

4228 "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"

4229 "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"

4230

3742 -#: builtin/checkout.c:1322

4231 +#: builtin/checkout.c:1251

4232 #, c-format

4233 msgid "git checkout: --detach does not take a path argument '%s'"

4234 msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""

4235

3747 -#: builtin/checkout.c:1326

4236 +#: builtin/checkout.c:1255

4237 msgid ""

4238 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

4239 "checking out of the index."

@@ -3752,39 +4241,39 @@ msgstr ""

4241 "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"

4242 "du checkar ut från indexet."

4243

3755 -#: builtin/clean.c:26

4244 +#: builtin/clean.c:25

4245 msgid ""

4246 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."

4247 msgstr ""

4248 "git clean [-d] [-f] [-i] [-n] [-q] [-e <mönster>] [-x | -X] [--] "

4249 "<sökvägar>..."

4250

3762 -#: builtin/clean.c:30

4251 +#: builtin/clean.c:29

4252 #, c-format

4253 msgid "Removing %s\n"

4254 msgstr "Tar bort %s\n"

4255

3767 -#: builtin/clean.c:31

4256 +#: builtin/clean.c:30

4257 #, c-format

4258 msgid "Would remove %s\n"

4259 msgstr "Skulle ta bort %s\n"

4260

3772 -#: builtin/clean.c:32

4261 +#: builtin/clean.c:31

4262 #, c-format

4263 msgid "Skipping repository %s\n"

4264 msgstr "Hoppar över arkivet %s\n"

4265

3777 -#: builtin/clean.c:33

4266 +#: builtin/clean.c:32

4267 #, c-format

4268 msgid "Would skip repository %s\n"

4269 msgstr "Skulle hoppa över arkivet %s\n"

4270

3782 -#: builtin/clean.c:34

4271 +#: builtin/clean.c:33

4272 #, c-format

4273 msgid "failed to remove %s"

4274 msgstr "misslyckades ta bort %s"

4275

3787 -#: builtin/clean.c:295

4276 +#: builtin/clean.c:317

4277 msgid ""

4278 "Prompt help:\n"

4279 "1 - select a numbered item\n"

@@ -3796,7 +4285,7 @@ msgstr ""

4285 "foo - markera post baserad på unikt prefix\n"

4286 " - (tomt) markera ingenting"

4287

3799 -#: builtin/clean.c:299

4288 +#: builtin/clean.c:321

4289 msgid ""

4290 "Prompt help:\n"

4291 "1 - select a single item\n"

@@ -3816,36 +4305,36 @@ msgstr ""

4305 "* - välj alla poster\n"

4306 " - (tomt) avsluta markering"

4307

3819 -#: builtin/clean.c:515

4308 +#: builtin/clean.c:537

4309 #, c-format

4310 msgid "Huh (%s)?"

4311 msgstr "Vadå (%s)?"

4312

3824 -#: builtin/clean.c:657

4313 +#: builtin/clean.c:679

4314 #, c-format

4315 msgid "Input ignore patterns>> "

4316 msgstr "Ange ignoreringsmönster>>"

4317

3829 -#: builtin/clean.c:694

4318 +#: builtin/clean.c:716

4319 #, c-format

4320 msgid "WARNING: Cannot find items matched by: %s"

4321 msgstr "VARNING: Hittar inte poster som motsvarar: %s"

4322

3834 -#: builtin/clean.c:715

4323 +#: builtin/clean.c:737

4324 msgid "Select items to delete"

4325 msgstr "Välj poster att ta bort"

4326

4327 #. TRANSLATORS: Make sure to keep [y/N] as is

3839 -#: builtin/clean.c:756

4328 +#: builtin/clean.c:778

4329 #, c-format

4330 msgid "Remove %s [y/N]? "

4331 msgstr "Ta bort %s [Y=ja / N=nej]?"

4332

3844 -#: builtin/clean.c:781

4333 +#: builtin/clean.c:803

4334 msgid "Bye."

4335 msgstr "Hej då."

4336

3848 -#: builtin/clean.c:789

4337 +#: builtin/clean.c:811

4338 msgid ""

4339 "clean - start cleaning\n"

4340 "filter by pattern - exclude items from deletion\n"

@@ -3863,62 +4352,62 @@ msgstr ""

4352 "help - denna skärm\n"

4353 "? - hjälp för kommandoval"

4354

3866 -#: builtin/clean.c:816

4355 +#: builtin/clean.c:838

4356 msgid "*** Commands ***"

4357 msgstr "*** Kommandon ***"

4358

3870 -#: builtin/clean.c:817

4359 +#: builtin/clean.c:839

4360 msgid "What now"

4361 msgstr "Vad nu"

4362

3874 -#: builtin/clean.c:825

4363 +#: builtin/clean.c:847

4364 msgid "Would remove the following item:"

4365 msgid_plural "Would remove the following items:"

4366 msgstr[0] "Skulle ta bort följande post:"

4367 msgstr[1] "Skulle ta bort följande poster:"

4368

3880 -#: builtin/clean.c:842

4369 +#: builtin/clean.c:864

4370 msgid "No more files to clean, exiting."

4371 msgstr "Inga fler filer att städa, avslutar."

4372

3884 -#: builtin/clean.c:873

4373 +#: builtin/clean.c:895

4374 msgid "do not print names of files removed"

4375 msgstr "skriv inte ut namn på borttagna filer"

4376

3888 -#: builtin/clean.c:875

4377 +#: builtin/clean.c:897

4378 msgid "force"

4379 msgstr "tvinga"

4380

3892 -#: builtin/clean.c:876

4381 +#: builtin/clean.c:898

4382 msgid "interactive cleaning"

4383 msgstr "städa interaktivt"

4384

3896 -#: builtin/clean.c:878

4385 +#: builtin/clean.c:900

4386 msgid "remove whole directories"

4387 msgstr "ta bort hela kataloger"

4388

3900 -#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714

4389 +#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714

4390 #: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187

4391 msgid "pattern"

4392 msgstr "mönster"

4393

3905 -#: builtin/clean.c:880

4394 +#: builtin/clean.c:902

4395 msgid "add <pattern> to ignore rules"

4396 msgstr "lägg till <mönster> till ignoreringsregler"

4397

3909 -#: builtin/clean.c:881

4398 +#: builtin/clean.c:903

4399 msgid "remove ignored files, too"

4400 msgstr "ta även bort ignorerade filer"

4401

3913 -#: builtin/clean.c:883

4402 +#: builtin/clean.c:905

4403 msgid "remove only ignored files"

4404 msgstr "ta endast bort ignorerade filer"

4405

3917 -#: builtin/clean.c:901

4406 +#: builtin/clean.c:923

4407 msgid "-x and -X cannot be used together"

4408 msgstr "-x och -X kan inte användas samtidigt"

4409

3921 -#: builtin/clean.c:905

4410 +#: builtin/clean.c:927

4411 msgid ""

4412 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

4413 "clean"

@@ -3926,7 +4415,7 @@ msgstr ""

4415 "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "

4416 "städa"

4417

3929 -#: builtin/clean.c:908

4418 +#: builtin/clean.c:930

4419 msgid ""

4420 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

4421 "refusing to clean"

@@ -3938,8 +4427,8 @@ msgstr ""

4427 msgid "git clone [<options>] [--] <repo> [<dir>]"

4428 msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"

4429

3941 -#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224

3942 -#: builtin/push.c:523

4430 +#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224

4431 +#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168

4432 msgid "force progress reporting"

4433 msgstr "tvinga förloppsrapportering"

4434

@@ -3947,7 +4436,7 @@ msgstr "tvinga förloppsrapportering"

4436 msgid "don't create a checkout"

4437 msgstr "skapa inte någon utcheckning"

4438

3950 -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503

4439 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504

4440 msgid "create a bare repository"

4441 msgstr "skapa ett naket (\"bare\") arkiv"

4442

@@ -3971,11 +4460,11 @@ msgstr "skapa som ett delat arkiv"

4460 msgid "initialize submodules in the clone"

4461 msgstr "initiera undermoduler i klonen"

4462

3974 -#: builtin/clone.c:75 builtin/init-db.c:500

4463 +#: builtin/clone.c:75 builtin/init-db.c:501

4464 msgid "template-directory"

4465 msgstr "mallkatalog"

4466

3978 -#: builtin/clone.c:76 builtin/init-db.c:501

4467 +#: builtin/clone.c:76 builtin/init-db.c:502

4468 msgid "directory from which templates will be used"

4469 msgstr "katalog att använda mallar från"

4470

@@ -4003,7 +4492,8 @@ msgstr "checka ut <gren> istället för fjärrens HEAD"

4492 msgid "path to git-upload-pack on the remote"

4493 msgstr "sökväg till git-upload-pack på fjärren"

4494

4006 -#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659

4495 +#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659

4496 +#: builtin/pull.c:186

4497 msgid "depth"

4498 msgstr "djup"

4499

@@ -4015,11 +4505,11 @@ msgstr "skapa en grund klon på detta djup"

4505 msgid "clone only one branch, HEAD or --branch"

4506 msgstr "klona endast en gren, HEAD eller --branch"

4507

4018 -#: builtin/clone.c:91 builtin/init-db.c:509

4508 +#: builtin/clone.c:91 builtin/init-db.c:510

4509 msgid "gitdir"

4510 msgstr "gitkat"

4511

4022 -#: builtin/clone.c:92 builtin/init-db.c:510

4512 +#: builtin/clone.c:92 builtin/init-db.c:511

4513 msgid "separate git dir from working tree"

4514 msgstr "separera gitkatalogen från arbetskatalogen"

4515

@@ -4031,57 +4521,52 @@ msgstr "nyckel=värde"

4521 msgid "set config inside the new repository"

4522 msgstr "ställ in konfiguration i det nya arkivet"

4523

4034 -#: builtin/clone.c:240

4524 +#: builtin/clone.c:298

4525 #, c-format

4526 msgid "reference repository '%s' is not a local repository."

4527 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."

4528

4039 -#: builtin/clone.c:244

4529 +#: builtin/clone.c:302

4530 #, c-format

4531 msgid "reference repository '%s' is shallow"

4532 msgstr "referensarkivet \"%s\" är grunt"

4533

4044 -#: builtin/clone.c:247

4534 +#: builtin/clone.c:305

4535 #, c-format

4536 msgid "reference repository '%s' is grafted"

4537 msgstr "referensarkivet \"%s\" är ympat"

4538

4049 -#: builtin/clone.c:310

4050 -#, c-format

4051 -msgid "failed to create directory '%s'"

4052 -msgstr "misslyckades skapa katalogen \"%s\""

4053 -

4054 -#: builtin/clone.c:312 builtin/diff.c:84

4539 +#: builtin/clone.c:370 builtin/diff.c:84

4540 #, c-format

4541 msgid "failed to stat '%s'"

4542 msgstr "misslyckades ta status på \"%s\""

4543

4059 -#: builtin/clone.c:314

4544 +#: builtin/clone.c:372

4545 #, c-format

4546 msgid "%s exists and is not a directory"

4547 msgstr "%s finns och är ingen katalog"

4548

4064 -#: builtin/clone.c:328

4549 +#: builtin/clone.c:386

4550 #, c-format

4551 msgid "failed to stat %s\n"

4552 msgstr "misslyckades ta status på %s\n"

4553

4069 -#: builtin/clone.c:350

4554 +#: builtin/clone.c:408

4555 #, c-format

4556 msgid "failed to create link '%s'"

4557 msgstr "misslyckades skapa länken \"%s\""

4558

4074 -#: builtin/clone.c:354

4559 +#: builtin/clone.c:412

4560 #, c-format

4561 msgid "failed to copy file to '%s'"

4562 msgstr "misslyckades kopiera filen till \"%s\""

4563

4079 -#: builtin/clone.c:377 builtin/clone.c:551

4564 +#: builtin/clone.c:435 builtin/clone.c:619

4565 #, c-format

4566 msgid "done.\n"

4567 msgstr "klart.\n"

4568

4084 -#: builtin/clone.c:389

4569 +#: builtin/clone.c:447

4570 msgid ""

4571 "Clone succeeded, but checkout failed.\n"

4572 "You can inspect what was checked out with 'git status'\n"

@@ -4091,124 +4576,124 @@ msgstr ""

4576 "Du kan inspektera det som checkades ut med \"git status\"\n"

4577 "och försöka checka ut igen med \"git checkout -f HEAD\"\n"

4578

4094 -#: builtin/clone.c:466

4579 +#: builtin/clone.c:524

4580 #, c-format

4581 msgid "Could not find remote branch %s to clone."

4582 msgstr "Kunde inte hitta fjärrgrenen %s för att klona."

4583

4584 # Vague original, not networking-related, but rather related to the actual

4585 # objects downloaded.

4101 -#: builtin/clone.c:546

4586 +#: builtin/clone.c:614

4587 #, c-format

4588 msgid "Checking connectivity... "

4589 msgstr "Kontrollerar om vi fick alla objekt..."

4590

4106 -#: builtin/clone.c:549

4591 +#: builtin/clone.c:617

4592 msgid "remote did not send all necessary objects"

4593 msgstr "fjärren sände inte alla nödvändiga objekt"

4594

4110 -#: builtin/clone.c:613

4595 +#: builtin/clone.c:681

4596 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

4597 msgstr ""

4598 "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"

4599

4115 -#: builtin/clone.c:644

4600 +#: builtin/clone.c:712

4601 msgid "unable to checkout working tree"

4602 msgstr "kunde inte checka ut arbetskatalogen"

4603

4119 -#: builtin/clone.c:731

4604 +#: builtin/clone.c:799

4605 msgid "cannot repack to clean up"

4606 msgstr "kan inte packa om för att städa upp"

4607

4123 -#: builtin/clone.c:733

4608 +#: builtin/clone.c:801

4609 msgid "cannot unlink temporary alternates file"

4610 msgstr "kunde inte ta bort temporär \"alternates\"-fil"

4611

4127 -#: builtin/clone.c:763

4612 +#: builtin/clone.c:831

4613 msgid "Too many arguments."

4614 msgstr "För många argument."

4615

4131 -#: builtin/clone.c:767

4616 +#: builtin/clone.c:835

4617 msgid "You must specify a repository to clone."

4618 msgstr "Du måste ange ett arkiv att klona."

4619

4135 -#: builtin/clone.c:778

4620 +#: builtin/clone.c:846

4621 #, c-format

4622 msgid "--bare and --origin %s options are incompatible."

4623 msgstr "flaggorna --bare och --origin %s är inkompatibla."

4624

4140 -#: builtin/clone.c:781

4625 +#: builtin/clone.c:849

4626 msgid "--bare and --separate-git-dir are incompatible."

4627 msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."

4628

4144 -#: builtin/clone.c:794

4629 +#: builtin/clone.c:862

4630 #, c-format

4631 msgid "repository '%s' does not exist"

4632 msgstr "arkivet \"%s\" finns inte"

4633

4149 -#: builtin/clone.c:800 builtin/fetch.c:1160

4634 +#: builtin/clone.c:868 builtin/fetch.c:1168

4635 #, c-format

4636 msgid "depth %s is not a positive number"

4637 msgstr "djupet %s är inte ett positivt tal"

4638

4154 -#: builtin/clone.c:810

4639 +#: builtin/clone.c:878

4640 #, c-format

4641 msgid "destination path '%s' already exists and is not an empty directory."

4642 msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."

4643

4159 -#: builtin/clone.c:820

4644 +#: builtin/clone.c:888

4645 #, c-format

4646 msgid "working tree '%s' already exists."

4647 msgstr "arbetsträdet \"%s\" finns redan."

4648

4164 -#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193

4165 -#: builtin/worktree.c:220

4649 +#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218

4650 +#: builtin/worktree.c:245

4651 #, c-format

4652 msgid "could not create leading directories of '%s'"

4653 msgstr "kunde inte skapa inledande kataloger för \"%s\""

4654

4170 -#: builtin/clone.c:838

4655 +#: builtin/clone.c:906

4656 #, c-format

4657 msgid "could not create work tree dir '%s'"

4658 msgstr "kunde inte skapa arbetskatalogen \"%s\""

4659

4175 -#: builtin/clone.c:856

4660 +#: builtin/clone.c:924

4661 #, c-format

4662 msgid "Cloning into bare repository '%s'...\n"

4663 msgstr "Klonar till ett naket arkiv \"%s\"...\n"

4664

4180 -#: builtin/clone.c:858

4665 +#: builtin/clone.c:926

4666 #, c-format

4667 msgid "Cloning into '%s'...\n"

4668 msgstr "Klonar till \"%s\"...\n"

4669

4185 -#: builtin/clone.c:883

4670 +#: builtin/clone.c:951

4671 msgid "--dissociate given, but there is no --reference"

4672 msgstr "--dissociate angavs, men --reference har inte angivits"

4673

4189 -#: builtin/clone.c:900

4674 +#: builtin/clone.c:968

4675 msgid "--depth is ignored in local clones; use file:// instead."

4676 msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"

4677

4193 -#: builtin/clone.c:903

4678 +#: builtin/clone.c:971

4679 msgid "source repository is shallow, ignoring --local"

4680 msgstr "källarkivet är grunt, ignorerar --local"

4681

4197 -#: builtin/clone.c:908

4682 +#: builtin/clone.c:976

4683 msgid "--local is ignored"

4684 msgstr "--local ignoreras"

4685

4201 -#: builtin/clone.c:912

4686 +#: builtin/clone.c:980

4687 #, c-format

4688 msgid "Don't know how to clone %s"

4689 msgstr "Vet inte hur man klonar %s"

4690

4206 -#: builtin/clone.c:961 builtin/clone.c:969

4691 +#: builtin/clone.c:1029 builtin/clone.c:1037

4692 #, c-format

4693 msgid "Remote branch %s not found in upstream %s"

4694 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"

4695

4211 -#: builtin/clone.c:972

4696 +#: builtin/clone.c:1040

4697 msgid "You appear to have cloned an empty repository."

4698 msgstr "Du verkar ha klonat ett tomt arkiv."

4699

@@ -4352,66 +4837,62 @@ msgstr ""

4837 msgid "failed to unpack HEAD tree object"

4838 msgstr "misslyckades packa upp HEAD:s trädobjekt"

4839

4355 -#: builtin/commit.c:344

4840 +#: builtin/commit.c:345

4841 msgid "unable to create temporary index"

4842 msgstr "kunde inte skapa temporär indexfil"

4843

4359 -#: builtin/commit.c:350

4844 +#: builtin/commit.c:351

4845 msgid "interactive add failed"

4846 msgstr "interaktiv tilläggning misslyckades"

4847

4363 -#: builtin/commit.c:361

4364 -msgid "unable to write index file"

4365 -msgstr "kan inte skriva indexfil"

4366 -

4367 -#: builtin/commit.c:363

4848 +#: builtin/commit.c:364

4849 msgid "unable to update temporary index"

4850 msgstr "kan inte uppdatera temporärt index"

4851

4371 -#: builtin/commit.c:365

4852 +#: builtin/commit.c:366

4853 msgid "Failed to update main cache tree"

4854 msgstr "Misslyckades uppdatera huvud-cacheträdet"

4855

4375 -#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463

4856 +#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462

4857 msgid "unable to write new_index file"

4858 msgstr "kunde inte skriva filen new_index"

4859

4379 -#: builtin/commit.c:445

4860 +#: builtin/commit.c:444

4861 msgid "cannot do a partial commit during a merge."

4862 msgstr "kan inte utföra en delvis incheckning under en sammanslagning."

4863

4383 -#: builtin/commit.c:447

4864 +#: builtin/commit.c:446

4865 msgid "cannot do a partial commit during a cherry-pick."

4866 msgstr "kan inte utföra en delvis incheckning under en cherry-pick."

4867

4387 -#: builtin/commit.c:456

4868 +#: builtin/commit.c:455

4869 msgid "cannot read the index"

4870 msgstr "kan inte läsa indexet"

4871

4391 -#: builtin/commit.c:475

4872 +#: builtin/commit.c:474

4873 msgid "unable to write temporary index file"

4874 msgstr "kunde inte skriva temporär indexfil"

4875

4395 -#: builtin/commit.c:580

4876 +#: builtin/commit.c:579

4877 #, c-format

4878 msgid "commit '%s' lacks author header"

4879 msgstr "incheckningen \"%s\" saknar författarhuvud"

4880

4400 -#: builtin/commit.c:582

4881 +#: builtin/commit.c:581

4882 #, c-format

4883 msgid "commit '%s' has malformed author line"

4884 msgstr "incheckningen \"%s\" har felformaterat författarhuvud"

4885

4405 -#: builtin/commit.c:601

4886 +#: builtin/commit.c:600

4887 msgid "malformed --author parameter"

4888 msgstr "felformad \"--author\"-flagga"

4889

4409 -#: builtin/commit.c:609

4890 +#: builtin/commit.c:608

4891 #, c-format

4892 msgid "invalid date format: %s"

4893 msgstr "felaktigt datumformat: %s"

4894

4414 -#: builtin/commit.c:653

4895 +#: builtin/commit.c:652

4896 msgid ""

4897 "unable to select a comment character that is not used\n"

4898 "in the current commit message"

@@ -4419,43 +4900,38 @@ msgstr ""

4900 "kunde inte välja ett kommentarstecken som inte använts\n"

4901 "i det befintliga incheckningsmeddelandet"

4902

4422 -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080

4903 +#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079

4904 #, c-format

4905 msgid "could not lookup commit %s"

4906 msgstr "kunde inte slå upp incheckningen %s"

4907

4427 -#: builtin/commit.c:702 builtin/shortlog.c:273

4908 +#: builtin/commit.c:701 builtin/shortlog.c:273

4909 #, c-format

4910 msgid "(reading log message from standard input)\n"

4911 msgstr "(läser loggmeddelande från standard in)\n"

4912

4432 -#: builtin/commit.c:704

4913 +#: builtin/commit.c:703

4914 msgid "could not read log from standard input"

4915 msgstr "kunde inte läsa logg från standard in"

4916

4436 -#: builtin/commit.c:708

4917 +#: builtin/commit.c:707

4918 #, c-format

4919 msgid "could not read log file '%s'"

4920 msgstr "kunde inte läsa loggfilen \"%s\""

4921

4441 -#: builtin/commit.c:730

4922 +#: builtin/commit.c:729

4923 msgid "could not read MERGE_MSG"

4924 msgstr "kunde inte läsa MERGE_MSG"

4925

4445 -#: builtin/commit.c:734

4926 +#: builtin/commit.c:733

4927 msgid "could not read SQUASH_MSG"

4928 msgstr "kunde inte läsa SQUASH_MSG"

4929

4449 -#: builtin/commit.c:738 builtin/merge.c:1079

4450 -#, c-format

4451 -msgid "could not read '%s'"

4452 -msgstr "kunde inte läsa \"%s\""

4453 -

4454 -#: builtin/commit.c:785

4930 +#: builtin/commit.c:784

4931 msgid "could not write commit template"

4932 msgstr "kunde inte skriva incheckningsmall"

4933

4458 -#: builtin/commit.c:803

4934 +#: builtin/commit.c:802

4935 #, c-format

4936 msgid ""

4937 "\n"

@@ -4470,7 +4946,7 @@ msgstr ""

4946 "\t%s\n"

4947 "och försöker igen.\n"

4948

4473 -#: builtin/commit.c:808

4949 +#: builtin/commit.c:807

4950 #, c-format

4951 msgid ""

4952 "\n"

@@ -4485,7 +4961,7 @@ msgstr ""

4961 "\t%s\n"

4962 "och försöker igen.\n"

4963

4488 -#: builtin/commit.c:821

4964 +#: builtin/commit.c:820

4965 #, c-format

4966 msgid ""

4967 "Please enter the commit message for your changes. Lines starting\n"

@@ -4495,7 +4971,7 @@ msgstr ""

4971 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "

4972 "incheckningen.\n"

4973

4498 -#: builtin/commit.c:828

4974 +#: builtin/commit.c:827

4975 #, c-format

4976 msgid ""

4977 "Please enter the commit message for your changes. Lines starting\n"

@@ -4506,145 +4982,145 @@ msgstr ""

4982 "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"

4983 "Ett tomt meddelande avbryter incheckningen.\n"

4984

4509 -#: builtin/commit.c:848

4985 +#: builtin/commit.c:847

4986 #, c-format

4987 msgid "%sAuthor: %.*s <%.*s>"

4988 msgstr "%sFörfattare: %.*s <%.*s>"

4989

4514 -#: builtin/commit.c:856

4990 +#: builtin/commit.c:855

4991 #, c-format

4992 msgid "%sDate: %s"

4993 msgstr "%sDatum: %s"

4994

4519 -#: builtin/commit.c:863

4995 +#: builtin/commit.c:862

4996 #, c-format

4997 msgid "%sCommitter: %.*s <%.*s>"

4998 msgstr "%sIncheckare: %.*s <%.*s>"

4999

4524 -#: builtin/commit.c:881

5000 +#: builtin/commit.c:880

5001 msgid "Cannot read index"

5002 msgstr "Kan inte läsa indexet"

5003

4528 -#: builtin/commit.c:938

5004 +#: builtin/commit.c:937

5005 msgid "Error building trees"

5006 msgstr "Fel vid byggande av träd"

5007

4532 -#: builtin/commit.c:953 builtin/tag.c:495

5008 +#: builtin/commit.c:952 builtin/tag.c:495

5009 #, c-format

5010 msgid "Please supply the message using either -m or -F option.\n"

5011 msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"

5012

4537 -#: builtin/commit.c:1055

5013 +#: builtin/commit.c:1054

5014 #, c-format

5015 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

5016 msgstr ""

5017 "--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"

5018

4543 -#: builtin/commit.c:1070 builtin/commit.c:1310

5019 +#: builtin/commit.c:1069 builtin/commit.c:1309

5020 #, c-format

5021 msgid "Invalid untracked files mode '%s'"

5022 msgstr "Ogiltigt läge för ospårade filer: \"%s\""

5023

4548 -#: builtin/commit.c:1107

5024 +#: builtin/commit.c:1106

5025 msgid "--long and -z are incompatible"

5026 msgstr "--long och -z är inkompatibla"

5027

4552 -#: builtin/commit.c:1137

5028 +#: builtin/commit.c:1136

5029 msgid "Using both --reset-author and --author does not make sense"

5030 msgstr "Kan inte använda både --reset-author och --author"

5031

4556 -#: builtin/commit.c:1146

5032 +#: builtin/commit.c:1145

5033 msgid "You have nothing to amend."

5034 msgstr "Du har inget att utöka."

5035

4560 -#: builtin/commit.c:1149

5036 +#: builtin/commit.c:1148

5037 msgid "You are in the middle of a merge -- cannot amend."

5038 msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."

5039

4564 -#: builtin/commit.c:1151

5040 +#: builtin/commit.c:1150

5041 msgid "You are in the middle of a cherry-pick -- cannot amend."

5042 msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."

5043

4568 -#: builtin/commit.c:1154

5044 +#: builtin/commit.c:1153

5045 msgid "Options --squash and --fixup cannot be used together"

5046 msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"

5047

4572 -#: builtin/commit.c:1164

5048 +#: builtin/commit.c:1163

5049 msgid "Only one of -c/-C/-F/--fixup can be used."

5050 msgstr "Endast en av -c/-C/-F/--fixup kan användas."

5051

4576 -#: builtin/commit.c:1166

5052 +#: builtin/commit.c:1165

5053 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

5054 msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."

5055

4580 -#: builtin/commit.c:1174

5056 +#: builtin/commit.c:1173

5057 msgid "--reset-author can be used only with -C, -c or --amend."

5058 msgstr "--reset-author kan endast användas med -C, -c eller --amend."

5059

4584 -#: builtin/commit.c:1191

5060 +#: builtin/commit.c:1190

5061 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

5062 msgstr ""

5063 "Endast en av --include/--only/--all/--interactive/--patch kan användas."

5064

4589 -#: builtin/commit.c:1193

5065 +#: builtin/commit.c:1192

5066 msgid "No paths with --include/--only does not make sense."

5067 msgstr "Du måste ange sökvägar tillsammans med --include/--only."

5068

4593 -#: builtin/commit.c:1195

5069 +#: builtin/commit.c:1194

5070 msgid "Clever... amending the last one with dirty index."

5071 msgstr "Smart... utöka den senaste med smutsigt index."

5072

4597 -#: builtin/commit.c:1197

5073 +#: builtin/commit.c:1196

5074 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

5075 msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."

5076

4601 -#: builtin/commit.c:1209 builtin/tag.c:728

5077 +#: builtin/commit.c:1208 builtin/tag.c:730

5078 #, c-format

5079 msgid "Invalid cleanup mode %s"

5080 msgstr "Felaktigt städningsläge %s"

5081

4606 -#: builtin/commit.c:1214

5082 +#: builtin/commit.c:1213

5083 msgid "Paths with -a does not make sense."

5084 msgstr "Kan inte ange sökvägar med -a."

5085

4610 -#: builtin/commit.c:1324 builtin/commit.c:1603

5086 +#: builtin/commit.c:1323 builtin/commit.c:1602

5087 msgid "show status concisely"

5088 msgstr "visa koncis status"

5089

4614 -#: builtin/commit.c:1326 builtin/commit.c:1605

5090 +#: builtin/commit.c:1325 builtin/commit.c:1604

5091 msgid "show branch information"

5092 msgstr "visa information om gren"

5093

4618 -#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509

5094 +#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546

5095 msgid "machine-readable output"

5096 msgstr "maskinläsbar utdata"

5097

4622 -#: builtin/commit.c:1331 builtin/commit.c:1609

5098 +#: builtin/commit.c:1330 builtin/commit.c:1608

5099 msgid "show status in long format (default)"

5100 msgstr "visa status i långt format (standard)"

5101

4626 -#: builtin/commit.c:1334 builtin/commit.c:1612

5102 +#: builtin/commit.c:1333 builtin/commit.c:1611

5103 msgid "terminate entries with NUL"

5104 msgstr "terminera poster med NUL"

5105

4630 -#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980

4631 -#: builtin/fast-export.c:983 builtin/tag.c:603

5106 +#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981

5107 +#: builtin/fast-export.c:984 builtin/tag.c:604

5108 msgid "mode"

5109 msgstr "läge"

5110

4635 -#: builtin/commit.c:1337 builtin/commit.c:1615

5111 +#: builtin/commit.c:1336 builtin/commit.c:1614

5112 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

5113 msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"

5114

4639 -#: builtin/commit.c:1340

5115 +#: builtin/commit.c:1339

5116 msgid "show ignored files"

5117 msgstr "visa ignorerade filer"

5118

4643 -#: builtin/commit.c:1341 parse-options.h:152

5119 +#: builtin/commit.c:1340 parse-options.h:155

5120 msgid "when"

5121 msgstr "när"

5122

4647 -#: builtin/commit.c:1342

5123 +#: builtin/commit.c:1341

5124 msgid ""

5125 "ignore changes to submodules, optional when: all, dirty, untracked. "

5126 "(Default: all)"

@@ -4652,209 +5128,196 @@ msgstr ""

5128 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "

5129 "(Default: all)"

5130

4655 -#: builtin/commit.c:1344

5131 +#: builtin/commit.c:1343

5132 msgid "list untracked files in columns"

5133 msgstr "visa ospårade filer i spalter"

5134

4659 -#: builtin/commit.c:1430

5135 +#: builtin/commit.c:1429

5136 msgid "couldn't look up newly created commit"

5137 msgstr "kunde inte slå upp en precis skapad incheckning"

5138

4663 -#: builtin/commit.c:1432

5139 +#: builtin/commit.c:1431

5140 msgid "could not parse newly created commit"

5141 msgstr "kunde inte tolka en precis skapad incheckning"

5142

4667 -#: builtin/commit.c:1477

5143 +#: builtin/commit.c:1476

5144 msgid "detached HEAD"

5145 msgstr "frånkopplad HEAD"

5146

4671 -#: builtin/commit.c:1480

5147 +#: builtin/commit.c:1479

5148 msgid " (root-commit)"

5149 msgstr " (rotincheckning)"

5150

4675 -#: builtin/commit.c:1573

5151 +#: builtin/commit.c:1572

5152 msgid "suppress summary after successful commit"

5153 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

5154

4679 -#: builtin/commit.c:1574

5155 +#: builtin/commit.c:1573

5156 msgid "show diff in commit message template"

5157 msgstr "visa diff i mallen för incheckningsmeddelandet"

5158

4683 -#: builtin/commit.c:1576

5159 +#: builtin/commit.c:1575

5160 msgid "Commit message options"

5161 msgstr "Alternativ för incheckningsmeddelande"

5162

4687 -#: builtin/commit.c:1577 builtin/tag.c:601

5163 +#: builtin/commit.c:1576 builtin/tag.c:602

5164 msgid "read message from file"

5165 msgstr "läs meddelande från fil"

5166

4691 -#: builtin/commit.c:1578

5167 +#: builtin/commit.c:1577

5168 msgid "author"

5169 msgstr "författare"

5170

4695 -#: builtin/commit.c:1578

5171 +#: builtin/commit.c:1577

5172 msgid "override author for commit"

5173 msgstr "överstyr författare för incheckningen"

5174

4699 -#: builtin/commit.c:1579 builtin/gc.c:280

5175 +#: builtin/commit.c:1578 builtin/gc.c:268

5176 msgid "date"

5177 msgstr "datum"

5178

4703 -#: builtin/commit.c:1579

5179 +#: builtin/commit.c:1578

5180 msgid "override date for commit"

5181 msgstr "överstyr datum för incheckningen"

5182

4707 -#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391

4708 -#: builtin/notes.c:554 builtin/tag.c:599

5183 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392

5184 +#: builtin/notes.c:555 builtin/tag.c:600

5185 msgid "message"

5186 msgstr "meddelande"

5187

4712 -#: builtin/commit.c:1580

5188 +#: builtin/commit.c:1579

5189 msgid "commit message"

5190 msgstr "incheckningsmeddelande"

5191

4716 -#: builtin/commit.c:1581

5192 +#: builtin/commit.c:1580

5193 msgid "reuse and edit message from specified commit"

5194 msgstr "återanvänd och redigera meddelande från angiven incheckning"

5195

4720 -#: builtin/commit.c:1582

5196 +#: builtin/commit.c:1581

5197 msgid "reuse message from specified commit"

5198 msgstr "återanvänd meddelande från angiven incheckning"

5199

4724 -#: builtin/commit.c:1583

5200 +#: builtin/commit.c:1582

5201 msgid "use autosquash formatted message to fixup specified commit"

5202 msgstr ""

5203 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"

5204

4729 -#: builtin/commit.c:1584

5205 +#: builtin/commit.c:1583

5206 msgid "use autosquash formatted message to squash specified commit"

5207 msgstr ""

5208 "använd autosquash-formaterat meddelande för att slå ihop med angiven "

5209 "incheckning"

5210

4735 -#: builtin/commit.c:1585

5211 +#: builtin/commit.c:1584

5212 msgid "the commit is authored by me now (used with -C/-c/--amend)"

5213 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"

5214

4739 -#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86

5215 +#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86

5216 msgid "add Signed-off-by:"

5217 msgstr "lägg till Signed-off-by:"

5218

4743 -#: builtin/commit.c:1587

5219 +#: builtin/commit.c:1586

5220 msgid "use specified template file"

5221 msgstr "använd angiven mallfil"

5222

4747 -#: builtin/commit.c:1588

5223 +#: builtin/commit.c:1587

5224 msgid "force edit of commit"

5225 msgstr "tvinga redigering av incheckning"

5226

4751 -#: builtin/commit.c:1589

5227 +#: builtin/commit.c:1588

5228 msgid "default"

5229 msgstr "standard"

5230

4755 -#: builtin/commit.c:1589 builtin/tag.c:604

5231 +#: builtin/commit.c:1588 builtin/tag.c:605

5232 msgid "how to strip spaces and #comments from message"

5233 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

5234

4759 -#: builtin/commit.c:1590

5235 +#: builtin/commit.c:1589

5236 msgid "include status in commit message template"

5237 msgstr "inkludera status i mallen för incheckningsmeddelandet"

5238

4763 -#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92

4764 -#: builtin/tag.c:605

4765 -msgid "key-id"

4766 -msgstr "nyckel-id"

4767 -

4768 -#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93

5239 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156

5240 +#: builtin/revert.c:93

5241 msgid "GPG sign commit"

5242 msgstr "GPG-signera incheckning"

5243

4772 -#: builtin/commit.c:1595

5244 +#: builtin/commit.c:1594

5245 msgid "Commit contents options"

5246 msgstr "Alternativ för incheckningens innehåll"

5247

4776 -#: builtin/commit.c:1596

5248 +#: builtin/commit.c:1595

5249 msgid "commit all changed files"

5250 msgstr "checka in alla ändrade filer"

5251

4780 -#: builtin/commit.c:1597

5252 +#: builtin/commit.c:1596

5253 msgid "add specified files to index for commit"

5254 msgstr "lägg till angivna filer till indexet för incheckning"

5255

4784 -#: builtin/commit.c:1598

5256 +#: builtin/commit.c:1597

5257 msgid "interactively add files"

5258 msgstr "lägg till filer interaktivt"

5259

4788 -#: builtin/commit.c:1599

5260 +#: builtin/commit.c:1598

5261 msgid "interactively add changes"

5262 msgstr "lägg till ändringar interaktivt"

5263

4792 -#: builtin/commit.c:1600

5264 +#: builtin/commit.c:1599

5265 msgid "commit only specified files"

5266 msgstr "checka endast in angivna filer"

5267

4796 -#: builtin/commit.c:1601

5268 +#: builtin/commit.c:1600

5269 msgid "bypass pre-commit hook"

5270 msgstr "förbigå pre-commit-krok"

5271

4800 -#: builtin/commit.c:1602

5272 +#: builtin/commit.c:1601

5273 msgid "show what would be committed"

5274 msgstr "visa vad som skulle checkas in"

5275

4804 -#: builtin/commit.c:1613

5276 +#: builtin/commit.c:1612

5277 msgid "amend previous commit"

5278 msgstr "lägg till föregående incheckning"

5279

4808 -#: builtin/commit.c:1614

5280 +#: builtin/commit.c:1613

5281 msgid "bypass post-rewrite hook"

5282 msgstr "förbigå post-rewrite-krok"

5283

4812 -#: builtin/commit.c:1619

5284 +#: builtin/commit.c:1618

5285 msgid "ok to record an empty change"

5286 msgstr "ok att registrera en tom ändring"

5287

4816 -#: builtin/commit.c:1621

5288 +#: builtin/commit.c:1620

5289 msgid "ok to record a change with an empty message"

5290 msgstr "ok att registrera en ändring med tomt meddelande"

5291

4820 -#: builtin/commit.c:1650

5292 +#: builtin/commit.c:1649

5293 msgid "could not parse HEAD commit"

5294 msgstr "kunde inte tolka HEAD:s incheckning"

5295

4824 -#: builtin/commit.c:1689 builtin/merge.c:1076

4825 -#, c-format

4826 -msgid "could not open '%s' for reading"

4827 -msgstr "kunde inte öppna \"%s\" för läsning"

4828 -

4829 -#: builtin/commit.c:1696

5296 +#: builtin/commit.c:1695

5297 #, c-format

5298 msgid "Corrupt MERGE_HEAD file (%s)"

5299 msgstr "Trasig MERGE_HEAD-fil (%s)"

5300

4834 -#: builtin/commit.c:1703

5301 +#: builtin/commit.c:1702

5302 msgid "could not read MERGE_MODE"

5303 msgstr "kunde inte läsa MERGE_MODE"

5304

4838 -#: builtin/commit.c:1722

5305 +#: builtin/commit.c:1721

5306 #, c-format

5307 msgid "could not read commit message: %s"

5308 msgstr "kunde inte läsa incheckningsmeddelande: %s"

5309

4843 -#: builtin/commit.c:1733

5310 +#: builtin/commit.c:1732

5311 #, c-format

5312 msgid "Aborting commit; you did not edit the message.\n"

5313 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

5314

4848 -#: builtin/commit.c:1738

5315 +#: builtin/commit.c:1737

5316 #, c-format

5317 msgid "Aborting commit due to empty commit message.\n"

5318 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"

5319

4853 -#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854

4854 -msgid "failed to write commit object"

4855 -msgstr "kunde inte skriva incheckningsobjekt"

4856 -

4857 -#: builtin/commit.c:1786

5320 +#: builtin/commit.c:1785

5321 msgid ""

5322 "Repository has been updated, but unable to write\n"

5323 "new_index file. Check that disk is not full and quota is\n"

@@ -4869,131 +5332,135 @@ msgstr ""

5332 msgid "git config [<options>]"

5333 msgstr "git config [<flaggor>]"

5334

4872 -#: builtin/config.c:53

5335 +#: builtin/config.c:54

5336 msgid "Config file location"

5337 msgstr "Konfigurationsfilens plats"

5338

4876 -#: builtin/config.c:54

5339 +#: builtin/config.c:55

5340 msgid "use global config file"

5341 msgstr "använd global konfigurationsfil"

5342

4880 -#: builtin/config.c:55

5343 +#: builtin/config.c:56

5344 msgid "use system config file"

5345 msgstr "använd systemets konfigurationsfil"

5346

4884 -#: builtin/config.c:56

5347 +#: builtin/config.c:57

5348 msgid "use repository config file"

5349 msgstr "använd arkivets konfigurationsfil"

5350

4888 -#: builtin/config.c:57

5351 +#: builtin/config.c:58

5352 msgid "use given config file"

5353 msgstr "använd angiven konfigurationsfil"

5354

4892 -#: builtin/config.c:58

5355 +#: builtin/config.c:59

5356 msgid "blob-id"

5357 msgstr "blob-id"

5358

4896 -#: builtin/config.c:58

5359 +#: builtin/config.c:59

5360 msgid "read config from given blob object"

5361 msgstr "läs konfiguration från givet blob-objekt"

5362

4900 -#: builtin/config.c:59

5363 +#: builtin/config.c:60

5364 msgid "Action"

5365 msgstr "Åtgärd"

5366

4904 -#: builtin/config.c:60

5367 +#: builtin/config.c:61

5368 msgid "get value: name [value-regex]"

5369 msgstr "hämta värde: namn [värde-reguttr]"

5370

4908 -#: builtin/config.c:61

5371 +#: builtin/config.c:62

5372 msgid "get all values: key [value-regex]"

5373 msgstr "hämta alla värden: nyckel [värde-reguttr]"

5374

4912 -#: builtin/config.c:62

5375 +#: builtin/config.c:63

5376 msgid "get values for regexp: name-regex [value-regex]"

5377 msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"

5378

4916 -#: builtin/config.c:63

5379 +#: builtin/config.c:64

5380 msgid "get value specific for the URL: section[.var] URL"

5381 msgstr "hämta värde specifikt URL:en: sektion[.var] URL"

5382

4920 -#: builtin/config.c:64

5383 +#: builtin/config.c:65

5384 msgid "replace all matching variables: name value [value_regex]"

5385 msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"

5386

4924 -#: builtin/config.c:65

5387 +#: builtin/config.c:66

5388 msgid "add a new variable: name value"

5389 msgstr "lägg till en ny variabel: namn värde"

5390

4928 -#: builtin/config.c:66

5391 +#: builtin/config.c:67

5392 msgid "remove a variable: name [value-regex]"

5393 msgstr "ta bort en variabel: namn [värde-reguttr]"

5394

4932 -#: builtin/config.c:67

5395 +#: builtin/config.c:68

5396 msgid "remove all matches: name [value-regex]"

5397 msgstr "ta bort alla träffar: namn [värde-reguttr]"

5398

4936 -#: builtin/config.c:68

5399 +#: builtin/config.c:69

5400 msgid "rename section: old-name new-name"

5401 msgstr "byt namn på sektion: gammalt-namn nytt-namn"

5402

4940 -#: builtin/config.c:69

5403 +#: builtin/config.c:70

5404 msgid "remove a section: name"

5405 msgstr "ta bort en sektion: namn"

5406

4944 -#: builtin/config.c:70

5407 +#: builtin/config.c:71

5408 msgid "list all"

5409 msgstr "visa alla"

5410

4948 -#: builtin/config.c:71

5411 +#: builtin/config.c:72

5412 msgid "open an editor"

5413 msgstr "öppna textredigeringsprogram"

5414

4952 -#: builtin/config.c:72

5415 +#: builtin/config.c:73

5416 msgid "find the color configured: slot [default]"

5417 msgstr "hitta den inställda färgen: slot [default]"

5418

4956 -#: builtin/config.c:73

5419 +#: builtin/config.c:74

5420 msgid "find the color setting: slot [stdout-is-tty]"

5421 msgstr "hitta färginställningen: slot [stdout-is-tty]"

5422

4960 -#: builtin/config.c:74

5423 +#: builtin/config.c:75

5424 msgid "Type"

5425 msgstr "Typ"

5426

4964 -#: builtin/config.c:75

5427 +#: builtin/config.c:76

5428 msgid "value is \"true\" or \"false\""

5429 msgstr "värdet är \"true\" eller \"false\""

5430

4968 -#: builtin/config.c:76

5431 +#: builtin/config.c:77

5432 msgid "value is decimal number"

5433 msgstr "värdet är ett decimalt tal"

5434

4972 -#: builtin/config.c:77

5435 +#: builtin/config.c:78

5436 msgid "value is --bool or --int"

5437 msgstr "värdet är --bool eller --int"

5438

4976 -#: builtin/config.c:78

5439 +#: builtin/config.c:79

5440 msgid "value is a path (file or directory name)"

5441 msgstr "värdet är en sökväg (fil- eller katalognamn)"

5442

4980 -#: builtin/config.c:79

5443 +#: builtin/config.c:80

5444 msgid "Other"

5445 msgstr "Andra"

5446

4984 -#: builtin/config.c:80

5447 +#: builtin/config.c:81

5448 msgid "terminate values with NUL byte"

5449 msgstr "terminera värden med NUL-byte"

5450

4988 -#: builtin/config.c:81

5451 +#: builtin/config.c:82

5452 +msgid "show variable names only"

5453 +msgstr "visa endast variabelnamn"

5454 +

5455 +#: builtin/config.c:83

5456 msgid "respect include directives on lookup"

5457 msgstr "respektera inkluderingsdirektiv vid uppslag"

5458

4992 -#: builtin/config.c:316

5459 +#: builtin/config.c:311

5460 msgid "unable to parse default color value"

5461 msgstr "kan inte tolka standardfärgvärde"

5462

4996 -#: builtin/config.c:457

5463 +#: builtin/config.c:449

5464 #, c-format

5465 msgid ""

5466 "# This is Git's per-user configuration file.\n"

@@ -5008,7 +5475,7 @@ msgstr ""

5475 "#\tname = %s\n"

5476 "#\temail = %s\n"

5477

5011 -#: builtin/config.c:587

5478 +#: builtin/config.c:583

5479 #, c-format

5480 msgid "cannot create configuration file %s"

5481 msgstr "kan inte skapa konfigurationsfilen \"%s\""

@@ -5044,7 +5511,7 @@ msgstr "den annoterade taggen %s har inget inbäddat namn"

5511 msgid "tag '%s' is really '%s' here"

5512 msgstr "taggen \"%s\" är i verkligheten \"%s\" här"

5513

5047 -#: builtin/describe.c:250 builtin/log.c:452

5514 +#: builtin/describe.c:250 builtin/log.c:459

5515 #, c-format

5516 msgid "Not a valid object name %s"

5517 msgstr "Objektnamnet är inte giltigt: %s"

@@ -5190,229 +5657,229 @@ msgstr "mer än två blobbar angavs: \"%s\""

5657 msgid "unhandled object '%s' given."

5658 msgstr "ej hanterat objekt \"%s\" angavs."

5659

5193 -#: builtin/fast-export.c:24

5660 +#: builtin/fast-export.c:25

5661 msgid "git fast-export [rev-list-opts]"

5662 msgstr "git fast-export [rev-list-flaggor]"

5663

5197 -#: builtin/fast-export.c:979

5664 +#: builtin/fast-export.c:980

5665 msgid "show progress after <n> objects"

5666 msgstr "visa förlopp efter <n> objekt"

5667

5201 -#: builtin/fast-export.c:981

5668 +#: builtin/fast-export.c:982

5669 msgid "select handling of signed tags"

5670 msgstr "välj hantering av signerade taggar"

5671

5205 -#: builtin/fast-export.c:984

5672 +#: builtin/fast-export.c:985

5673 msgid "select handling of tags that tag filtered objects"

5674 msgstr "välj hantering av taggar som har taggfiltrerade objekt"

5675

5209 -#: builtin/fast-export.c:987

5676 +#: builtin/fast-export.c:988

5677 msgid "Dump marks to this file"

5678 msgstr "Dump märken till filen"

5679

5213 -#: builtin/fast-export.c:989

5680 +#: builtin/fast-export.c:990

5681 msgid "Import marks from this file"

5682 msgstr "Importera märken från filen"

5683

5217 -#: builtin/fast-export.c:991

5684 +#: builtin/fast-export.c:992

5685 msgid "Fake a tagger when tags lack one"

5686 msgstr "Fejka taggare när taggen saknar en"

5687

5221 -#: builtin/fast-export.c:993

5688 +#: builtin/fast-export.c:994

5689 msgid "Output full tree for each commit"

5690 msgstr "Skriv ut hela trädet för varje incheckning"

5691

5225 -#: builtin/fast-export.c:995

5692 +#: builtin/fast-export.c:996

5693 msgid "Use the done feature to terminate the stream"

5694 msgstr "Använd done-funktionen för att avsluta strömmen"

5695

5229 -#: builtin/fast-export.c:996

5696 +#: builtin/fast-export.c:997

5697 msgid "Skip output of blob data"

5698 msgstr "Hoppa över skrivning av blob-data"

5699

5233 -#: builtin/fast-export.c:997

5700 +#: builtin/fast-export.c:998

5701 msgid "refspec"

5702 msgstr "referensspecifikation"

5703

5237 -#: builtin/fast-export.c:998

5704 +#: builtin/fast-export.c:999

5705 msgid "Apply refspec to exported refs"

5706 msgstr "Applicera referensspecifikation på exporterade referenser"

5707

5241 -#: builtin/fast-export.c:999

5708 +#: builtin/fast-export.c:1000

5709 msgid "anonymize output"

5710 msgstr "anonymisera utdata"

5711

5245 -#: builtin/fetch.c:19

5712 +#: builtin/fetch.c:20

5713 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

5714 msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"

5715

5249 -#: builtin/fetch.c:20

5716 +#: builtin/fetch.c:21

5717 msgid "git fetch [<options>] <group>"

5718 msgstr "git fetch [<flaggor>] <grupp>"

5719

5253 -#: builtin/fetch.c:21

5720 +#: builtin/fetch.c:22

5721 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"

5722 msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"

5723

5257 -#: builtin/fetch.c:22

5724 +#: builtin/fetch.c:23

5725 msgid "git fetch --all [<options>]"

5726 msgstr "git fetch --all [<flaggor>]"

5727

5261 -#: builtin/fetch.c:89

5728 +#: builtin/fetch.c:90 builtin/pull.c:162

5729 msgid "fetch from all remotes"

5730 msgstr "hämta från alla fjärrar"

5731

5265 -#: builtin/fetch.c:91

5732 +#: builtin/fetch.c:92 builtin/pull.c:165

5733 msgid "append to .git/FETCH_HEAD instead of overwriting"

5734 msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"

5735

5269 -#: builtin/fetch.c:93

5736 +#: builtin/fetch.c:94 builtin/pull.c:168

5737 msgid "path to upload pack on remote end"

5738 msgstr "sökväg till upload pack på fjärren"

5739

5273 -#: builtin/fetch.c:94

5740 +#: builtin/fetch.c:95 builtin/pull.c:170

5741 msgid "force overwrite of local branch"

5742 msgstr "tvinga överskrivning av lokal gren"

5743

5277 -#: builtin/fetch.c:96

5744 +#: builtin/fetch.c:97

5745 msgid "fetch from multiple remotes"

5746 msgstr "hämta från flera fjärrar"

5747

5281 -#: builtin/fetch.c:98

5748 +#: builtin/fetch.c:99 builtin/pull.c:172

5749 msgid "fetch all tags and associated objects"

5750 msgstr "hämta alla taggar och associerade objekt"

5751

5285 -#: builtin/fetch.c:100

5752 +#: builtin/fetch.c:101

5753 msgid "do not fetch all tags (--no-tags)"

5754 msgstr "hämta inte alla taggar (--no-tags)"

5755

5289 -#: builtin/fetch.c:102

5756 +#: builtin/fetch.c:103 builtin/pull.c:175

5757 msgid "prune remote-tracking branches no longer on remote"

5758 msgstr "rensa fjärrspårande grenar ej längre på fjärren"

5759

5293 -#: builtin/fetch.c:103

5760 +#: builtin/fetch.c:104 builtin/pull.c:178

5761 msgid "on-demand"

5762 msgstr "on-demand"

5763

5297 -#: builtin/fetch.c:104

5764 +#: builtin/fetch.c:105 builtin/pull.c:179

5765 msgid "control recursive fetching of submodules"

5766 msgstr "styr rekursiv hämtning av undermoduler"

5767

5301 -#: builtin/fetch.c:108

5768 +#: builtin/fetch.c:109 builtin/pull.c:184

5769 msgid "keep downloaded pack"

5770 msgstr "behåll hämtade paket"

5771

5305 -#: builtin/fetch.c:110

5772 +#: builtin/fetch.c:111

5773 msgid "allow updating of HEAD ref"

5774 msgstr "tillåt uppdatering av HEAD-referens"

5775

5309 -#: builtin/fetch.c:113

5776 +#: builtin/fetch.c:114 builtin/pull.c:187

5777 msgid "deepen history of shallow clone"

5778 msgstr "fördjupa historik för grund klon"

5779

5313 -#: builtin/fetch.c:115

5780 +#: builtin/fetch.c:116 builtin/pull.c:190

5781 msgid "convert to a complete repository"

5782 msgstr "konvertera till komplett arkiv"

5783

5317 -#: builtin/fetch.c:117 builtin/log.c:1208

5784 +#: builtin/fetch.c:118 builtin/log.c:1233

5785 msgid "dir"

5786 msgstr "kat"

5787

5321 -#: builtin/fetch.c:118

5788 +#: builtin/fetch.c:119

5789 msgid "prepend this to submodule path output"

5790 msgstr "lägg till i början av undermodulens sökvägsutdata"

5791

5325 -#: builtin/fetch.c:121

5792 +#: builtin/fetch.c:122

5793 msgid "default mode for recursion"

5794 msgstr "standardläge för rekursion"

5795

5329 -#: builtin/fetch.c:123

5796 +#: builtin/fetch.c:124 builtin/pull.c:193

5797 msgid "accept refs that update .git/shallow"

5798 msgstr "tar emot referenser som uppdaterar .git/shallow"

5799

5333 -#: builtin/fetch.c:124

5800 +#: builtin/fetch.c:125 builtin/pull.c:195

5801 msgid "refmap"

5802 msgstr "referenskarta"

5803

5337 -#: builtin/fetch.c:125

5804 +#: builtin/fetch.c:126 builtin/pull.c:196

5805 msgid "specify fetch refmap"

5806 msgstr "ange referenskarta för \"fetch\""

5807

5341 -#: builtin/fetch.c:377

5808 +#: builtin/fetch.c:378

5809 msgid "Couldn't find remote ref HEAD"

5810 msgstr "Kunde inte hitta fjärr-referensen HEAD"

5811

5345 -#: builtin/fetch.c:457

5812 +#: builtin/fetch.c:458

5813 #, c-format

5814 msgid "object %s not found"

5815 msgstr "objektet %s hittades inte"

5816

5350 -#: builtin/fetch.c:462

5817 +#: builtin/fetch.c:463

5818 msgid "[up to date]"

5819 msgstr "[àjour]"

5820

5354 -#: builtin/fetch.c:476

5821 +#: builtin/fetch.c:477

5822 #, c-format

5823 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5824 msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)"

5825

5359 -#: builtin/fetch.c:477 builtin/fetch.c:563

5826 +#: builtin/fetch.c:478 builtin/fetch.c:564

5827 msgid "[rejected]"

5828 msgstr "[refuserad]"

5829

5363 -#: builtin/fetch.c:488

5830 +#: builtin/fetch.c:489

5831 msgid "[tag update]"

5832 msgstr "[uppdaterad tagg]"

5833

5367 -#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543

5834 +#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544

5835 msgid " (unable to update local ref)"

5836 msgstr " (kunde inte uppdatera lokal ref)"

5837

5371 -#: builtin/fetch.c:508

5838 +#: builtin/fetch.c:509

5839 msgid "[new tag]"

5840 msgstr "[ny tagg]"

5841

5375 -#: builtin/fetch.c:511

5842 +#: builtin/fetch.c:512

5843 msgid "[new branch]"

5844 msgstr "[ny gren]"

5845

5379 -#: builtin/fetch.c:514

5846 +#: builtin/fetch.c:515

5847 msgid "[new ref]"

5848 msgstr "[ny ref]"

5849

5383 -#: builtin/fetch.c:559

5850 +#: builtin/fetch.c:560

5851 msgid "unable to update local ref"

5852 msgstr "kunde inte uppdatera lokal ref"

5853

5387 -#: builtin/fetch.c:559

5854 +#: builtin/fetch.c:560

5855 msgid "forced update"

5856 msgstr "tvingad uppdatering"

5857

5391 -#: builtin/fetch.c:565

5858 +#: builtin/fetch.c:566

5859 msgid "(non-fast-forward)"

5860 msgstr "(ej snabbspolad)"

5861

5395 -#: builtin/fetch.c:599 builtin/fetch.c:832

5862 +#: builtin/fetch.c:600 builtin/fetch.c:842

5863 #, c-format

5864 msgid "cannot open %s: %s\n"

5865 msgstr "kan inte öppna %s: %s\n"

5866

5400 -#: builtin/fetch.c:608

5867 +#: builtin/fetch.c:609

5868 #, c-format

5869 msgid "%s did not send all necessary objects\n"

5870 msgstr "%s sände inte alla nödvändiga objekt\n"

5871

5405 -#: builtin/fetch.c:626

5872 +#: builtin/fetch.c:627

5873 #, c-format

5874 msgid "reject %s because shallow roots are not allowed to be updated"

5875 msgstr "avvisa %s då grunda rötter inte kan uppdateras"

5876

5410 -#: builtin/fetch.c:714 builtin/fetch.c:797

5877 +#: builtin/fetch.c:715 builtin/fetch.c:807

5878 #, c-format

5879 msgid "From %.*s\n"

5880 msgstr "Från %.*s\n"

5881

5415 -#: builtin/fetch.c:725

5882 +#: builtin/fetch.c:726

5883 #, c-format

5884 msgid ""

5885 "some local refs could not be updated; try running\n"

@@ -5421,55 +5888,55 @@ msgstr ""

5888 "vissa lokala referenser kunde inte uppdateras; testa att köra\n"

5889 " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"

5890

5424 -#: builtin/fetch.c:777

5891 +#: builtin/fetch.c:778

5892 #, c-format

5893 msgid " (%s will become dangling)"

5894 msgstr " (%s kommer bli dinglande)"

5895

5429 -#: builtin/fetch.c:778

5896 +#: builtin/fetch.c:779

5897 #, c-format

5898 msgid " (%s has become dangling)"

5899 msgstr " (%s har blivit dinglande)"

5900

5434 -#: builtin/fetch.c:802

5901 +#: builtin/fetch.c:811

5902 msgid "[deleted]"

5903 msgstr "[borttagen]"

5904

5438 -#: builtin/fetch.c:803 builtin/remote.c:1057

5905 +#: builtin/fetch.c:812 builtin/remote.c:1034

5906 msgid "(none)"

5907 msgstr "(ingen)"

5908

5442 -#: builtin/fetch.c:822

5909 +#: builtin/fetch.c:832

5910 #, c-format

5911 msgid "Refusing to fetch into current branch %s of non-bare repository"

5912 msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"

5913

5447 -#: builtin/fetch.c:841

5914 +#: builtin/fetch.c:851

5915 #, c-format

5916 msgid "Option \"%s\" value \"%s\" is not valid for %s"

5917 msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"

5918

5452 -#: builtin/fetch.c:844

5919 +#: builtin/fetch.c:854

5920 #, c-format

5921 msgid "Option \"%s\" is ignored for %s\n"

5922 msgstr "Flaggan \"%s\" ignoreras för %s\n"

5923

5457 -#: builtin/fetch.c:900

5924 +#: builtin/fetch.c:910

5925 #, c-format

5926 msgid "Don't know how to fetch from %s"

5927 msgstr "Vet inte hur man hämtar från %s"

5928

5462 -#: builtin/fetch.c:1063

5929 +#: builtin/fetch.c:1071

5930 #, c-format

5931 msgid "Fetching %s\n"

5932 msgstr "Hämtar %s\n"

5933

5467 -#: builtin/fetch.c:1065 builtin/remote.c:90

5934 +#: builtin/fetch.c:1073 builtin/remote.c:90

5935 #, c-format

5936 msgid "Could not fetch %s"

5937 msgstr "Kunde inte hämta %s"

5938

5472 -#: builtin/fetch.c:1083

5939 +#: builtin/fetch.c:1091

5940 msgid ""

5941 "No remote repository specified. Please, specify either a URL or a\n"

5942 "remote name from which new revisions should be fetched."

@@ -5477,216 +5944,207 @@ msgstr ""

5944 "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"

5945 "fjärrarkiv som nya incheckningar skall hämtas från."

5946

5480 -#: builtin/fetch.c:1106

5947 +#: builtin/fetch.c:1114

5948 msgid "You need to specify a tag name."

5949 msgstr "Du måste ange namnet på en tagg."

5950

5484 -#: builtin/fetch.c:1148

5951 +#: builtin/fetch.c:1156

5952 msgid "--depth and --unshallow cannot be used together"

5953 msgstr "--depth och --unshallow kan inte användas samtidigt"

5954

5488 -#: builtin/fetch.c:1150

5955 +#: builtin/fetch.c:1158

5956 msgid "--unshallow on a complete repository does not make sense"

5957 msgstr "--unshallow kan inte användas på ett komplett arkiv"

5958

5492 -#: builtin/fetch.c:1173

5959 +#: builtin/fetch.c:1181

5960 msgid "fetch --all does not take a repository argument"

5961 msgstr "fetch --all tar inte namnet på ett arkiv som argument"

5962

5496 -#: builtin/fetch.c:1175

5963 +#: builtin/fetch.c:1183

5964 msgid "fetch --all does not make sense with refspecs"

5965 msgstr "fetch --all kan inte anges med referensspecifikationer"

5966

5500 -#: builtin/fetch.c:1186

5967 +#: builtin/fetch.c:1194

5968 #, c-format

5969 msgid "No such remote or remote group: %s"

5970 msgstr "Fjärren eller fjärrgruppen finns inte: %s"

5971

5505 -#: builtin/fetch.c:1194

5972 +#: builtin/fetch.c:1202

5973 msgid "Fetching a group and specifying refspecs does not make sense"

5974 msgstr "Kan inte hämta från grupp och ange referensspecifikationer"

5975

5509 -#: builtin/fmt-merge-msg.c:13

5976 +#: builtin/fmt-merge-msg.c:14

5977 msgid ""

5978 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"

5979 msgstr ""

5980 "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]"

5981

5515 -#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698

5516 -#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182

5517 -#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590

5518 -#: parse-options.h:131 parse-options.h:238

5519 -msgid "n"

5520 -msgstr "n"

5521 -

5522 -#: builtin/fmt-merge-msg.c:669

5982 +#: builtin/fmt-merge-msg.c:670

5983 msgid "populate log with at most <n> entries from shortlog"

5984 msgstr "fyll i loggen med som mest <n> poster från shortlog"

5985

5526 -#: builtin/fmt-merge-msg.c:672

5986 +#: builtin/fmt-merge-msg.c:673

5987 msgid "alias for --log (deprecated)"

5988 msgstr "alias för --log (avråds)"

5989

5530 -#: builtin/fmt-merge-msg.c:675

5990 +#: builtin/fmt-merge-msg.c:676

5991 msgid "text"

5992 msgstr "text"

5993

5534 -#: builtin/fmt-merge-msg.c:676

5994 +#: builtin/fmt-merge-msg.c:677

5995 msgid "use <text> as start of message"

5996 msgstr "inled meddelande med <text>"

5997

5538 -#: builtin/fmt-merge-msg.c:677

5998 +#: builtin/fmt-merge-msg.c:678

5999 msgid "file to read from"

6000 msgstr "fil att läsa från"

6001

5542 -#: builtin/for-each-ref.c:687

5543 -msgid "unable to parse format"

5544 -msgstr "kan inte tolka formatet"

5545 -

5546 -#: builtin/for-each-ref.c:1083

6002 +#: builtin/for-each-ref.c:9

6003 msgid "git for-each-ref [<options>] [<pattern>]"

6004 msgstr "git for-each-ref [<flaggor>] [<mönster>]"

6005

5550 -#: builtin/for-each-ref.c:1098

6006 +#: builtin/for-each-ref.c:24

6007 msgid "quote placeholders suitably for shells"

6008 msgstr "citera platshållare passande för skal"

6009

5554 -#: builtin/for-each-ref.c:1100

6010 +#: builtin/for-each-ref.c:26

6011 msgid "quote placeholders suitably for perl"

6012 msgstr "citera platshållare passande för perl"

6013

5558 -#: builtin/for-each-ref.c:1102

6014 +#: builtin/for-each-ref.c:28

6015 msgid "quote placeholders suitably for python"

6016 msgstr "citera platshållare passande för python"

6017

5562 -#: builtin/for-each-ref.c:1104

6018 +#: builtin/for-each-ref.c:30

6019 msgid "quote placeholders suitably for Tcl"

6020 msgstr "citera platshållare passande för Tcl"

6021

5566 -#: builtin/for-each-ref.c:1107

6022 +#: builtin/for-each-ref.c:33

6023 msgid "show only <n> matched refs"

6024 msgstr "visa endast <n> träffade refs"

6025

5570 -#: builtin/for-each-ref.c:1108 builtin/replace.c:438

5571 -msgid "format"

5572 -msgstr "format"

5573 -

5574 -#: builtin/for-each-ref.c:1108

6026 +#: builtin/for-each-ref.c:34

6027 msgid "format to use for the output"

6028 msgstr "format att använda för utdata"

6029

5578 -#: builtin/for-each-ref.c:1109

6030 +#: builtin/for-each-ref.c:35

6031 msgid "key"

6032 msgstr "nyckel"

6033

5582 -#: builtin/for-each-ref.c:1110

6034 +#: builtin/for-each-ref.c:36

6035 msgid "field name to sort on"

6036 msgstr "fältnamn att sortera på"

6037

6038 # Vague original, not networking-related, but rather related to the actual

6039 # objects in the database.

5588 -#: builtin/fsck.c:147 builtin/prune.c:137

6040 +#: builtin/fsck.c:163 builtin/prune.c:137

6041 msgid "Checking connectivity"

6042 msgstr "Kontrollerar konnektivitet"

6043

5592 -#: builtin/fsck.c:548

6044 +#: builtin/fsck.c:568

6045 msgid "Checking object directories"

6046 msgstr "Kontrollerar objektkataloger"

6047

5596 -#: builtin/fsck.c:611

6048 +#: builtin/fsck.c:631

6049 msgid "git fsck [<options>] [<object>...]"

6050 msgstr "git fsck [<flaggor>] [<objekt>...]"

6051

5600 -#: builtin/fsck.c:617

6052 +#: builtin/fsck.c:637

6053 msgid "show unreachable objects"

6054 msgstr "visa onåbara objekt"

6055

5604 -#: builtin/fsck.c:618

6056 +#: builtin/fsck.c:638

6057 msgid "show dangling objects"

6058 msgstr "visa dinglande objekt"

6059

5608 -#: builtin/fsck.c:619

6060 +#: builtin/fsck.c:639

6061 msgid "report tags"

6062 msgstr "rapportera taggar"

6063

5612 -#: builtin/fsck.c:620

6064 +#: builtin/fsck.c:640

6065 msgid "report root nodes"

6066 msgstr "rapportera rotnoder"

6067

5616 -#: builtin/fsck.c:621

6068 +#: builtin/fsck.c:641

6069 msgid "make index objects head nodes"

6070 msgstr "gör indexojekt till huvudnoder"

6071

5620 -#: builtin/fsck.c:622

6072 +#: builtin/fsck.c:642

6073 msgid "make reflogs head nodes (default)"

6074 msgstr "gör refloggar till huvudnoder (standard)"

6075

5624 -#: builtin/fsck.c:623

6076 +#: builtin/fsck.c:643

6077 msgid "also consider packs and alternate objects"

6078 msgstr "ta även hänsyn till paket och alternativa objekt"

6079

5628 -#: builtin/fsck.c:624

6080 +# Vague original, not networking-related, but rather related to the actual

6081 +# objects in the database.

6082 +#: builtin/fsck.c:644

6083 +msgid "check only connectivity"

6084 +msgstr "kontrollera endast konnektivitet"

6085 +

6086 +#: builtin/fsck.c:645

6087 msgid "enable more strict checking"

6088 msgstr "aktivera striktare kontroll"

6089

5632 -#: builtin/fsck.c:626

6090 +#: builtin/fsck.c:647

6091 msgid "write dangling objects in .git/lost-found"

6092 msgstr "skriv dinglande objekt i .git/lost-found"

6093

5636 -#: builtin/fsck.c:627 builtin/prune.c:107

6094 +#: builtin/fsck.c:648 builtin/prune.c:107

6095 msgid "show progress"

6096 msgstr "visa förlopp"

6097

5640 -#: builtin/fsck.c:677

6098 +#: builtin/fsck.c:707

6099 msgid "Checking objects"

6100 msgstr "Kontrollerar objekt"

6101

5644 -#: builtin/gc.c:24

6102 +#: builtin/gc.c:25

6103 msgid "git gc [<options>]"

6104 msgstr "git gc [<flaggor>]"

6105

5648 -#: builtin/gc.c:67

6106 +#: builtin/gc.c:55

6107 #, c-format

6108 msgid "Invalid %s: '%s'"

6109 msgstr "Felaktigt %s: \"%s\""

6110

5653 -#: builtin/gc.c:112

6111 +#: builtin/gc.c:100

6112 #, c-format

6113 msgid "insanely long object directory %.*s"

6114 msgstr "tokigt lång objektkatalog %.*s"

6115

5658 -#: builtin/gc.c:281

6116 +#: builtin/gc.c:269

6117 msgid "prune unreferenced objects"

6118 msgstr "rensa ej refererade objekt"

6119

5662 -#: builtin/gc.c:283

6120 +#: builtin/gc.c:271

6121 msgid "be more thorough (increased runtime)"

6122 msgstr "var mer grundlig (ökar körtiden)"

6123

5666 -#: builtin/gc.c:284

6124 +#: builtin/gc.c:272

6125 msgid "enable auto-gc mode"

6126 msgstr "aktivera auto-gc-läge"

6127

5670 -#: builtin/gc.c:285

6128 +#: builtin/gc.c:273

6129 msgid "force running gc even if there may be another gc running"

6130 msgstr "tvinga gc-körning även om en annan gc kanske körs"

6131

5674 -#: builtin/gc.c:327

6132 +#: builtin/gc.c:315

6133 #, c-format

6134 msgid "Auto packing the repository in background for optimum performance.\n"

6135 msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"

6136

5679 -#: builtin/gc.c:329

6137 +#: builtin/gc.c:317

6138 #, c-format

6139 msgid "Auto packing the repository for optimum performance.\n"

6140 msgstr "Packar arkivet automatiskt för optimal prestanda.\n"

6141

5684 -#: builtin/gc.c:330

6142 +#: builtin/gc.c:318

6143 #, c-format

6144 msgid "See \"git help gc\" for manual housekeeping.\n"

6145 msgstr "Se \"git help gc\" för manuell hushållning.\n"

6146

5689 -#: builtin/gc.c:348

6147 +#: builtin/gc.c:336

6148 #, c-format

6149 msgid ""

6150 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

@@ -5694,7 +6152,7 @@ msgstr ""

6152 "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "

6153 "är fallet)"

6154

5697 -#: builtin/gc.c:376

6155 +#: builtin/gc.c:364

6156 msgid ""

6157 "There are too many unreachable loose objects; run 'git prune' to remove them."

6158 msgstr ""

@@ -5938,7 +6396,7 @@ msgstr ""

6396 msgid "git hash-object --stdin-paths < <list-of-paths>"

6397 msgstr "git hash-object --stdin-paths < <sökvägslista>"

6398

5941 -#: builtin/hash-object.c:92 builtin/tag.c:612

6399 +#: builtin/hash-object.c:92 builtin/tag.c:614

6400 msgid "type"

6401 msgstr "typ"

6402

@@ -6092,129 +6550,129 @@ msgstr "användning: %s%s"

6550 msgid "`git %s' is aliased to `%s'"

6551 msgstr "\"git %s\" är ett alias för \"%s\""

6552

6095 -#: builtin/index-pack.c:151

6553 +#: builtin/index-pack.c:152

6554 #, c-format

6555 msgid "unable to open %s"

6556 msgstr "kunde inte öppna %s"

6557

6100 -#: builtin/index-pack.c:201

6558 +#: builtin/index-pack.c:202

6559 #, c-format

6560 msgid "object type mismatch at %s"

6561 msgstr "objekttyp stämmer inte överens vid %s"

6562

6105 -#: builtin/index-pack.c:221

6563 +#: builtin/index-pack.c:222

6564 #, c-format

6565 msgid "did not receive expected object %s"

6566 msgstr "emottog inte det förväntade objektet %s"

6567

6110 -#: builtin/index-pack.c:224

6568 +#: builtin/index-pack.c:225

6569 #, c-format

6570 msgid "object %s: expected type %s, found %s"

6571 msgstr "objektet %s: förväntad typ %s, såg %s"

6572

6115 -#: builtin/index-pack.c:266

6573 +#: builtin/index-pack.c:267

6574 #, c-format

6575 msgid "cannot fill %d byte"

6576 msgid_plural "cannot fill %d bytes"

6577 msgstr[0] "kan inte fylla %d byte"

6578 msgstr[1] "kan inte fylla %d byte"

6579

6122 -#: builtin/index-pack.c:276

6580 +#: builtin/index-pack.c:277

6581 msgid "early EOF"

6582 msgstr "tidigt filslut"

6583

6126 -#: builtin/index-pack.c:277

6584 +#: builtin/index-pack.c:278

6585 msgid "read error on input"

6586 msgstr "indataläsfel"

6587

6130 -#: builtin/index-pack.c:289

6588 +#: builtin/index-pack.c:290

6589 msgid "used more bytes than were available"

6590 msgstr "använde fler byte än tillgängligt"

6591

6134 -#: builtin/index-pack.c:296

6592 +#: builtin/index-pack.c:297

6593 msgid "pack too large for current definition of off_t"

6594 msgstr "paket för stort för nuvarande definition av off_t"

6595

6138 -#: builtin/index-pack.c:312

6596 +#: builtin/index-pack.c:313

6597 #, c-format

6598 msgid "unable to create '%s'"

6599 msgstr "kunde inte skapa \"%s\""

6600

6143 -#: builtin/index-pack.c:317

6601 +#: builtin/index-pack.c:318

6602 #, c-format

6603 msgid "cannot open packfile '%s'"

6604 msgstr "kan inte öppna paketfilen \"%s\""

6605

6148 -#: builtin/index-pack.c:331

6606 +#: builtin/index-pack.c:332

6607 msgid "pack signature mismatch"

6608 msgstr "paketsignatur stämmer inte överens"

6609

6152 -#: builtin/index-pack.c:333

6610 +#: builtin/index-pack.c:334

6611 #, c-format

6612 msgid "pack version %<PRIu32> unsupported"

6613 msgstr "paketversion %<PRIu32> stöds ej"

6614

6157 -#: builtin/index-pack.c:351

6615 +#: builtin/index-pack.c:352

6616 #, c-format

6617 msgid "pack has bad object at offset %lu: %s"

6618 msgstr "paketet har felaktigt objekt vid index %lu: %s"

6619

6162 -#: builtin/index-pack.c:472

6620 +#: builtin/index-pack.c:473

6621 #, c-format

6622 msgid "inflate returned %d"

6623 msgstr "inflate returnerade %d"

6624

6167 -#: builtin/index-pack.c:521

6625 +#: builtin/index-pack.c:522

6626 msgid "offset value overflow for delta base object"

6627 msgstr "indexvärdespill för deltabasobjekt"

6628

6171 -#: builtin/index-pack.c:529

6629 +#: builtin/index-pack.c:530

6630 msgid "delta base offset is out of bound"

6631 msgstr "deltabasindex utanför gränsen"

6632

6175 -#: builtin/index-pack.c:537

6633 +#: builtin/index-pack.c:538

6634 #, c-format

6635 msgid "unknown object type %d"

6636 msgstr "okänd objekttyp %d"

6637

6180 -#: builtin/index-pack.c:568

6638 +#: builtin/index-pack.c:569

6639 msgid "cannot pread pack file"

6640 msgstr "kan inte utföra \"pread\" på paketfil"

6641

6184 -#: builtin/index-pack.c:570

6642 +#: builtin/index-pack.c:571

6643 #, c-format

6644 msgid "premature end of pack file, %lu byte missing"

6645 msgid_plural "premature end of pack file, %lu bytes missing"

6646 msgstr[0] "för tidigt slut på paketfilen, %lu byte saknas"

6647 msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas"

6648

6191 -#: builtin/index-pack.c:596

6649 +#: builtin/index-pack.c:597

6650 msgid "serious inflate inconsistency"

6651 msgstr "allvarlig inflate-inkonsekvens"

6652

6195 -#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771

6196 -#: builtin/index-pack.c:805 builtin/index-pack.c:814

6653 +#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772

6654 +#: builtin/index-pack.c:806 builtin/index-pack.c:815

6655 #, c-format

6656 msgid "SHA1 COLLISION FOUND WITH %s !"

6657 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"

6658

6201 -#: builtin/index-pack.c:745 builtin/pack-objects.c:162

6659 +#: builtin/index-pack.c:746 builtin/pack-objects.c:162

6660 #: builtin/pack-objects.c:254

6661 #, c-format

6662 msgid "unable to read %s"

6663 msgstr "kunde inte läsa %s"

6664

6207 -#: builtin/index-pack.c:811

6665 +#: builtin/index-pack.c:812

6666 #, c-format

6667 msgid "cannot read existing object %s"

6668 msgstr "kan inte läsa befintligt objekt %s"

6669

6212 -#: builtin/index-pack.c:825

6670 +#: builtin/index-pack.c:826

6671 #, c-format

6672 msgid "invalid blob object %s"

6673 msgstr "ogiltigt blob-objekt %s"

6674

6217 -#: builtin/index-pack.c:839

6675 +#: builtin/index-pack.c:840

6676 #, c-format

6677 msgid "invalid %s"

6678 msgstr "ogiltigt %s"

@@ -6328,7 +6786,7 @@ msgstr "felaktig pack.indexversion=%<PRIu32>"

6786 msgid "invalid number of threads specified (%d)"

6787 msgstr "felaktigt antal trådar angivet (%d)"

6788

6331 -#: builtin/index-pack.c:1479 builtin/index-pack.c:1658

6789 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1663

6790 #, c-format

6791 msgid "no threads support, ignoring %s"

6792 msgstr "trådstöd saknas, ignorerar %s"

@@ -6357,110 +6815,110 @@ msgid_plural "chain length = %d: %lu objects"

6815 msgstr[0] "kedjelängd = %d: %lu objekt"

6816 msgstr[1] "kedjelängd = %d: %lu objekt"

6817

6360 -#: builtin/index-pack.c:1622

6818 +#: builtin/index-pack.c:1623

6819 msgid "Cannot come back to cwd"

6820 msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"

6821

6364 -#: builtin/index-pack.c:1670 builtin/index-pack.c:1673

6365 -#: builtin/index-pack.c:1685 builtin/index-pack.c:1689

6822 +#: builtin/index-pack.c:1675 builtin/index-pack.c:1678

6823 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1694

6824 #, c-format

6825 msgid "bad %s"

6826 msgstr "felaktig %s"

6827

6370 -#: builtin/index-pack.c:1703

6828 +#: builtin/index-pack.c:1708

6829 msgid "--fix-thin cannot be used without --stdin"

6830 msgstr "--fix-thin kan inte användas med --stdin"

6831

6374 -#: builtin/index-pack.c:1707 builtin/index-pack.c:1716

6832 +#: builtin/index-pack.c:1712 builtin/index-pack.c:1721

6833 #, c-format

6834 msgid "packfile name '%s' does not end with '.pack'"

6835 msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""

6836

6379 -#: builtin/index-pack.c:1724

6837 +#: builtin/index-pack.c:1729

6838 msgid "--verify with no packfile name given"

6839 msgstr "--verify angavs utan paketfilnamn"

6840

6383 -#: builtin/init-db.c:35

6841 +#: builtin/init-db.c:36

6842 #, c-format

6843 msgid "Could not make %s writable by group"

6844 msgstr "Kunde inte göra %s skrivbar för gruppen"

6845

6388 -#: builtin/init-db.c:62

6846 +#: builtin/init-db.c:63

6847 #, c-format

6848 msgid "insanely long template name %s"

6849 msgstr "tokigt långt namn på mallen %s"

6850

6393 -#: builtin/init-db.c:67

6851 +#: builtin/init-db.c:68

6852 #, c-format

6853 msgid "cannot stat '%s'"

6854 msgstr "kan inte ta status på \"%s\""

6855

6398 -#: builtin/init-db.c:73

6856 +#: builtin/init-db.c:74

6857 #, c-format

6858 msgid "cannot stat template '%s'"

6859 msgstr "kan inte ta status på mallen \"%s\""

6860

6403 -#: builtin/init-db.c:80

6861 +#: builtin/init-db.c:81

6862 #, c-format

6863 msgid "cannot opendir '%s'"

6864 msgstr "kan inte öppna katalogen (opendir) \"%s\""

6865

l10n: sv.po: Update Swedish translation (2441t0f0u)