647d5183b8 · matheusbsbs/matheus-bagliano

@@ -7,8 +7,8 @@ msgid ""

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2012-10-16 08:38+0800\n"

11 -"PO-Revision-Date: 2012-10-16 08:36+0100\n"

10 +"POT-Creation-Date: 2012-11-23 14:27+0800\n"

11 +"PO-Revision-Date: 2012-11-23 08:53+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"

@@ -65,7 +65,7 @@ msgstr "fmt"

65 msgid "archive format"

66 msgstr "arkivformat"

67

68 -#: archive.c:323 builtin/log.c:1079

68 +#: archive.c:323 builtin/log.c:1084

69 msgid "prefix"

70 msgstr "prefix"

71

@@ -73,9 +73,9 @@ msgstr "prefix"

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

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

75

76 -#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2389

77 -#: builtin/blame.c:2390 builtin/config.c:56 builtin/fast-export.c:642

78 -#: builtin/fast-export.c:644 builtin/grep.c:801 builtin/hash-object.c:77

76 +#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2390

77 +#: builtin/blame.c:2391 builtin/config.c:55 builtin/fast-export.c:642

78 +#: builtin/fast-export.c:644 builtin/grep.c:715 builtin/hash-object.c:77

79 #: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540

80 #: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149

81 msgid "file"

@@ -125,6 +125,14 @@ msgstr "kommando"

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

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

127

128 +#: attr.c:259

129 +msgid ""

130 +"Negative patterns are forbidden in git attributes\n"

131 +"Use '\\!' for literal leading exclamation."

132 +msgstr ""

133 +"Negativa mönster är förbjudna i git-attribut\n"

134 +"Använd '\\!' för att inleda med ett utropstecken."

135 +

136 #: bundle.c:36

137 #, c-format

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

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

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

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

145

138 -#: bundle.c:89 builtin/commit.c:672

146 +#: bundle.c:89 builtin/commit.c:674

147 #, c-format

148 msgid "could not open '%s'"

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

@@ -145,7 +153,7 @@ msgid "Repository lacks these prerequisite commits:"

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

154

155 #: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290

148 -#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347

156 +#: builtin/log.c:732 builtin/log.c:1319 builtin/log.c:1535 builtin/merge.c:347

157 #: builtin/shortlog.c:181

158 msgid "revision walk setup failed"

159 msgstr "misslyckades skapa revisionstraversering"

@@ -172,7 +180,7 @@ msgstr[1] "Paketet (bundlen) kräver dessa %d referenser"

180 msgid "rev-list died"

181 msgstr "rev-list dog"

182

175 -#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284

183 +#: bundle.c:300 builtin/log.c:1215 builtin/shortlog.c:284

184 #, c-format

185 msgid "unrecognized argument: %s"

186 msgstr "okänt argument: %s"

@@ -298,17 +306,17 @@ msgid_plural "%lu years ago"

306 msgstr[0] "%lu år sedan"

307 msgstr[1] "%lu år sedan"

308

301 -#: diff.c:105

309 +#: diff.c:111

310 #, c-format

303 -msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"

304 -msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%.*s\"\n"

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

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

313

306 -#: diff.c:110

314 +#: diff.c:116

315 #, c-format

308 -msgid " Unknown dirstat parameter '%.*s'\n"

309 -msgstr " Okänd dirstat-parameter \"%.*s\"\n"

316 +msgid " Unknown dirstat parameter '%s'\n"

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

318

311 -#: diff.c:210

319 +#: diff.c:219

320 #, c-format

321 msgid ""

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

@@ -317,7 +325,7 @@ msgstr ""

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

326 "%s"

327

320 -#: diff.c:3458

328 +#: diff.c:3467

329 #, c-format

330 msgid ""

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

@@ -338,17 +346,17 @@ msgstr "gpg godtog inte data"

346 msgid "gpg failed to sign the data"

347 msgstr "gpg misslyckades signera data"

348

341 -#: grep.c:1441

349 +#: grep.c:1622

350 #, c-format

351 msgid "'%s': unable to read %s"

352 msgstr "\"%s\" kunde inte läsa %s"

353

346 -#: grep.c:1458

354 +#: grep.c:1639

355 #, c-format

356 msgid "'%s': %s"

357 msgstr "\"%s\": %s"

358

351 -#: grep.c:1469

359 +#: grep.c:1650

360 #, c-format

361 msgid "'%s': short read %s"

362 msgstr "\"%s\": kort läsning %s"

@@ -408,6 +416,15 @@ msgstr[1] ""

416 "\n"

417 "Menade du ett av dessa?"

418

419 +#: merge.c:56

420 +msgid "failed to read the cache"

421 +msgstr "misslyckads läsa cachen"

422 +

423 +#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534

424 +#: builtin/clone.c:586

425 +msgid "unable to write new index file"

426 +msgstr "kunde inte skriva ny indexfil"

427 +

428 #: merge-recursive.c:190

429 #, c-format

430 msgid "(bad commit)\n"

@@ -587,7 +604,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)"

604 msgid "Auto-merging %s"

605 msgstr "Slår ihop %s automatiskt"

606

590 -#: merge-recursive.c:1633 git-submodule.sh:869

607 +#: merge-recursive.c:1633 git-submodule.sh:893

608 msgid "submodule"

609 msgstr "undermodul"

610

@@ -658,7 +675,7 @@ msgstr "sammanslagningen returnerade ingen incheckning"

675 msgid "Could not parse object '%s'"

676 msgstr "Kunde inte tolka objektet \"%s\""

677

661 -#: merge-recursive.c:2009 builtin/merge.c:696

678 +#: merge-recursive.c:2009 builtin/merge.c:643

679 msgid "Unable to write index."

680 msgstr "Kunde inte skriva indexet."

681

@@ -715,14 +732,14 @@ msgstr[1] ""

732 "Din gren och \"%s\" har divergerat,\n"

733 "och har %d respektive %d olika incheckningar.\n"

734

718 -#: sequencer.c:123 builtin/merge.c:864 builtin/merge.c:977

719 -#: builtin/merge.c:1087 builtin/merge.c:1097

735 +#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984

736 +#: builtin/merge.c:994

737 #, c-format

738 msgid "Could not open '%s' for writing"

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

740

724 -#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:867

725 -#: builtin/merge.c:1089 builtin/merge.c:1102

741 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986

742 +#: builtin/merge.c:999

743 #, c-format

744 msgid "Could not write to '%s'"

745 msgstr "Kunde inte skriva till \"%s\""

@@ -1348,7 +1365,7 @@ msgstr "git add [flaggor] [--] <filmönster>..."

1365 msgid "unexpected diff status %c"

1366 msgstr "diff-status %c förväntades inte"

1367

1351 -#: builtin/add.c:67 builtin/commit.c:230

1368 +#: builtin/add.c:67 builtin/commit.c:231

1369 msgid "updating files failed"

1370 msgstr "misslyckades uppdatera filer"

1371

@@ -1366,7 +1383,7 @@ msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\""

1383 msgid "Unstaged changes after refreshing the index:"

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

1385

1369 -#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186

1386 +#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:260

1387 #, c-format

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

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

@@ -1409,12 +1426,12 @@ msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"

1426

1427 #: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63

1428 #: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253

1412 -#: builtin/rm.c:133

1429 +#: builtin/rm.c:206

1430 msgid "dry run"

1431 msgstr "testkörning"

1432

1416 -#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1154

1417 -#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477

1433 +#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1160

1434 +#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1483

1435 #: builtin/mv.c:62 builtin/read-tree.c:112

1436 msgid "be verbose"

1437 msgstr "var pratsam"

@@ -1423,7 +1440,7 @@ msgstr "var pratsam"

1440 msgid "interactive picking"

1441 msgstr "plocka interaktivt"

1442

1426 -#: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248

1443 +#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:248

1444 msgid "select hunks interactively"

1445 msgstr "välj stycken interaktivt"

1446

@@ -1490,12 +1507,12 @@ msgstr "Inget angivet, inget tillagt.\n"

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

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

1509

1493 -#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:290 builtin/mv.c:82

1494 -#: builtin/rm.c:162

1510 +#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:291 builtin/mv.c:82

1511 +#: builtin/rm.c:235

1512 msgid "index file corrupt"

1513 msgstr "indexfilen trasig"

1514

1498 -#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260

1515 +#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:355

1516 msgid "Unable to write new index file"

1517 msgstr "Kunde inte skriva ny indexfil"

1518

@@ -2031,95 +2048,95 @@ msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil"

2048 msgid "[rev-opts] are documented in git-rev-list(1)"

2049 msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)"

2050

2034 -#: builtin/blame.c:2373

2051 +#: builtin/blame.c:2374

2052 msgid "Show blame entries as we find them, incrementally"

2053 msgstr "Visa klandringsposter när vi hittar dem, interaktivt"

2054

2038 -#: builtin/blame.c:2374

2055 +#: builtin/blame.c:2375

2056 msgid "Show blank SHA-1 for boundary commits (Default: off)"

2057 msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"

2058

2042 -#: builtin/blame.c:2375

2059 +#: builtin/blame.c:2376

2060 msgid "Do not treat root commits as boundaries (Default: off)"

2061 msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"

2062

2046 -#: builtin/blame.c:2376

2063 +#: builtin/blame.c:2377

2064 msgid "Show work cost statistics"

2065 msgstr "Visa statistik över arbetskostnad"

2066

2050 -#: builtin/blame.c:2377

2067 +#: builtin/blame.c:2378

2068 msgid "Show output score for blame entries"

2069 msgstr "Visa utdatapoäng för klandringsposter"

2070

2054 -#: builtin/blame.c:2378

2071 +#: builtin/blame.c:2379

2072 msgid "Show original filename (Default: auto)"

2073 msgstr "Visa originalfilnamn (Standard: auto)"

2074

2058 -#: builtin/blame.c:2379

2075 +#: builtin/blame.c:2380

2076 msgid "Show original linenumber (Default: off)"

2077 msgstr "Visa ursprungligt radnummer (Standard: av)"

2078

2062 -#: builtin/blame.c:2380

2079 +#: builtin/blame.c:2381

2080 msgid "Show in a format designed for machine consumption"

2081 msgstr "Visa i ett format avsett för maskinkonsumtion"

2082

2066 -#: builtin/blame.c:2381

2083 +#: builtin/blame.c:2382

2084 msgid "Show porcelain format with per-line commit information"

2085 msgstr "Visa porslinsformat med per-rad-incheckningsinformation"

2086

2070 -#: builtin/blame.c:2382

2087 +#: builtin/blame.c:2383

2088 msgid "Use the same output mode as git-annotate (Default: off)"

2089 msgstr "Använd samma utdataläge som git-annotate (Standard: av)"

2090

2074 -#: builtin/blame.c:2383

2091 +#: builtin/blame.c:2384

2092 msgid "Show raw timestamp (Default: off)"

2093 msgstr "Visa rå tidsstämpel (Standard: av)"

2094

2078 -#: builtin/blame.c:2384

2095 +#: builtin/blame.c:2385

2096 msgid "Show long commit SHA1 (Default: off)"

2097 msgstr "Visa lång inchecknings-SHA1 (Standard: av)"

2098

2082 -#: builtin/blame.c:2385

2099 +#: builtin/blame.c:2386

2100 msgid "Suppress author name and timestamp (Default: off)"

2101 msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"

2102

2086 -#: builtin/blame.c:2386

2103 +#: builtin/blame.c:2387

2104 msgid "Show author email instead of name (Default: off)"

2105 msgstr "Visa författarens e-post istället för namn (Standard: av)"

2106

2090 -#: builtin/blame.c:2387

2107 +#: builtin/blame.c:2388

2108 msgid "Ignore whitespace differences"

2109 msgstr "Ignorera ändringar i blanksteg"

2110

2094 -#: builtin/blame.c:2388

2111 +#: builtin/blame.c:2389

2112 msgid "Spend extra cycles to find better match"

2113 msgstr "Slösa extra cykler med att hitta bättre träff"

2114

2098 -#: builtin/blame.c:2389

2115 +#: builtin/blame.c:2390

2116 msgid "Use revisions from <file> instead of calling git-rev-list"

2117 msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"

2118

2102 -#: builtin/blame.c:2390

2119 +#: builtin/blame.c:2391

2120 msgid "Use <file>'s contents as the final image"

2121 msgstr "Använd <fil>s innehåll som slutgiltig bild"

2122

2106 -#: builtin/blame.c:2391 builtin/blame.c:2392

2123 +#: builtin/blame.c:2392 builtin/blame.c:2393

2124 msgid "score"

2125 msgstr "poäng"

2126

2110 -#: builtin/blame.c:2391

2127 +#: builtin/blame.c:2392

2128 msgid "Find line copies within and across files"

2129 msgstr "Hitta kopierade rader inuti och mellan filer"

2130

2114 -#: builtin/blame.c:2392

2131 +#: builtin/blame.c:2393

2132 msgid "Find line movements within and across files"

2133 msgstr "Hitta flyttade rader inuti och mellan filer"

2134

2118 -#: builtin/blame.c:2393

2135 +#: builtin/blame.c:2394

2136 msgid "n,m"

2137 msgstr "n,m"

2138

2122 -#: builtin/blame.c:2393

2139 +#: builtin/blame.c:2394

2140 msgid "Process only line range n,m, counting from 1"

2141 msgstr "Behandla endast radintervallet n,m, med början på 1"

2142

@@ -2157,267 +2174,267 @@ msgstr ""

2174 "tar inte bort grenen \"%s\" som inte har slagits ihop med\n"

2175 " \"%s\", trots att den har slagits ihop med HEAD."

2176

2160 -#: builtin/branch.c:181

2177 +#: builtin/branch.c:163

2178 +#, c-format

2179 +msgid "Couldn't look up commit object for '%s'"

2180 +msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""

2181 +

2182 +#: builtin/branch.c:167

2183 +#, c-format

2184 +msgid ""

2185 +"The branch '%s' is not fully merged.\n"

2186 +"If you are sure you want to delete it, run 'git branch -D %s'."

2187 +msgstr ""

2188 +"Grenen \"%s\" har inte slagits samman i sin helhet.\n"

2189 +"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."

2190 +

2191 +#: builtin/branch.c:180

2192 +msgid "Update of config-file failed"

2193 +msgstr "Misslyckades uppdatera konfigurationsfil"

2194 +

2195 +#: builtin/branch.c:208

2196 msgid "cannot use -a with -d"

2197 msgstr "kan inte ange -a med -d"

2198

2164 -#: builtin/branch.c:187

2199 +#: builtin/branch.c:214

2200 msgid "Couldn't look up commit object for HEAD"

2201 msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"

2202

2168 -#: builtin/branch.c:192

2203 +#: builtin/branch.c:222

2204 #, c-format

2205 msgid "Cannot delete the branch '%s' which you are currently on."

2206 msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande."

2207

2173 -#: builtin/branch.c:203

2208 +#: builtin/branch.c:235

2209 #, c-format

2210 msgid "remote branch '%s' not found."

2211 msgstr "fjärrgrenen \"%s\" hittades inte."

2212

2178 -#: builtin/branch.c:204

2213 +#: builtin/branch.c:236

2214 #, c-format

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

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

2217

2183 -#: builtin/branch.c:211

2184 -#, c-format

2185 -msgid "Couldn't look up commit object for '%s'"

2186 -msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""

2187 -

2188 -#: builtin/branch.c:217

2189 -#, c-format

2190 -msgid ""

2191 -"The branch '%s' is not fully merged.\n"

2192 -"If you are sure you want to delete it, run 'git branch -D %s'."

2193 -msgstr ""

2194 -"Grenen \"%s\" har inte slagits samman i sin helhet.\n"

2195 -"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."

2196 -

2197 -#: builtin/branch.c:226

2218 +#: builtin/branch.c:250

2219 #, c-format

2220 msgid "Error deleting remote branch '%s'"

2221 msgstr "Fel vid borttagning av fjärrgrenen \"%s\""

2222

2202 -#: builtin/branch.c:227

2223 +#: builtin/branch.c:251

2224 #, c-format

2225 msgid "Error deleting branch '%s'"

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

2227

2207 -#: builtin/branch.c:234

2228 +#: builtin/branch.c:258

2229 #, c-format

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

2231 msgstr "Tog bort fjärrgrenen %s (var %s).\n"

2232

2212 -#: builtin/branch.c:235

2233 +#: builtin/branch.c:259

2234 #, c-format

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

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

2237

2217 -#: builtin/branch.c:240

2218 -msgid "Update of config-file failed"

2219 -msgstr "Misslyckades uppdatera konfigurationsfil"

2220 -

2221 -#: builtin/branch.c:338

2238 +#: builtin/branch.c:361

2239 #, c-format

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

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

2242

2226 -#: builtin/branch.c:410

2243 +#: builtin/branch.c:433

2244 #, c-format

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

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

2247

2231 -#: builtin/branch.c:412

2248 +#: builtin/branch.c:435

2249 #, c-format

2250 msgid "[behind %d]"

2251 msgstr "[bakom %d] "

2252

2236 -#: builtin/branch.c:416

2253 +#: builtin/branch.c:439

2254 #, c-format

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

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

2257

2241 -#: builtin/branch.c:418

2258 +#: builtin/branch.c:441

2259 #, c-format

2260 msgid "[ahead %d]"

2261 msgstr "[före %d] "

2262

2246 -#: builtin/branch.c:421

2263 +#: builtin/branch.c:444

2264 #, c-format

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

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

2267

2251 -#: builtin/branch.c:424

2268 +#: builtin/branch.c:447

2269 #, c-format

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

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

2272

2256 -#: builtin/branch.c:537

2273 +#: builtin/branch.c:560

2274 msgid "(no branch)"

2275 msgstr "(ingen gren)"

2276

2260 -#: builtin/branch.c:602

2277 +#: builtin/branch.c:625

2278 msgid "some refs could not be read"

2279 msgstr "vissa referenser kunde inte läsas"

2280

2264 -#: builtin/branch.c:615

2281 +#: builtin/branch.c:638

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

2283 msgstr ""

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

2285

2269 -#: builtin/branch.c:625

2286 +#: builtin/branch.c:648

2287 #, c-format

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

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

2290

2274 -#: builtin/branch.c:640

2291 +#: builtin/branch.c:663

2292 msgid "Branch rename failed"

2293 msgstr "Misslyckades byta namn på gren"

2294

2278 -#: builtin/branch.c:644

2295 +#: builtin/branch.c:667

2296 #, c-format

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

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

2299

2283 -#: builtin/branch.c:648

2300 +#: builtin/branch.c:671

2301 #, c-format

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

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

2304

2288 -#: builtin/branch.c:655

2305 +#: builtin/branch.c:678

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

2307 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

2308

2292 -#: builtin/branch.c:670

2309 +#: builtin/branch.c:693

2310 #, c-format

2311 msgid "malformed object name %s"

2312 msgstr "felformat objektnamn %s"

2313

2297 -#: builtin/branch.c:694

2314 +#: builtin/branch.c:717

2315 #, c-format

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

2317 msgstr "kunde inte skriva grenbeskrivningsmall: %s"

2318

2302 -#: builtin/branch.c:724

2319 +#: builtin/branch.c:747

2320 msgid "Generic options"

2321 msgstr "Allmänna flaggor"

2322

2306 -#: builtin/branch.c:726

2323 +#: builtin/branch.c:749

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

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

2326

2310 -#: builtin/branch.c:727

2327 +#: builtin/branch.c:750

2328 msgid "suppress informational messages"

2329 msgstr "undertryck informationsmeddelanden"

2330

2314 -#: builtin/branch.c:728

2331 +#: builtin/branch.c:751

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

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

2334

2318 -#: builtin/branch.c:730

2335 +#: builtin/branch.c:753

2336 msgid "change upstream info"

2337 msgstr "ändra uppströmsinformation"

2338

2322 -#: builtin/branch.c:734

2339 +#: builtin/branch.c:757

2340 msgid "use colored output"

2341 msgstr "använd färgad utdata"

2342

2326 -#: builtin/branch.c:735

2343 +#: builtin/branch.c:758

2344 msgid "act on remote-tracking branches"

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

2346

2330 -#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765

2331 -#: builtin/branch.c:771 builtin/commit.c:1362 builtin/commit.c:1363

2332 -#: builtin/commit.c:1364 builtin/commit.c:1365 builtin/tag.c:470

2347 +#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788

2348 +#: builtin/branch.c:794 builtin/commit.c:1376 builtin/commit.c:1377

2349 +#: builtin/commit.c:1378 builtin/commit.c:1379 builtin/tag.c:470

2350 msgid "commit"

2351 msgstr "incheckning"

2352

2336 -#: builtin/branch.c:739 builtin/branch.c:745

2353 +#: builtin/branch.c:762 builtin/branch.c:768

2354 msgid "print only branches that contain the commit"

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

2356

2340 -#: builtin/branch.c:751

2357 +#: builtin/branch.c:774

2358 msgid "Specific git-branch actions:"

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

2360

2344 -#: builtin/branch.c:752

2361 +#: builtin/branch.c:775

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

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

2364

2348 -#: builtin/branch.c:754

2365 +#: builtin/branch.c:777

2366 msgid "delete fully merged branch"

2367 msgstr "ta bort helt sammanslagen gren"

2368

2352 -#: builtin/branch.c:755

2369 +#: builtin/branch.c:778

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

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

2372

2356 -#: builtin/branch.c:756

2373 +#: builtin/branch.c:779

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

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

2376

2360 -#: builtin/branch.c:757

2377 +#: builtin/branch.c:780

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

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

2380

2364 -#: builtin/branch.c:758

2381 +#: builtin/branch.c:781

2382 msgid "list branch names"

2383 msgstr "lista namn på grenar"

2384

2368 -#: builtin/branch.c:759

2385 +#: builtin/branch.c:782

2386 msgid "create the branch's reflog"

2387 msgstr "skapa grenens reflogg"

2388

2372 -#: builtin/branch.c:761

2389 +#: builtin/branch.c:784

2390 msgid "edit the description for the branch"

2391 msgstr "redigera beskrivning för grenen"

2392

2376 -#: builtin/branch.c:762

2393 +#: builtin/branch.c:785

2394 msgid "force creation (when already exists)"

2395 msgstr "tvinga skapande (när den redan finns)"

2396

2380 -#: builtin/branch.c:765

2397 +#: builtin/branch.c:788

2398 msgid "print only not merged branches"

2399 msgstr "visa endast ej sammanslagna grenar"

2400

2384 -#: builtin/branch.c:771

2401 +#: builtin/branch.c:794

2402 msgid "print only merged branches"

2403 msgstr "visa endast sammanslagna grenar"

2404

2388 -#: builtin/branch.c:775

2405 +#: builtin/branch.c:798

2406 msgid "list branches in columns"

2407 msgstr "visa grenar i spalter"

2408

2392 -#: builtin/branch.c:788

2409 +#: builtin/branch.c:811

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

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

2412

2396 -#: builtin/branch.c:793 builtin/clone.c:561

2413 +#: builtin/branch.c:816 builtin/clone.c:561

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

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

2416

2400 -#: builtin/branch.c:813

2417 +#: builtin/branch.c:836

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

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

2420

2404 -#: builtin/branch.c:864

2421 +#: builtin/branch.c:887

2422 #, c-format

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

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

2425

2409 -#: builtin/branch.c:876

2426 +#: builtin/branch.c:899

2427 #, c-format

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

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

2430

2414 -#: builtin/branch.c:891

2431 +#: builtin/branch.c:914

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

2433 msgstr ""

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

2435 "grennamn"

2436

2420 -#: builtin/branch.c:894

2437 +#: builtin/branch.c:917

2438 #, c-format

2439 msgid ""

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

@@ -2426,7 +2443,7 @@ msgstr ""

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

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

2445

2429 -#: builtin/branch.c:911

2446 +#: builtin/branch.c:934

2447 #, c-format

2448 msgid ""

2449 "\n"

@@ -2437,12 +2454,12 @@ msgstr ""

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

2455 "\n"

2456

2440 -#: builtin/branch.c:912

2457 +#: builtin/branch.c:935

2458 #, c-format

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

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

2461

2445 -#: builtin/branch.c:913

2462 +#: builtin/branch.c:936

2463 #, c-format

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

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

@@ -2631,11 +2648,6 @@ msgstr "indexfilen är trasig"

2648 msgid "path '%s' is unmerged"

2649 msgstr "sökvägen \"%s\" har inte slagits ihop"

2650

2634 -#: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586

2635 -#: builtin/merge.c:811

2636 -msgid "unable to write new index file"

2637 -msgstr "kunde inte skriva ny indexfil"

2638 -

2651 #: builtin/checkout.c:448

2652 msgid "you need to resolve your current index first"

2653 msgstr "du måste lösa ditt befintliga index först"

@@ -2664,7 +2676,7 @@ msgstr "Redan på \"%s\"\n"

2676 msgid "Switched to and reset branch '%s'\n"

2677 msgstr "Växlade till och nollställde grenen \"%s\"\n"

2678

2667 -#: builtin/checkout.c:618

2679 +#: builtin/checkout.c:618 builtin/checkout.c:955

2680 #, c-format

2681 msgid "Switched to a new branch '%s'\n"

2682 msgstr "Växlade till en ny gren \"%s\"\n"

@@ -2742,112 +2754,112 @@ msgstr "felaktig referens: %s"

2754 msgid "reference is not a tree: %s"

2755 msgstr "referensen är inte ett träd: %s"

2756

2745 -#: builtin/checkout.c:961

2757 +#: builtin/checkout.c:964

2758 msgid "paths cannot be used with switching branches"

2759 msgstr "sökvägar kan inte användas vid byte av gren"

2760

2749 -#: builtin/checkout.c:964 builtin/checkout.c:968

2761 +#: builtin/checkout.c:967 builtin/checkout.c:971

2762 #, c-format

2763 msgid "'%s' cannot be used with switching branches"

2764 msgstr "\"%s\" kan inte användas vid byte av gren"

2765

2754 -#: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980

2755 -#: builtin/checkout.c:983

2766 +#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983

2767 +#: builtin/checkout.c:986

2768 #, c-format

2769 msgid "'%s' cannot be used with '%s'"

2770 msgstr "\"%s\" kan inte användas med \"%s\""

2771

2760 -#: builtin/checkout.c:988

2772 +#: builtin/checkout.c:991

2773 #, c-format

2774 msgid "Cannot switch branch to a non-commit '%s'"

2775 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""

2776

2765 -#: builtin/checkout.c:1009 builtin/gc.c:177

2777 +#: builtin/checkout.c:1012 builtin/gc.c:177

2778 msgid "suppress progress reporting"

2779 msgstr "undertryck förloppsrapportering"

2780

2769 -#: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89

2781 +#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89

2782 #: builtin/remote.c:169 builtin/remote.c:171

2783 msgid "branch"

2784 msgstr "gren"

2785

2774 -#: builtin/checkout.c:1011

2786 +#: builtin/checkout.c:1014

2787 msgid "create and checkout a new branch"

2788 msgstr "skapa och checka ut en ny gren"

2789

2778 -#: builtin/checkout.c:1013

2790 +#: builtin/checkout.c:1016

2791 msgid "create/reset and checkout a branch"

2792 msgstr "skapa/nollställ och checka ut en gren"

2793

2782 -#: builtin/checkout.c:1014

2794 +#: builtin/checkout.c:1017

2795 msgid "create reflog for new branch"

2796 msgstr "skapa reflogg för ny gren"

2797

2786 -#: builtin/checkout.c:1015

2798 +#: builtin/checkout.c:1018

2799 msgid "detach the HEAD at named commit"

2800 msgstr "koppla från HEAD vid namngiven incheckning"

2801

2790 -#: builtin/checkout.c:1016

2802 +#: builtin/checkout.c:1019

2803 msgid "set upstream info for new branch"

2804 msgstr "sätt uppströmsinformation för ny gren"

2805

2794 -#: builtin/checkout.c:1018

2806 +#: builtin/checkout.c:1021

2807 msgid "new branch"

2808 msgstr "ny gren"

2809

2798 -#: builtin/checkout.c:1018

2810 +#: builtin/checkout.c:1021

2811 msgid "new unparented branch"

2812 msgstr "ny gren utan förälder"

2813

2802 -#: builtin/checkout.c:1019

2814 +#: builtin/checkout.c:1022

2815 msgid "checkout our version for unmerged files"

2816 msgstr "checka ut vår version för ej sammanslagna filer"

2817

2806 -#: builtin/checkout.c:1021

2818 +#: builtin/checkout.c:1024

2819 msgid "checkout their version for unmerged files"

2820 msgstr "checka ut deras version för ej sammanslagna filer"

2821

2810 -#: builtin/checkout.c:1023

2822 +#: builtin/checkout.c:1026

2823 msgid "force checkout (throw away local modifications)"

2824 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"

2825

2814 -#: builtin/checkout.c:1024

2826 +#: builtin/checkout.c:1027

2827 msgid "perform a 3-way merge with the new branch"

2828 msgstr "utför en 3-vägssammanslagning för den nya grenen"

2829

2818 -#: builtin/checkout.c:1025 builtin/merge.c:215

2830 +#: builtin/checkout.c:1028 builtin/merge.c:215

2831 msgid "update ignored files (default)"

2832 msgstr "uppdatera ignorerade filer (standard)"

2833

2822 -#: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241

2834 +#: builtin/checkout.c:1029 builtin/log.c:1116 parse-options.h:241

2835 msgid "style"

2836 msgstr "stil"

2837

2826 -#: builtin/checkout.c:1027

2838 +#: builtin/checkout.c:1030

2839 msgid "conflict style (merge or diff3)"

2840 msgstr "konfliktstil (merge eller diff3)"

2841

2830 -#: builtin/checkout.c:1030

2842 +#: builtin/checkout.c:1033

2843 msgid "second guess 'git checkout no-such-branch'"

2844 msgstr "förutspå \"git checkout gren-saknas\""

2845

2834 -#: builtin/checkout.c:1054

2846 +#: builtin/checkout.c:1057

2847 msgid "-b, -B and --orphan are mutually exclusive"

2848 msgstr "-b, -B och --orphan är ömsesidigt uteslutande"

2849

2838 -#: builtin/checkout.c:1071

2850 +#: builtin/checkout.c:1074

2851 msgid "--track needs a branch name"

2852 msgstr "--track behöver ett namn på en gren"

2853

2842 -#: builtin/checkout.c:1078

2854 +#: builtin/checkout.c:1081

2855 msgid "Missing branch name; try -b"

2856 msgstr "Grennamn saknas; försök med -b"

2857

2846 -#: builtin/checkout.c:1113

2858 +#: builtin/checkout.c:1116

2859 msgid "invalid path specification"

2860 msgstr "felaktig sökvägsangivelse"

2861

2850 -#: builtin/checkout.c:1120

2862 +#: builtin/checkout.c:1123

2863 #, c-format

2864 msgid ""

2865 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -2856,12 +2868,12 @@ msgstr ""

2868 "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"

2869 "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"

2870

2859 -#: builtin/checkout.c:1125

2871 +#: builtin/checkout.c:1128

2872 #, c-format

2873 msgid "git checkout: --detach does not take a path argument '%s'"

2874 msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""

2875

2864 -#: builtin/checkout.c:1129

2876 +#: builtin/checkout.c:1132

2877 msgid ""

2878 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

2879 "checking out of the index."

@@ -2886,8 +2898,8 @@ msgstr "tvinga"

2898 msgid "remove whole directories"

2899 msgstr "ta bort hela kataloger"

2900

2889 -#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:803

2890 -#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199

2901 +#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:717

2902 +#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182

2903 msgid "pattern"

2904 msgstr "mönster"

2905

@@ -3012,7 +3024,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD"

3024 msgid "path to git-upload-pack on the remote"

3025 msgstr "sökväg till git-upload-pack på fjärren"

3026

3015 -#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:748

3027 +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662

3028 msgid "depth"

3029 msgstr "djup"

3030

@@ -3247,93 +3259,93 @@ msgstr ""

3259 "\n"

3260 "Annars använder du \"git reset\"\n"

3261

3250 -#: builtin/commit.c:257

3262 +#: builtin/commit.c:258

3263 msgid "failed to unpack HEAD tree object"

3264 msgstr "misslyckades packa upp HEAD:s trädobjekt"

3265

3254 -#: builtin/commit.c:299

3266 +#: builtin/commit.c:300

3267 msgid "unable to create temporary index"

3268 msgstr "kunde inte skapa temporär indexfil"

3269

3258 -#: builtin/commit.c:305

3270 +#: builtin/commit.c:306

3271 msgid "interactive add failed"

3272 msgstr "interaktiv tilläggning misslyckades"

3273

3262 -#: builtin/commit.c:338 builtin/commit.c:359 builtin/commit.c:409

3274 +#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410

3275 msgid "unable to write new_index file"

3276 msgstr "kunde inte skriva filen new_index"

3277

3266 -#: builtin/commit.c:390

3278 +#: builtin/commit.c:391

3279 msgid "cannot do a partial commit during a merge."

3280 msgstr "kan inte utföra en delvis incheckning under en sammanslagning."

3281

3270 -#: builtin/commit.c:392

3282 +#: builtin/commit.c:393

3283 msgid "cannot do a partial commit during a cherry-pick."

3284 msgstr "kan inte utföra en delvis incheckning under en cherry-pick."

3285

3274 -#: builtin/commit.c:402

3286 +#: builtin/commit.c:403

3287 msgid "cannot read the index"

3288 msgstr "kan inte läsa indexet"

3289

3278 -#: builtin/commit.c:422

3290 +#: builtin/commit.c:423

3291 msgid "unable to write temporary index file"

3292 msgstr "kunde inte skriva temporär indexfil"

3293

3282 -#: builtin/commit.c:509 builtin/commit.c:515

3294 +#: builtin/commit.c:511 builtin/commit.c:517

3295 #, c-format

3296 msgid "invalid commit: %s"

3297 msgstr "felaktig incheckning: %s"

3298

3287 -#: builtin/commit.c:538

3299 +#: builtin/commit.c:540

3300 msgid "malformed --author parameter"

3301 msgstr "felformad \"--author\"-flagga"

3302

3291 -#: builtin/commit.c:558

3303 +#: builtin/commit.c:560

3304 #, c-format

3305 msgid "Malformed ident string: '%s'"

3306 msgstr "Felaktig indragningssträng: \"%s\""

3307

3296 -#: builtin/commit.c:596 builtin/commit.c:629 builtin/commit.c:952

3308 +#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954

3309 #, c-format

3310 msgid "could not lookup commit %s"

3311 msgstr "kunde inte slå upp incheckningen %s"

3312

3301 -#: builtin/commit.c:608 builtin/shortlog.c:296

3313 +#: builtin/commit.c:610 builtin/shortlog.c:296

3314 #, c-format

3315 msgid "(reading log message from standard input)\n"

3316 msgstr "(läser loggmeddelande från standard in)\n"

3317

3306 -#: builtin/commit.c:610

3318 +#: builtin/commit.c:612

3319 msgid "could not read log from standard input"

3320 msgstr "kunde inte läsa logg från standard in"

3321

3310 -#: builtin/commit.c:614

3322 +#: builtin/commit.c:616

3323 #, c-format

3324 msgid "could not read log file '%s'"

3325 msgstr "kunde inte läsa loggfilen \"%s\""

3326

3315 -#: builtin/commit.c:620

3327 +#: builtin/commit.c:622

3328 msgid "commit has empty message"

3329 msgstr "incheckningen har ett tomt meddelande"

3330

3319 -#: builtin/commit.c:636

3331 +#: builtin/commit.c:638

3332 msgid "could not read MERGE_MSG"

3333 msgstr "kunde inte läsa MERGE_MSG"

3334

3323 -#: builtin/commit.c:640

3335 +#: builtin/commit.c:642

3336 msgid "could not read SQUASH_MSG"

3337 msgstr "kunde inte läsa SQUASH_MSG"

3338

3327 -#: builtin/commit.c:644

3339 +#: builtin/commit.c:646

3340 #, c-format

3341 msgid "could not read '%s'"

3342 msgstr "kunde inte läsa \"%s\""

3343

3332 -#: builtin/commit.c:705

3344 +#: builtin/commit.c:707

3345 msgid "could not write commit template"

3346 msgstr "kunde inte skriva incheckningsmall"

3347

3336 -#: builtin/commit.c:716

3348 +#: builtin/commit.c:718

3349 #, c-format

3350 msgid ""

3351 "\n"

@@ -3348,7 +3360,7 @@ msgstr ""

3360 "\t%s\n"

3361 "och försöker igen.\n"

3362

3351 -#: builtin/commit.c:721

3363 +#: builtin/commit.c:723

3364 #, c-format

3365 msgid ""

3366 "\n"

@@ -3363,7 +3375,7 @@ msgstr ""

3375 "\t%s\n"

3376 "och försöker igen.\n"

3377

3366 -#: builtin/commit.c:733

3378 +#: builtin/commit.c:735

3379 msgid ""

3380 "Please enter the commit message for your changes. Lines starting\n"

3381 "with '#' will be ignored, and an empty message aborts the commit.\n"

@@ -3371,7 +3383,7 @@ msgstr ""

3383 "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"

3384 "med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n"

3385

3374 -#: builtin/commit.c:738

3386 +#: builtin/commit.c:740

3387 msgid ""

3388 "Please enter the commit message for your changes. Lines starting\n"

3389 "with '#' will be kept; you may remove them yourself if you want to.\n"

@@ -3381,131 +3393,139 @@ msgstr ""

3393 "med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n"

3394 "Ett tomt meddelande avbryter incheckningen.\n"

3395

3384 -#: builtin/commit.c:751

3396 +#: builtin/commit.c:753

3397 #, c-format

3398 msgid "%sAuthor: %s"

3399 msgstr "%sFörfattare: %s"

3400

3389 -#: builtin/commit.c:758

3401 +#: builtin/commit.c:760

3402 #, c-format

3403 msgid "%sCommitter: %s"

3404 msgstr "%sIncheckare: %s"

3405

3394 -#: builtin/commit.c:778

3406 +#: builtin/commit.c:780

3407 msgid "Cannot read index"

3408 msgstr "Kan inte läsa indexet"

3409

3398 -#: builtin/commit.c:815

3410 +#: builtin/commit.c:817

3411 msgid "Error building trees"

3412 msgstr "Fel vid byggande av träd"

3413

3402 -#: builtin/commit.c:830 builtin/tag.c:361

3414 +#: builtin/commit.c:832 builtin/tag.c:361

3415 #, c-format

3416 msgid "Please supply the message using either -m or -F option.\n"

3417 msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"

3418

3407 -#: builtin/commit.c:927

3419 +#: builtin/commit.c:929

3420 #, c-format

3421 msgid "No existing author found with '%s'"

3422 msgstr "Hittade ingen befintlig författare med \"%s\""

3423

3412 -#: builtin/commit.c:942 builtin/commit.c:1142

3424 +#: builtin/commit.c:944 builtin/commit.c:1148

3425 #, c-format

3426 msgid "Invalid untracked files mode '%s'"

3427 msgstr "Ogiltigt läge för ospårade filer: \"%s\""

3428

3417 -#: builtin/commit.c:982

3429 +#: builtin/commit.c:984

3430 msgid "Using both --reset-author and --author does not make sense"

3431 msgstr "Kan inte använda både --reset-author och --author"

3432

3421 -#: builtin/commit.c:993

3433 +#: builtin/commit.c:995

3434 msgid "You have nothing to amend."

3435 msgstr "Du har inget att utöka."

3436

3425 -#: builtin/commit.c:996

3437 +#: builtin/commit.c:998

3438 msgid "You are in the middle of a merge -- cannot amend."

3439 msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."

3440

3429 -#: builtin/commit.c:998

3441 +#: builtin/commit.c:1000

3442 msgid "You are in the middle of a cherry-pick -- cannot amend."

3443 msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."

3444

3433 -#: builtin/commit.c:1001

3445 +#: builtin/commit.c:1003

3446 msgid "Options --squash and --fixup cannot be used together"

3447 msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"

3448

3437 -#: builtin/commit.c:1011

3449 +#: builtin/commit.c:1013

3450 msgid "Only one of -c/-C/-F/--fixup can be used."

3451 msgstr "Endast en av -c/-C/-F/--fixup kan användas."

3452

3441 -#: builtin/commit.c:1013

3453 +#: builtin/commit.c:1015

3454 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

3455 msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."

3456

3445 -#: builtin/commit.c:1021

3457 +#: builtin/commit.c:1023

3458 msgid "--reset-author can be used only with -C, -c or --amend."

3459 msgstr "--reset-author kan endast användas med -C, -c eller --amend."

3460

3449 -#: builtin/commit.c:1038

3461 +#: builtin/commit.c:1040

3462 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

3463 msgstr ""

3464 "Endast en av --include/--only/--all/--interactive/--patch kan användas."

3465

3454 -#: builtin/commit.c:1040

3466 +#: builtin/commit.c:1042

3467 msgid "No paths with --include/--only does not make sense."

3468 msgstr "Du måste ange sökvägar tillsammans med --include/--only."

3469

3458 -#: builtin/commit.c:1042

3470 +#: builtin/commit.c:1044

3471 msgid "Clever... amending the last one with dirty index."

3472 msgstr "Smart... utöka den senaste med smutsigt index."

3473

3462 -#: builtin/commit.c:1044

3474 +#: builtin/commit.c:1046

3475 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

3476 msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."

3477

3466 -#: builtin/commit.c:1054 builtin/tag.c:577

3478 +#: builtin/commit.c:1056 builtin/tag.c:577

3479 #, c-format

3480 msgid "Invalid cleanup mode %s"

3481 msgstr "Felaktigt städningsläge %s"

3482

3471 -#: builtin/commit.c:1059

3483 +#: builtin/commit.c:1061

3484 msgid "Paths with -a does not make sense."

3485 msgstr "Kan inte ange sökvägar med -a."

3486

3475 -#: builtin/commit.c:1156 builtin/commit.c:1384

3487 +#: builtin/commit.c:1067 builtin/commit.c:1202

3488 +msgid "--long and -z are incompatible"

3489 +msgstr "--long och -z är inkompatibla"

3490 +

3491 +#: builtin/commit.c:1162 builtin/commit.c:1398

3492 msgid "show status concisely"

3493 msgstr "vis koncis status"

3494

3479 -#: builtin/commit.c:1158 builtin/commit.c:1386

3495 +#: builtin/commit.c:1164 builtin/commit.c:1400

3496 msgid "show branch information"

3497 msgstr "visa information om gren"

3498

3483 -#: builtin/commit.c:1160 builtin/commit.c:1388 builtin/push.c:389

3499 +#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/push.c:389

3500 msgid "machine-readable output"

3501 msgstr "maskinläsbar utdata"

3502

3487 -#: builtin/commit.c:1163 builtin/commit.c:1390

3503 +#: builtin/commit.c:1169 builtin/commit.c:1404

3504 +msgid "show status in long format (default)"

3505 +msgstr "visa status i långt format (standard)"

3506 +

3507 +#: builtin/commit.c:1172 builtin/commit.c:1407

3508 msgid "terminate entries with NUL"

3509 msgstr "terminera poster med NUL"

3510

3491 -#: builtin/commit.c:1165 builtin/commit.c:1393 builtin/fast-export.c:636

3511 +#: builtin/commit.c:1174 builtin/commit.c:1410 builtin/fast-export.c:636

3512 #: builtin/fast-export.c:639 builtin/tag.c:461

3513 msgid "mode"

3514 msgstr "läge"

3515

3496 -#: builtin/commit.c:1166 builtin/commit.c:1393

3516 +#: builtin/commit.c:1175 builtin/commit.c:1410

3517 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

3518 msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"

3519

3500 -#: builtin/commit.c:1169

3520 +#: builtin/commit.c:1178

3521 msgid "show ignored files"

3522 msgstr "visa ignorerade filer"

3523

3504 -#: builtin/commit.c:1170 parse-options.h:151

3524 +#: builtin/commit.c:1179 parse-options.h:151

3525 msgid "when"

3526 msgstr "när"

3527

3508 -#: builtin/commit.c:1171

3528 +#: builtin/commit.c:1180

3529 msgid ""

3530 "ignore changes to submodules, optional when: all, dirty, untracked. "

3531 "(Default: all)"

@@ -3513,217 +3533,217 @@ msgstr ""

3533 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "

3534 "(Default: all)"

3535

3516 -#: builtin/commit.c:1173

3536 +#: builtin/commit.c:1182

3537 msgid "list untracked files in columns"

3538 msgstr "visa ospårade filer i spalter"

3539

3520 -#: builtin/commit.c:1242

3540 +#: builtin/commit.c:1256

3541 msgid "couldn't look up newly created commit"

3542 msgstr "kunde inte slå upp en precis skapad incheckning"

3543

3524 -#: builtin/commit.c:1244

3544 +#: builtin/commit.c:1258

3545 msgid "could not parse newly created commit"

3546 msgstr "kunde inte tolka en precis skapad incheckning"

3547

3528 -#: builtin/commit.c:1285

3548 +#: builtin/commit.c:1299

3549 msgid "detached HEAD"

3550 msgstr "frånkopplad HEAD"

3551

3532 -#: builtin/commit.c:1287

3552 +#: builtin/commit.c:1301

3553 msgid " (root-commit)"

3554 msgstr " (rotincheckning)"

3555

3536 -#: builtin/commit.c:1354

3556 +#: builtin/commit.c:1368

3557 msgid "suppress summary after successful commit"

3558 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

3559

3540 -#: builtin/commit.c:1355

3560 +#: builtin/commit.c:1369

3561 msgid "show diff in commit message template"

3562 msgstr "visa diff i mallen för incheckningsmeddelandet"

3563

3544 -#: builtin/commit.c:1357

3564 +#: builtin/commit.c:1371

3565 msgid "Commit message options"

3566 msgstr "Alternativ för incheckningsmeddelande"

3567

3548 -#: builtin/commit.c:1358 builtin/tag.c:459

3568 +#: builtin/commit.c:1372 builtin/tag.c:459

3569 msgid "read message from file"

3570 msgstr "läs meddelande från fil"

3571

3552 -#: builtin/commit.c:1359

3572 +#: builtin/commit.c:1373

3573 msgid "author"

3574 msgstr "författare"

3575

3556 -#: builtin/commit.c:1359

3576 +#: builtin/commit.c:1373

3577 msgid "override author for commit"

3578 msgstr "överstyr författare för incheckningen"

3579

3560 -#: builtin/commit.c:1360 builtin/gc.c:178

3580 +#: builtin/commit.c:1374 builtin/gc.c:178

3581 msgid "date"

3582 msgstr "datum"

3583

3564 -#: builtin/commit.c:1360

3584 +#: builtin/commit.c:1374

3585 msgid "override date for commit"

3586 msgstr "överstyr datum för inchecknignen"

3587

3568 -#: builtin/commit.c:1361 builtin/merge.c:206 builtin/notes.c:537

3588 +#: builtin/commit.c:1375 builtin/merge.c:206 builtin/notes.c:537

3589 #: builtin/notes.c:694 builtin/tag.c:457

3590 msgid "message"

3591 msgstr "meddelande"

3592

3573 -#: builtin/commit.c:1361

3593 +#: builtin/commit.c:1375

3594 msgid "commit message"

3595 msgstr "incheckningsmeddelande"

3596

3577 -#: builtin/commit.c:1362

3597 +#: builtin/commit.c:1376

3598 msgid "reuse and edit message from specified commit"

3599 msgstr "återanvänd och redigera meddelande från angiven incheckning"

3600

3581 -#: builtin/commit.c:1363

3601 +#: builtin/commit.c:1377

3602 msgid "reuse message from specified commit"

3603 msgstr "återanvänd meddelande från angiven incheckning"

3604

3585 -#: builtin/commit.c:1364

3605 +#: builtin/commit.c:1378

3606 msgid "use autosquash formatted message to fixup specified commit"

3607 msgstr ""

3608 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"

3609

3590 -#: builtin/commit.c:1365

3610 +#: builtin/commit.c:1379

3611 msgid "use autosquash formatted message to squash specified commit"

3612 msgstr ""

3613 "använd autosquash-formaterat meddelande för att slå ihop med angiven "

3614 "incheckning"

3615

3596 -#: builtin/commit.c:1366

3616 +#: builtin/commit.c:1380

3617 msgid "the commit is authored by me now (used with -C/-c/--amend)"

3618 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"

3619

3600 -#: builtin/commit.c:1367 builtin/log.c:1068 builtin/revert.c:109

3620 +#: builtin/commit.c:1381 builtin/log.c:1073 builtin/revert.c:109

3621 msgid "add Signed-off-by:"

3622 msgstr "lägg till Signed-off-by:"

3623

3604 -#: builtin/commit.c:1368

3624 +#: builtin/commit.c:1382

3625 msgid "use specified template file"

3626 msgstr "använd angiven mallfil"

3627

3608 -#: builtin/commit.c:1369

3628 +#: builtin/commit.c:1383

3629 msgid "force edit of commit"

3630 msgstr "tvinga redigering av incheckning"

3631

3612 -#: builtin/commit.c:1370

3632 +#: builtin/commit.c:1384

3633 msgid "default"

3634 msgstr "standard"

3635

3616 -#: builtin/commit.c:1370 builtin/tag.c:462

3636 +#: builtin/commit.c:1384 builtin/tag.c:462

3637 msgid "how to strip spaces and #comments from message"

3638 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

3639

3620 -#: builtin/commit.c:1371

3640 +#: builtin/commit.c:1385

3641 msgid "include status in commit message template"

3642 msgstr "inkludera status i mallen för incheckningsmeddelandet"

3643

3624 -#: builtin/commit.c:1372 builtin/merge.c:213 builtin/tag.c:463

3644 +#: builtin/commit.c:1386 builtin/merge.c:213 builtin/tag.c:463

3645 msgid "key id"

3646 msgstr "nyckel-id"

3647

3628 -#: builtin/commit.c:1373 builtin/merge.c:214

3648 +#: builtin/commit.c:1387 builtin/merge.c:214

3649 msgid "GPG sign commit"

3650 msgstr "GPG-signera incheckning"

3651

3652 #. end commit message options

3633 -#: builtin/commit.c:1376

3653 +#: builtin/commit.c:1390

3654 msgid "Commit contents options"

3655 msgstr "Alternativ för incheckningens innehåll"

3656

3637 -#: builtin/commit.c:1377

3657 +#: builtin/commit.c:1391

3658 msgid "commit all changed files"

3659 msgstr "checka in alla ändrade filer"

3660

3641 -#: builtin/commit.c:1378

3661 +#: builtin/commit.c:1392

3662 msgid "add specified files to index for commit"

3663 msgstr "lägg till angivna filer till indexet för incheckning"

3664

3645 -#: builtin/commit.c:1379

3665 +#: builtin/commit.c:1393

3666 msgid "interactively add files"

3667 msgstr "lägg till filer interaktivt"

3668

3649 -#: builtin/commit.c:1380

3669 +#: builtin/commit.c:1394

3670 msgid "interactively add changes"

3671 msgstr "lägg till ändringar interaktivt"

3672

3653 -#: builtin/commit.c:1381

3673 +#: builtin/commit.c:1395

3674 msgid "commit only specified files"

3675 msgstr "checka endast in angivna filer"

3676

3657 -#: builtin/commit.c:1382

3677 +#: builtin/commit.c:1396

3678 msgid "bypass pre-commit hook"

3679 msgstr "förbigå pre-commit-krok"

3680

3661 -#: builtin/commit.c:1383

3681 +#: builtin/commit.c:1397

3682 msgid "show what would be committed"

3683 msgstr "visa vad som skulle checkas in"

3684

3665 -#: builtin/commit.c:1391

3685 +#: builtin/commit.c:1408

3686 msgid "amend previous commit"

3687 msgstr "lägg till föregående incheckning"

3688

3669 -#: builtin/commit.c:1392

3689 +#: builtin/commit.c:1409

3690 msgid "bypass post-rewrite hook"

3691 msgstr "förbigå post-rewrite-krok"

3692

3673 -#: builtin/commit.c:1397

3693 +#: builtin/commit.c:1414

3694 msgid "ok to record an empty change"

3695 msgstr "ok att registrera en tom ändring"

3696

3677 -#: builtin/commit.c:1400

3697 +#: builtin/commit.c:1417

3698 msgid "ok to record a change with an empty message"

3699 msgstr "ok att registrera en ändring med tomt meddelande"

3700

3681 -#: builtin/commit.c:1432

3701 +#: builtin/commit.c:1449

3702 msgid "could not parse HEAD commit"

3703 msgstr "kunde inte tolka HEAD:s incheckning"

3704

3685 -#: builtin/commit.c:1470 builtin/merge.c:508

3705 +#: builtin/commit.c:1487 builtin/merge.c:508

3706 #, c-format

3707 msgid "could not open '%s' for reading"

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

3709

3690 -#: builtin/commit.c:1477

3710 +#: builtin/commit.c:1494

3711 #, c-format

3712 msgid "Corrupt MERGE_HEAD file (%s)"

3713 msgstr "Trasig MERGE_HEAD-fil (%s)"

3714

3695 -#: builtin/commit.c:1484

3715 +#: builtin/commit.c:1501

3716 msgid "could not read MERGE_MODE"

3717 msgstr "kunde inte läsa MERGE_MODE"

3718

3699 -#: builtin/commit.c:1503

3719 +#: builtin/commit.c:1520

3720 #, c-format

3721 msgid "could not read commit message: %s"

3722 msgstr "kunde inte läsa incheckningsmeddelande: %s"

3723

3704 -#: builtin/commit.c:1517

3724 +#: builtin/commit.c:1534

3725 #, c-format

3726 msgid "Aborting commit; you did not edit the message.\n"

3727 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

3728

3709 -#: builtin/commit.c:1522

3729 +#: builtin/commit.c:1539

3730 #, c-format

3731 msgid "Aborting commit due to empty commit message.\n"

3732 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"

3733

3714 -#: builtin/commit.c:1537 builtin/merge.c:935 builtin/merge.c:960

3734 +#: builtin/commit.c:1554 builtin/merge.c:832 builtin/merge.c:857

3735 msgid "failed to write commit object"

3736 msgstr "kunde inte skriva incheckningsobjekt"

3737

3718 -#: builtin/commit.c:1558

3738 +#: builtin/commit.c:1575

3739 msgid "cannot lock HEAD ref"

3740 msgstr "kunde inte låsa HEAD-referens"

3741

3722 -#: builtin/commit.c:1562

3742 +#: builtin/commit.c:1579

3743 msgid "cannot update HEAD ref"

3744 msgstr "kunde inte uppdatera HEAD-referens"

3745

3726 -#: builtin/commit.c:1573

3746 +#: builtin/commit.c:1590

3747 msgid ""

3748 "Repository has been updated, but unable to write\n"

3749 "new_index file. Check that disk is not full or quota is\n"

@@ -3738,115 +3758,115 @@ msgstr ""

3758 msgid "git config [options]"

3759 msgstr "git config [flaggor]"

3760

3741 -#: builtin/config.c:52

3761 +#: builtin/config.c:51

3762 msgid "Config file location"

3763 msgstr "Konfigurationsfilens plats"

3764

3745 -#: builtin/config.c:53

3765 +#: builtin/config.c:52

3766 msgid "use global config file"

3767 msgstr "använd global konfigurationsfil"

3768

3749 -#: builtin/config.c:54

3769 +#: builtin/config.c:53

3770 msgid "use system config file"

3771 msgstr "använd systemets konfigurationsfil"

3772

3753 -#: builtin/config.c:55

3773 +#: builtin/config.c:54

3774 msgid "use repository config file"

3775 msgstr "använd arkivets konfigurationsfil"

3776

3757 -#: builtin/config.c:56

3777 +#: builtin/config.c:55

3778 msgid "use given config file"

3779 msgstr "använd angiven konfigurationsil"

3780

3761 -#: builtin/config.c:57

3781 +#: builtin/config.c:56

3782 msgid "Action"

3783 msgstr "Åtgärd"

3784

3765 -#: builtin/config.c:58

3785 +#: builtin/config.c:57

3786 msgid "get value: name [value-regex]"

3787 msgstr "hämta värde: namn [värde-reguttr]"

3788

3769 -#: builtin/config.c:59

3789 +#: builtin/config.c:58

3790 msgid "get all values: key [value-regex]"

3791 msgstr "hämta alla värden: nyckel [värde-reguttr]"

3792

3773 -#: builtin/config.c:60

3793 +#: builtin/config.c:59

3794 msgid "get values for regexp: name-regex [value-regex]"

3795 msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"

3796

3777 -#: builtin/config.c:61

3797 +#: builtin/config.c:60

3798 msgid "replace all matching variables: name value [value_regex]"

3799 msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"

3800

3781 -#: builtin/config.c:62

3801 +#: builtin/config.c:61

3802 msgid "add a new variable: name value"

3803 msgstr "lägg till en ny variabel: namn värde"

3804

3785 -#: builtin/config.c:63

3805 +#: builtin/config.c:62

3806 msgid "remove a variable: name [value-regex]"

3807 msgstr "ta bort en variabel: namn [värde-reguttr]"

3808

3789 -#: builtin/config.c:64

3809 +#: builtin/config.c:63

3810 msgid "remove all matches: name [value-regex]"

3811 msgstr "ta bort alla träffar: namn [värde-reguttr]"

3812

3793 -#: builtin/config.c:65

3813 +#: builtin/config.c:64

3814 msgid "rename section: old-name new-name"

3815 msgstr "byt namn på sektion: gammalt-namn nytt-namn"

3816

3797 -#: builtin/config.c:66

3817 +#: builtin/config.c:65

3818 msgid "remove a section: name"

3819 msgstr "ta bort en sektion: namn"

3820

3801 -#: builtin/config.c:67

3821 +#: builtin/config.c:66

3822 msgid "list all"

3823 msgstr "visa alla"

3824

3805 -#: builtin/config.c:68

3825 +#: builtin/config.c:67

3826 msgid "open an editor"

3827 msgstr "öppna textredigeringsprogram"

3828

3809 -#: builtin/config.c:69 builtin/config.c:70

3829 +#: builtin/config.c:68 builtin/config.c:69

3830 msgid "slot"

3831 msgstr "plats"

3832

3813 -#: builtin/config.c:69

3833 +#: builtin/config.c:68

3834 msgid "find the color configured: [default]"

3835 msgstr "hitta den inställda färgen: [default]"

3836

3817 -#: builtin/config.c:70

3837 +#: builtin/config.c:69

3838 msgid "find the color setting: [stdout-is-tty]"

3839 msgstr "hitta färginställningen: [stdout-is-tty]"

3840

3821 -#: builtin/config.c:71

3841 +#: builtin/config.c:70

3842 msgid "Type"

3843 msgstr "Typ"

3844

3825 -#: builtin/config.c:72

3845 +#: builtin/config.c:71

3846 msgid "value is \"true\" or \"false\""

3847 msgstr "värdet är \"true\" eller \"false\""

3848

3829 -#: builtin/config.c:73

3849 +#: builtin/config.c:72

3850 msgid "value is decimal number"

3851 msgstr "värdet är ett decimalt tal"

3852

3833 -#: builtin/config.c:74

3853 +#: builtin/config.c:73

3854 msgid "value is --bool or --int"

3855 msgstr "värdet är --bool eller --int"

3856

3837 -#: builtin/config.c:75

3857 +#: builtin/config.c:74

3858 msgid "value is a path (file or directory name)"

3859 msgstr "värdet är en sökväg (fil- eller katalognamn)"

3860

3841 -#: builtin/config.c:76

3861 +#: builtin/config.c:75

3862 msgid "Other"

3863 msgstr "Andra"

3864

3845 -#: builtin/config.c:77

3865 +#: builtin/config.c:76

3866 msgid "terminate values with NUL byte"

3867 msgstr "terminera värden med NUL-byte"

3868

3849 -#: builtin/config.c:78

3869 +#: builtin/config.c:77

3870 msgid "respect include directives on lookup"

3871 msgstr "respektera inkluderingsdirektiv vid uppslag"

3872

@@ -3995,31 +4015,31 @@ msgstr "--dirty är inkompatibelt med \"committish\"-värden"

4015 msgid "'%s': not a regular file or symlink"

4016 msgstr "\"%s\": inte en normal fil eller symbolisk länk"

4017

3998 -#: builtin/diff.c:224

4018 +#: builtin/diff.c:228

4019 #, c-format

4020 msgid "invalid option: %s"

4021 msgstr "ogiltig flagga: %s"

4022

4003 -#: builtin/diff.c:301

4023 +#: builtin/diff.c:305

4024 msgid "Not a git repository"

4025 msgstr "Inte ett git-arkiv"

4026

4007 -#: builtin/diff.c:344

4027 +#: builtin/diff.c:348

4028 #, c-format

4029 msgid "invalid object '%s' given."

4030 msgstr "objektet \"%s\" som angavs är felaktigt."

4031

4012 -#: builtin/diff.c:349

4032 +#: builtin/diff.c:353

4033 #, c-format

4034 msgid "more than %d trees given: '%s'"

4035 msgstr "mer än %d träd angavs: \"%s\""

4036

4017 -#: builtin/diff.c:359

4037 +#: builtin/diff.c:363

4038 #, c-format

4039 msgid "more than two blobs given: '%s'"

4040 msgstr "mer än två blobbar angavs: \"%s\""

4041

4022 -#: builtin/diff.c:367

4042 +#: builtin/diff.c:371

4043 #, c-format

4044 msgid "unhandled object '%s' given."

4045 msgstr "ej hanterat objekt \"%s\" angavs."

@@ -4132,7 +4152,7 @@ msgstr "tillåt uppdatering av HEAD-referens"

4152 msgid "deepen history of shallow clone"

4153 msgstr "fördjupa historik för grund klon"

4154

4135 -#: builtin/fetch.c:85 builtin/log.c:1083

4155 +#: builtin/fetch.c:85 builtin/log.c:1088

4156 msgid "dir"

4157 msgstr "kat"

4158

@@ -4304,8 +4324,8 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

4324 msgstr ""

4325 "git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]"

4326

4307 -#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:787

4308 -#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192

4327 +#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:701

4328 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175

4329 #: builtin/tag.c:448 parse-options.h:133 parse-options.h:235

4330 msgid "n"

4331 msgstr "n"

@@ -4465,225 +4485,225 @@ msgstr "git grep [flaggor] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"

4485 msgid "grep: failed to create thread: %s"

4486 msgstr "grep: misslyckades skapa tråd. %s"

4487

4468 -#: builtin/grep.c:455

4488 +#: builtin/grep.c:365

4489 #, c-format

4490 msgid "Failed to chdir: %s"

4491 msgstr "Kunde inte byta katalog (chdir): %s"

4492

4473 -#: builtin/grep.c:531 builtin/grep.c:565

4493 +#: builtin/grep.c:443 builtin/grep.c:478

4494 #, c-format

4495 msgid "unable to read tree (%s)"

4496 msgstr "kunde inte läsa träd (%s)"

4497

4478 -#: builtin/grep.c:579

4498 +#: builtin/grep.c:493

4499 #, c-format

4500 msgid "unable to grep from object of type %s"

4501 msgstr "Kunde inte \"grep\" från objekt av typen %s"

4502

4483 -#: builtin/grep.c:637

4503 +#: builtin/grep.c:551

4504 #, c-format

4505 msgid "switch `%c' expects a numerical value"

4506 msgstr "flaggan \"%c\" antar ett numeriskt värde"

4507

4488 -#: builtin/grep.c:654

4508 +#: builtin/grep.c:568

4509 #, c-format

4510 msgid "cannot open '%s'"

4511 msgstr "kan inte öppna \"%s\""

4512

4493 -#: builtin/grep.c:729

4513 +#: builtin/grep.c:643

4514 msgid "search in index instead of in the work tree"

4515 msgstr "sök i indexet istället för i arbetskatalogen"

4516

4497 -#: builtin/grep.c:731

4517 +#: builtin/grep.c:645

4518 msgid "find in contents not managed by git"

4519 msgstr "sök i innehål som inte hanteras av git"

4520

4501 -#: builtin/grep.c:733

4521 +#: builtin/grep.c:647

4522 msgid "search in both tracked and untracked files"

4523 msgstr "sök i både spårade och ospårade filer"

4524

4505 -#: builtin/grep.c:735

4525 +#: builtin/grep.c:649

4526 msgid "search also in ignored files"

4527 msgstr "sök även i ignorerade filer"

4528

4509 -#: builtin/grep.c:738

4529 +#: builtin/grep.c:652

4530 msgid "show non-matching lines"

4531 msgstr "vis rader som inte träffas"

4532

4513 -#: builtin/grep.c:740

4533 +#: builtin/grep.c:654

4534 msgid "case insensitive matching"

4535 msgstr "skiftlägesokänslig sökning"

4536

4517 -#: builtin/grep.c:742

4537 +#: builtin/grep.c:656

4538 msgid "match patterns only at word boundaries"

4539 msgstr "matcha endast mönster vid ordgränser"

4540

4521 -#: builtin/grep.c:744

4541 +#: builtin/grep.c:658

4542 msgid "process binary files as text"

4543 msgstr "hantera binärfiler som text"

4544

4525 -#: builtin/grep.c:746

4545 +#: builtin/grep.c:660

4546 msgid "don't match patterns in binary files"

4547 msgstr "träffa inte mönster i binärfiler"

4548

4529 -#: builtin/grep.c:749

4549 +#: builtin/grep.c:663

4550 msgid "descend at most <depth> levels"

4551 msgstr "gå som mest ned <djup> nivåer"

4552

4533 -#: builtin/grep.c:753

4553 +#: builtin/grep.c:667

4554 msgid "use extended POSIX regular expressions"

4555 msgstr "använd utökade POSIX-reguljära uttryck"

4556

4537 -#: builtin/grep.c:756

4557 +#: builtin/grep.c:670

4558 msgid "use basic POSIX regular expressions (default)"

4559 msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"

4560

4541 -#: builtin/grep.c:759

4561 +#: builtin/grep.c:673

4562 msgid "interpret patterns as fixed strings"

4563 msgstr "tolka mönster som fixerade strängar"

4564

4545 -#: builtin/grep.c:762

4565 +#: builtin/grep.c:676

4566 msgid "use Perl-compatible regular expressions"

4567 msgstr "använd Perlkompatibla reguljära uttryck"

4568

4549 -#: builtin/grep.c:765

4569 +#: builtin/grep.c:679

4570 msgid "show line numbers"

4571 msgstr "visa radnummer"

4572

4553 -#: builtin/grep.c:766

4573 +#: builtin/grep.c:680

4574 msgid "don't show filenames"

4575 msgstr "visa inte filnamn"

4576

4557 -#: builtin/grep.c:767

4577 +#: builtin/grep.c:681

4578 msgid "show filenames"

4579 msgstr "visa filnamn"

4580

4561 -#: builtin/grep.c:769

4581 +#: builtin/grep.c:683

4582 msgid "show filenames relative to top directory"

4583 msgstr "visa filnamn relativa till toppkatalogen"

4584

4565 -#: builtin/grep.c:771

4585 +#: builtin/grep.c:685

4586 msgid "show only filenames instead of matching lines"

4587 msgstr "visa endast filnamn istället för träffade rader"

4588

4569 -#: builtin/grep.c:773

4589 +#: builtin/grep.c:687

4590 msgid "synonym for --files-with-matches"

4591 msgstr "synonym för --files-with-matches"

4592

4573 -#: builtin/grep.c:776

4593 +#: builtin/grep.c:690

4594 msgid "show only the names of files without match"

4595 msgstr "visa endast namn på filer utan träffar"

4596

4577 -#: builtin/grep.c:778

4597 +#: builtin/grep.c:692

4598 msgid "print NUL after filenames"

4599 msgstr "skriv NUL efter filnamn"

4600

4581 -#: builtin/grep.c:780

4601 +#: builtin/grep.c:694

4602 msgid "show the number of matches instead of matching lines"

4603 msgstr "visa antal träffar istället för träffade rader"

4604

4585 -#: builtin/grep.c:781

4605 +#: builtin/grep.c:695

4606 msgid "highlight matches"

4607 msgstr "ljusmarkera träffar"

4608

4589 -#: builtin/grep.c:783

4609 +#: builtin/grep.c:697

4610 msgid "print empty line between matches from different files"

4611 msgstr "skriv tomma rader mellan träffar från olika filer"

4612

4593 -#: builtin/grep.c:785

4613 +#: builtin/grep.c:699

4614 msgid "show filename only once above matches from same file"

4615 msgstr "visa filnamn endast en gång ovanför träffar från samma fil"

4616

4597 -#: builtin/grep.c:788

4617 +#: builtin/grep.c:702

4618 msgid "show <n> context lines before and after matches"

4619 msgstr "visa <n> rader sammanhang före och efter träffar"

4620

4601 -#: builtin/grep.c:791

4621 +#: builtin/grep.c:705

4622 msgid "show <n> context lines before matches"

4623 msgstr "visa <n> rader sammanhang före träffar"

4624

4605 -#: builtin/grep.c:793

4625 +#: builtin/grep.c:707

4626 msgid "show <n> context lines after matches"

4627 msgstr "visa <n> rader sammanhang efter träffar"

4628

4609 -#: builtin/grep.c:794

4629 +#: builtin/grep.c:708

4630 msgid "shortcut for -C NUM"

4631 msgstr "genväg för -C NUM"

4632

4613 -#: builtin/grep.c:797

4633 +#: builtin/grep.c:711

4634 msgid "show a line with the function name before matches"

4635 msgstr "visa en rad med funktionsnamnet före träffen"

4636

4617 -#: builtin/grep.c:799

4637 +#: builtin/grep.c:713

4638 msgid "show the surrounding function"

4639 msgstr "visa den omkringliggande funktionen"

4640

4621 -#: builtin/grep.c:802

4641 +#: builtin/grep.c:716

4642 msgid "read patterns from file"

4643 msgstr "läs mönster från fil"

4644

4625 -#: builtin/grep.c:804

4645 +#: builtin/grep.c:718

4646 msgid "match <pattern>"

4647 msgstr "träffa <mönster>"

4648

4629 -#: builtin/grep.c:806

4649 +#: builtin/grep.c:720

4650 msgid "combine patterns specified with -e"

4651 msgstr "kombinera mönster som anges med -e"

4652

4633 -#: builtin/grep.c:818

4653 +#: builtin/grep.c:732

4654 msgid "indicate hit with exit status without output"

4655 msgstr "ange träff med slutstatuskod utan utdata"

4656

4637 -#: builtin/grep.c:820

4657 +#: builtin/grep.c:734

4658 msgid "show only matches from files that match all patterns"

4659 msgstr "visa endast träffar från filer som träffar alla mönster"

4660

4641 -#: builtin/grep.c:822

4661 +#: builtin/grep.c:736

4662 msgid "show parse tree for grep expression"

4663 msgstr "visa analysträd för grep-uttryck"

4664

4645 -#: builtin/grep.c:826

4665 +#: builtin/grep.c:740

4666 msgid "pager"

4667 msgstr "bläddrare"

4668

4649 -#: builtin/grep.c:826

4669 +#: builtin/grep.c:740

4670 msgid "show matching files in the pager"

4671 msgstr "visa träffade filer i filbläddraren"

4672

4653 -#: builtin/grep.c:829

4673 +#: builtin/grep.c:743

4674 msgid "allow calling of grep(1) (ignored by this build)"

4675 msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"

4676

4657 -#: builtin/grep.c:830 builtin/show-ref.c:201

4677 +#: builtin/grep.c:744 builtin/show-ref.c:184

4678 msgid "show usage"

4679 msgstr "visa användning"

4680

4661 -#: builtin/grep.c:921

4681 +#: builtin/grep.c:811

4682 msgid "no pattern given."

4683 msgstr "inget mönster angavs."

4684

4665 -#: builtin/grep.c:935

4685 +#: builtin/grep.c:825

4686 #, c-format

4687 msgid "bad object %s"

4688 msgstr "felaktigt objekt %s"

4689

4670 -#: builtin/grep.c:976

4690 +#: builtin/grep.c:866

4691 msgid "--open-files-in-pager only works on the worktree"

4692 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"

4693

4674 -#: builtin/grep.c:999

4694 +#: builtin/grep.c:889

4695 msgid "--cached or --untracked cannot be used with --no-index."

4696 msgstr "--cached och --untracked kan inte användas med --no-index."

4697

4678 -#: builtin/grep.c:1004

4698 +#: builtin/grep.c:894

4699 msgid "--no-index or --untracked cannot be used with revs."

4700 msgstr "--no-index och --untracked kan inte användas med revisioner."

4701

4682 -#: builtin/grep.c:1007

4702 +#: builtin/grep.c:897

4703 msgid "--[no-]exclude-standard cannot be used for tracked contents."

4704 msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."

4705

4686 -#: builtin/grep.c:1015

4706 +#: builtin/grep.c:905

4707 msgid "both --cached and trees are given."

4708 msgstr "både --cached och träd angavs."

4709

@@ -5277,219 +5297,219 @@ msgstr "dekoreringsflaggor"

5297 msgid "Final output: %d %s\n"

5298 msgstr "Slututdata: %d %s\n"

5299

5280 -#: builtin/log.c:403 builtin/log.c:494

5300 +#: builtin/log.c:405 builtin/log.c:497

5301 #, c-format

5302 msgid "Could not read object %s"

5303 msgstr "Kunde inte läsa objektet %s"

5304

5285 -#: builtin/log.c:518

5305 +#: builtin/log.c:521

5306 #, c-format

5307 msgid "Unknown type: %d"

5308 msgstr "Okänd typ: %d"

5309

5290 -#: builtin/log.c:608

5310 +#: builtin/log.c:613

5311 msgid "format.headers without value"

5312 msgstr "format.headers utan värde"

5313

5294 -#: builtin/log.c:682

5314 +#: builtin/log.c:687

5315 msgid "name of output directory is too long"

5316 msgstr "namnet på utdatakatalogen är för långt"

5317

5298 -#: builtin/log.c:693

5318 +#: builtin/log.c:698

5319 #, c-format

5320 msgid "Cannot open patch file %s"

5321 msgstr "Kan inte öppna patchfilen %s"

5322

5303 -#: builtin/log.c:707

5323 +#: builtin/log.c:712

5324 msgid "Need exactly one range."

5325 msgstr "Behöver precis ett intervall."

5326

5307 -#: builtin/log.c:715

5327 +#: builtin/log.c:720

5328 msgid "Not a range."

5329 msgstr "Inte ett intervall."

5330

5311 -#: builtin/log.c:789

5331 +#: builtin/log.c:794

5332 msgid "Cover letter needs email format"

5333 msgstr "Omslagsbrevet behöver e-postformat"

5334

5315 -#: builtin/log.c:862

5335 +#: builtin/log.c:867

5336 #, c-format

5337 msgid "insane in-reply-to: %s"

5338 msgstr "tokigt in-reply-to: %s"

5339

5320 -#: builtin/log.c:890

5340 +#: builtin/log.c:895

5341 msgid "git format-patch [options] [<since> | <revision range>]"

5342 msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]"

5343

5324 -#: builtin/log.c:935

5344 +#: builtin/log.c:940

5345 msgid "Two output directories?"

5346 msgstr "Två utdatakataloger?"

5347

5328 -#: builtin/log.c:1063

5348 +#: builtin/log.c:1068

5349 msgid "use [PATCH n/m] even with a single patch"

5350 msgstr "använd [PATCH n/m] även för en ensam patch"

5351

5332 -#: builtin/log.c:1066

5352 +#: builtin/log.c:1071

5353 msgid "use [PATCH] even with multiple patches"

5354 msgstr "använd [PATCH] även för flera patchar"

5355

5336 -#: builtin/log.c:1070

5356 +#: builtin/log.c:1075

5357 msgid "print patches to standard out"

5358 msgstr "skriv patcharna på stnadard ut"

5359

5340 -#: builtin/log.c:1072

5360 +#: builtin/log.c:1077

5361 msgid "generate a cover letter"

5362 msgstr "generera ett följebrev"

5363

5344 -#: builtin/log.c:1074

5364 +#: builtin/log.c:1079

5365 msgid "use simple number sequence for output file names"

5366 msgstr "använd enkel nummersekvens för utdatafilnamn"

5367

5348 -#: builtin/log.c:1075

5368 +#: builtin/log.c:1080

5369 msgid "sfx"

5370 msgstr "sfx"

5371

5352 -#: builtin/log.c:1076

5372 +#: builtin/log.c:1081

5373 msgid "use <sfx> instead of '.patch'"

5374 msgstr "använd <sfx> istället för \".patch\""

5375

5356 -#: builtin/log.c:1078

5376 +#: builtin/log.c:1083

5377 msgid "start numbering patches at <n> instead of 1"

5378 msgstr "börja numrera patchar på <n> istället för 1"

5379

5360 -#: builtin/log.c:1080

5380 +#: builtin/log.c:1085

5381 msgid "Use [<prefix>] instead of [PATCH]"

5382 msgstr "Använd [<prefix>] istället för [PATCH]"

5383

5364 -#: builtin/log.c:1083

5384 +#: builtin/log.c:1088

5385 msgid "store resulting files in <dir>"

5386 msgstr "spara filerna i <katalog>"

5387

5368 -#: builtin/log.c:1086

5388 +#: builtin/log.c:1091

5389 msgid "don't strip/add [PATCH]"

5390 msgstr "ta inte bort eller lägg till [PATCH]"

5391

5372 -#: builtin/log.c:1089

5392 +#: builtin/log.c:1094

5393 msgid "don't output binary diffs"

5394 msgstr "skriv inte binära diffar"

5395

5376 -#: builtin/log.c:1091

5396 +#: builtin/log.c:1096

5397 msgid "don't include a patch matching a commit upstream"

5398 msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"

5399

5380 -#: builtin/log.c:1093

5400 +#: builtin/log.c:1098

5401 msgid "show patch format instead of default (patch + stat)"

5402 msgstr "visa patchformat istället för standard (patch + stat)"

5403

5384 -#: builtin/log.c:1095

5404 +#: builtin/log.c:1100

5405 msgid "Messaging"

5406 msgstr "E-post"

5407

5388 -#: builtin/log.c:1096

5408 +#: builtin/log.c:1101

5409 msgid "header"

5410 msgstr "huvud"

5411

5392 -#: builtin/log.c:1097

5412 +#: builtin/log.c:1102

5413 msgid "add email header"

5414 msgstr "lägg till e-posthuvud"

5415

5396 -#: builtin/log.c:1098 builtin/log.c:1100

5416 +#: builtin/log.c:1103 builtin/log.c:1105

5417 msgid "email"

5418 msgstr "epost"

5419

5400 -#: builtin/log.c:1098

5420 +#: builtin/log.c:1103

5421 msgid "add To: header"

5422 msgstr "Lägg till mottagarhuvud (\"To:\")"

5423

5404 -#: builtin/log.c:1100

5424 +#: builtin/log.c:1105

5425 msgid "add Cc: header"

5426 msgstr "Lägg till kopiehuvud (\"Cc:\")"

5427

5408 -#: builtin/log.c:1102

5428 +#: builtin/log.c:1107

5429 msgid "message-id"

5430 msgstr "meddelande-id"

5431

5412 -#: builtin/log.c:1103

5432 +#: builtin/log.c:1108

5433 msgid "make first mail a reply to <message-id>"

5434 msgstr "Gör det första brevet ett svar till <meddelande-id>"

5435

5416 -#: builtin/log.c:1104 builtin/log.c:1107

5436 +#: builtin/log.c:1109 builtin/log.c:1112

5437 msgid "boundary"

5438 msgstr "gräns"

5439

5420 -#: builtin/log.c:1105

5440 +#: builtin/log.c:1110

5441 msgid "attach the patch"

5442 msgstr "bifoga patchen"

5443

5424 -#: builtin/log.c:1108

5444 +#: builtin/log.c:1113

5445 msgid "inline the patch"

5446 msgstr "gör patchen ett inline-objekt"

5447

5428 -#: builtin/log.c:1112

5448 +#: builtin/log.c:1117

5449 msgid "enable message threading, styles: shallow, deep"

5450 msgstr "aktivera brevtrådning, typer: shallow, deep"

5451

5432 -#: builtin/log.c:1114

5452 +#: builtin/log.c:1119

5453 msgid "signature"

5454 msgstr "signatur"

5455

5436 -#: builtin/log.c:1115

5456 +#: builtin/log.c:1120

5457 msgid "add a signature"

5458 msgstr "lägg till signatur"

5459

5440 -#: builtin/log.c:1117

5460 +#: builtin/log.c:1122

5461 msgid "don't print the patch filenames"

5462 msgstr "visa inte filnamn för patchar"

5463

5444 -#: builtin/log.c:1157

5464 +#: builtin/log.c:1163

5465 #, c-format

5466 msgid "bogus committer info %s"

5467 msgstr "felaktig incheckarinformation %s"

5468

5449 -#: builtin/log.c:1202

5469 +#: builtin/log.c:1208

5470 msgid "-n and -k are mutually exclusive."

5471 msgstr "-n och -k kan inte användas samtidigt."

5472

5453 -#: builtin/log.c:1204

5473 +#: builtin/log.c:1210

5474 msgid "--subject-prefix and -k are mutually exclusive."

5475 msgstr "--subject-prefix och -k kan inte användas samtidigt."

5476

5457 -#: builtin/log.c:1212

5477 +#: builtin/log.c:1218

5478 msgid "--name-only does not make sense"

5479 msgstr "kan inte använda --name-only"

5480

5461 -#: builtin/log.c:1214

5481 +#: builtin/log.c:1220

5482 msgid "--name-status does not make sense"

5483 msgstr "kan inte använda --name-status"

5484

5465 -#: builtin/log.c:1216

5485 +#: builtin/log.c:1222

5486 msgid "--check does not make sense"

5487 msgstr "kan inte använda --check"

5488

5469 -#: builtin/log.c:1239

5489 +#: builtin/log.c:1245

5490 msgid "standard output, or directory, which one?"

5491 msgstr "standard ut, eller katalog, vilken skall det vara?"

5492

5473 -#: builtin/log.c:1241

5493 +#: builtin/log.c:1247

5494 #, c-format

5495 msgid "Could not create directory '%s'"

5496 msgstr "Kunde inte skapa katalogen \"%s\""

5497

5478 -#: builtin/log.c:1394

5498 +#: builtin/log.c:1400

5499 msgid "Failed to create output files"

5500 msgstr "Misslyckades skapa utdatafiler"

5501

5482 -#: builtin/log.c:1443

5502 +#: builtin/log.c:1449

5503 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

5504 msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"

5505

5486 -#: builtin/log.c:1498

5506 +#: builtin/log.c:1504

5507 #, c-format

5508 msgid ""

5509 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

5510 msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"

5511

5492 -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525

5512 +#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531

5513 #, c-format

5514 msgid "Unknown commit %s"

5515 msgstr "Okänd incheckning %s"

@@ -5767,37 +5787,33 @@ msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"

5787 msgid "git write-tree failed to write a tree"

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

5789

5770 -#: builtin/merge.c:678

5771 -msgid "failed to read the cache"

5772 -msgstr "misslyckads läsa cachen"

5773 -

5774 -#: builtin/merge.c:709

5790 +#: builtin/merge.c:656

5791 msgid "Not handling anything other than two heads merge."

5792 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."

5793

5778 -#: builtin/merge.c:723

5794 +#: builtin/merge.c:670

5795 #, c-format

5796 msgid "Unknown option for merge-recursive: -X%s"

5797 msgstr "Felaktig flagga för merge-recursive: -X%s"

5798

5783 -#: builtin/merge.c:737

5799 +#: builtin/merge.c:684

5800 #, c-format

5801 msgid "unable to write %s"

5802 msgstr "kunde inte skriva %s"

5803

5788 -#: builtin/merge.c:876

5804 +#: builtin/merge.c:773

5805 #, c-format

5806 msgid "Could not read from '%s'"

5807 msgstr "Kunde inte läsa från \"%s\""

5808

5793 -#: builtin/merge.c:885

5809 +#: builtin/merge.c:782

5810 #, c-format

5811 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

5812 msgstr ""

5813 "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "

5814 "den.\n"

5815

5800 -#: builtin/merge.c:891

5816 +#: builtin/merge.c:788

5817 msgid ""

5818 "Please enter a commit message to explain why this merge is necessary,\n"

5819 "especially if it merges an updated upstream into a topic branch.\n"

@@ -5812,53 +5828,53 @@ msgstr ""

5828 "Rader som inleds med \"#\" kommer ignoreras, och ett tomt meddelande\n"

5829 "avbryter incheckningen.\n"

5830

5815 -#: builtin/merge.c:915

5831 +#: builtin/merge.c:812

5832 msgid "Empty commit message."

5833 msgstr "Tomt incheckningsmeddelande."

5834

5819 -#: builtin/merge.c:927

5835 +#: builtin/merge.c:824

5836 #, c-format

5837 msgid "Wonderful.\n"

5838 msgstr "Underbart.\n"

5839

5824 -#: builtin/merge.c:992

5840 +#: builtin/merge.c:889

5841 #, c-format

5842 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

5843 msgstr ""

5844 "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"

5845

5830 -#: builtin/merge.c:1008

5846 +#: builtin/merge.c:905

5847 #, c-format

5848 msgid "'%s' is not a commit"

5849 msgstr "\"%s\" är inte en incheckning"

5850

5835 -#: builtin/merge.c:1049

5851 +#: builtin/merge.c:946

5852 msgid "No current branch."

5853 msgstr "Inte på någon gren."

5854

5839 -#: builtin/merge.c:1051

5855 +#: builtin/merge.c:948

5856 msgid "No remote for the current branch."

5857 msgstr "Ingen fjärr för aktuell gren."

5858

5843 -#: builtin/merge.c:1053

5859 +#: builtin/merge.c:950

5860 msgid "No default upstream defined for the current branch."

5861 msgstr "Ingen standarduppström angiven för aktuell gren."

5862

5847 -#: builtin/merge.c:1058

5863 +#: builtin/merge.c:955

5864 #, c-format

5865 msgid "No remote tracking branch for %s from %s"

5866 msgstr "Ingen fjärrspårande gren för %s från %s"

5867

5852 -#: builtin/merge.c:1145 builtin/merge.c:1302

5868 +#: builtin/merge.c:1042 builtin/merge.c:1199

5869 #, c-format

5870 msgid "%s - not something we can merge"

5871 msgstr "%s - inte något vi kan slå ihop"

5872

5857 -#: builtin/merge.c:1213

5873 +#: builtin/merge.c:1110

5874 msgid "There is no merge to abort (MERGE_HEAD missing)."

5875 msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."

5876

5861 -#: builtin/merge.c:1229 git-pull.sh:31

5877 +#: builtin/merge.c:1126 git-pull.sh:31

5878 msgid ""

5879 "You have not concluded your merge (MERGE_HEAD exists).\n"

5880 "Please, commit your changes before you can merge."

@@ -5866,11 +5882,11 @@ msgstr ""

5882 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"

5883 "Checka in dina ändringar innan du kan slå ihop."

5884

5869 -#: builtin/merge.c:1232 git-pull.sh:34

5885 +#: builtin/merge.c:1129 git-pull.sh:34

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

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

5888

5873 -#: builtin/merge.c:1236

5889 +#: builtin/merge.c:1133

5890 msgid ""

5891 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

5892 "Please, commit your changes before you can merge."

@@ -5878,79 +5894,79 @@ msgstr ""

5894 "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"

5895 "Checka in dina ändringar innan du kan slå ihop."

5896

5881 -#: builtin/merge.c:1239

5897 +#: builtin/merge.c:1136

5898 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

5899 msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."

5900

5885 -#: builtin/merge.c:1248

5901 +#: builtin/merge.c:1145

5902 msgid "You cannot combine --squash with --no-ff."

5903 msgstr "Du kan inte kombinera --squash med --no-ff."

5904

5889 -#: builtin/merge.c:1253

5905 +#: builtin/merge.c:1150

5906 msgid "You cannot combine --no-ff with --ff-only."

5907 msgstr "Du kan inte kombinera --no-ff med --ff-only."

5908

5893 -#: builtin/merge.c:1260

5909 +#: builtin/merge.c:1157

5910 msgid "No commit specified and merge.defaultToUpstream not set."

5911 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."

5912

5897 -#: builtin/merge.c:1292

5913 +#: builtin/merge.c:1189

5914 msgid "Can merge only exactly one commit into empty head"

5915 msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."

5916

5901 -#: builtin/merge.c:1295

5917 +#: builtin/merge.c:1192

5918 msgid "Squash commit into empty head not supported yet"

5919 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"

5920

5905 -#: builtin/merge.c:1297

5921 +#: builtin/merge.c:1194

5922 msgid "Non-fast-forward commit does not make sense into an empty head"

5923 msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"

5924

5909 -#: builtin/merge.c:1412

5925 +#: builtin/merge.c:1309

5926 #, c-format

5927 msgid "Updating %s..%s\n"

5928 msgstr "Uppdaterar %s..%s\n"

5929

5914 -#: builtin/merge.c:1450

5930 +#: builtin/merge.c:1348

5931 #, c-format

5932 msgid "Trying really trivial in-index merge...\n"

5933 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"

5934

5919 -#: builtin/merge.c:1457

5935 +#: builtin/merge.c:1355

5936 #, c-format

5937 msgid "Nope.\n"

5938 msgstr "Nej.\n"

5939

5924 -#: builtin/merge.c:1489

5940 +#: builtin/merge.c:1387

5941 msgid "Not possible to fast-forward, aborting."

5942 msgstr "Kan inte snabbspola, avbryter."

5943

5928 -#: builtin/merge.c:1512 builtin/merge.c:1591

5944 +#: builtin/merge.c:1410 builtin/merge.c:1489

5945 #, c-format

5946 msgid "Rewinding the tree to pristine...\n"

5947 msgstr "Återspolar trädet till orört...\n"

5948

5933 -#: builtin/merge.c:1516

5949 +#: builtin/merge.c:1414

5950 #, c-format

5951 msgid "Trying merge strategy %s...\n"

5952 msgstr "Försöker sammanslagninsstrategin %s...\n"

5953

5938 -#: builtin/merge.c:1582

5954 +#: builtin/merge.c:1480

5955 #, c-format

5956 msgid "No merge strategy handled the merge.\n"

5957 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"

5958

5943 -#: builtin/merge.c:1584

5959 +#: builtin/merge.c:1482

5960 #, c-format

5961 msgid "Merge with strategy %s failed.\n"

5962 msgstr "Sammanslagning med strategin %s misslyckades.\n"

5963

5948 -#: builtin/merge.c:1593

5964 +#: builtin/merge.c:1491

5965 #, c-format

5966 msgid "Using the %s to prepare resolving by hand.\n"

5967 msgstr "Använder %s för att förbereda lösning för hand.\n"

5968

5953 -#: builtin/merge.c:1605

5969 +#: builtin/merge.c:1503

5970 #, c-format

5971 msgid "Automatic merge went well; stopped before committing as requested\n"

5972 msgstr ""

@@ -6519,143 +6535,143 @@ msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]"

6535 msgid "deflate error (%d)"

6536 msgstr "fel i deflate (%d)"

6537

6522 -#: builtin/pack-objects.c:2398

6538 +#: builtin/pack-objects.c:2397

6539 #, c-format

6540 msgid "unsupported index version %s"

6541 msgstr "indexversionen %s stöds ej"

6542

6527 -#: builtin/pack-objects.c:2402

6543 +#: builtin/pack-objects.c:2401

6544 #, c-format

6545 msgid "bad index version '%s'"

6546 msgstr "felaktig indexversion \"%s\""

6547

6532 -#: builtin/pack-objects.c:2425

6548 +#: builtin/pack-objects.c:2424

6549 #, c-format

6550 msgid "option %s does not accept negative form"

6551 msgstr "flaggan %s godtar inte negativ form"

6552

6537 -#: builtin/pack-objects.c:2429

6553 +#: builtin/pack-objects.c:2428

6554 #, c-format

6555 msgid "unable to parse value '%s' for option %s"

6556 msgstr "kunde inte tolka värdet \"%s\" för flaggan %s"

6557

6542 -#: builtin/pack-objects.c:2448

6558 +#: builtin/pack-objects.c:2447

6559 msgid "do not show progress meter"

6560 msgstr "visa inte förloppsindikator"

6561

6546 -#: builtin/pack-objects.c:2450

6562 +#: builtin/pack-objects.c:2449

6563 msgid "show progress meter"

6564 msgstr "visa förloppsindikator"

6565

6550 -#: builtin/pack-objects.c:2452

6566 +#: builtin/pack-objects.c:2451

6567 msgid "show progress meter during object writing phase"

6568 msgstr "visa förloppsindikator under objektskrivningsfasen"

6569

6554 -#: builtin/pack-objects.c:2455

6570 +#: builtin/pack-objects.c:2454

6571 msgid "similar to --all-progress when progress meter is shown"

6572 msgstr "som --all-progress när förloppsmätaren visas"

6573

6558 -#: builtin/pack-objects.c:2456

6574 +#: builtin/pack-objects.c:2455

6575 msgid "version[,offset]"

6576 msgstr "version[,offset]"

6577

6562 -#: builtin/pack-objects.c:2457

6578 +#: builtin/pack-objects.c:2456

6579 msgid "write the pack index file in the specified idx format version"

6580 msgstr "skriv paketindexfilen i angiven indexformatversion"

6581

6566 -#: builtin/pack-objects.c:2460

6582 +#: builtin/pack-objects.c:2459

6583 msgid "maximum size of each output pack file"

6584 msgstr "maximal storlek på varje utdatapaketfil"

6585

6570 -#: builtin/pack-objects.c:2462

6586 +#: builtin/pack-objects.c:2461

6587 msgid "ignore borrowed objects from alternate object store"

6588 msgstr "ignorera lånade objekt från alternativa objektlager"

6589

6574 -#: builtin/pack-objects.c:2464

6590 +#: builtin/pack-objects.c:2463

6591 msgid "ignore packed objects"

6592 msgstr "ignorera packade objekt"

6593

6578 -#: builtin/pack-objects.c:2466

6594 +#: builtin/pack-objects.c:2465

6595 msgid "limit pack window by objects"

6596 msgstr "begränsa paketfönster efter objekt"

6597

6582 -#: builtin/pack-objects.c:2468

6598 +#: builtin/pack-objects.c:2467

6599 msgid "limit pack window by memory in addition to object limit"

6600 msgstr "begränsa paketfönster efter minne förutom objektgräns"

6601

6586 -#: builtin/pack-objects.c:2470

6602 +#: builtin/pack-objects.c:2469

6603 msgid "maximum length of delta chain allowed in the resulting pack"

6604 msgstr "maximal längd på deltakedja tillåten i slutligt paket"

6605

6590 -#: builtin/pack-objects.c:2472

6606 +#: builtin/pack-objects.c:2471

6607 msgid "reuse existing deltas"

6608 msgstr "återanvänd befintliga delta"

6609

6594 -#: builtin/pack-objects.c:2474

6610 +#: builtin/pack-objects.c:2473

6611 msgid "reuse existing objects"

6612 msgstr "återanvänd befintliga objekt"

6613

6598 -#: builtin/pack-objects.c:2476

6614 +#: builtin/pack-objects.c:2475

6615 msgid "use OFS_DELTA objects"

6616 msgstr "använd OFS_DELTA-objekt"

6617

6602 -#: builtin/pack-objects.c:2478

6618 +#: builtin/pack-objects.c:2477

6619 msgid "use threads when searching for best delta matches"

6620 msgstr "använd trådar vid sökning efter bästa deltaträffar"

6621

6606 -#: builtin/pack-objects.c:2480

6622 +#: builtin/pack-objects.c:2479

6623 msgid "do not create an empty pack output"

6624 msgstr "försök inte skapa tom paketutdata"

6625

6610 -#: builtin/pack-objects.c:2482

6626 +#: builtin/pack-objects.c:2481

6627 msgid "read revision arguments from standard input"

6628 msgstr "läs revisionsargument från standard in"

6629

6614 -#: builtin/pack-objects.c:2484

6630 +#: builtin/pack-objects.c:2483

6631 msgid "limit the objects to those that are not yet packed"

6632 msgstr "begränsa objekt till de som ännu inte packats"

6633

6618 -#: builtin/pack-objects.c:2487

6634 +#: builtin/pack-objects.c:2486

6635 msgid "include objects reachable from any reference"

6636 msgstr "inkludera objekt som kan nås från någon referens"

6637

6622 -#: builtin/pack-objects.c:2490

6638 +#: builtin/pack-objects.c:2489

6639 msgid "include objects referred by reflog entries"

6640 msgstr "inkludera objekt som refereras från referensloggposter"

6641

6626 -#: builtin/pack-objects.c:2493

6642 +#: builtin/pack-objects.c:2492

6643 msgid "output pack to stdout"

6644 msgstr "skriv paket på standard ut"

6645

6630 -#: builtin/pack-objects.c:2495

6646 +#: builtin/pack-objects.c:2494

6647 msgid "include tag objects that refer to objects to be packed"

6648 msgstr "inkludera taggobjekt som refererar objekt som skall packas"

6649

6634 -#: builtin/pack-objects.c:2497

6650 +#: builtin/pack-objects.c:2496

6651 msgid "keep unreachable objects"

6652 msgstr "behåll onåbara objekt"

6653

6638 -#: builtin/pack-objects.c:2498 parse-options.h:141

6654 +#: builtin/pack-objects.c:2497 parse-options.h:141

6655 msgid "time"

6656 msgstr "tid"

6657

6642 -#: builtin/pack-objects.c:2499

6658 +#: builtin/pack-objects.c:2498

6659 msgid "unpack unreachable objects newer than <time>"

6660 msgstr "packa upp onåbara objekt nyare än <tid>"

6661

6646 -#: builtin/pack-objects.c:2502

6662 +#: builtin/pack-objects.c:2501

6663 msgid "create thin packs"

6664 msgstr "skapa tunna paket"

6665

6650 -#: builtin/pack-objects.c:2504

6666 +#: builtin/pack-objects.c:2503

6667 msgid "ignore packs that have companion .keep file"

6668 msgstr "ignorera paket som har tillhörande .keep-fil"

6669

6654 -#: builtin/pack-objects.c:2506

6670 +#: builtin/pack-objects.c:2505

6671 msgid "pack compression level"

6672 msgstr "komprimeringsgrad för paket"

6673

6658 -#: builtin/pack-objects.c:2508

6674 +#: builtin/pack-objects.c:2507

6675 msgid "do not hide commits by grafts"

6676 msgstr "göm inte incheckningar med ympningar (\"grafts\")"

6677

@@ -7556,15 +7572,15 @@ msgstr "git replace -d <objekt>..."

7572 msgid "git replace -l [<pattern>]"

7573 msgstr "git replace -l [<mönster>]"

7574

7559 -#: builtin/replace.c:118

7575 +#: builtin/replace.c:121

7576 msgid "list replace refs"

7577 msgstr "visa ersättningsreferenser"

7578

7563 -#: builtin/replace.c:119

7579 +#: builtin/replace.c:122

7580 msgid "delete replace refs"

7581 msgstr "ta bort ersättningsreferenser"

7582

7567 -#: builtin/replace.c:120

7583 +#: builtin/replace.c:123

7584 msgid "replace the ref if it exists"

7585 msgstr "ersätt referensen om den finns"

7586

@@ -7810,11 +7826,21 @@ msgstr "\"revert\" misslyckades"

7826 msgid "cherry-pick failed"

7827 msgstr "\"cherry-pick\" misslyckades"

7828

7813 -#: builtin/rm.c:14

7829 +#: builtin/rm.c:15

7830 msgid "git rm [options] [--] <file>..."

7831 msgstr "git rm [flaggor] [--] <fil>..."

7832

7817 -#: builtin/rm.c:109

7833 +#: builtin/rm.c:64 builtin/rm.c:186

7834 +#, c-format

7835 +msgid ""

7836 +"submodule '%s' (or one of its nested submodules) uses a .git directory\n"

7837 +"(use 'rm -rf' if you really want to remove it including all of its history)"

7838 +msgstr ""

7839 +"undermodulen \"%s\" (eller en av dess undermoduler) använder en .git-"

7840 +"katalog\n"

7841 +"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"

7842 +

7843 +#: builtin/rm.c:174

7844 #, c-format

7845 msgid ""

7846 "'%s' has staged content different from both the file and the HEAD\n"

@@ -7823,7 +7849,7 @@ msgstr ""

7849 "\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n"

7850 "(använd -f för att tvinga borttagning)"

7851

7826 -#: builtin/rm.c:115

7852 +#: builtin/rm.c:180

7853 #, c-format

7854 msgid ""

7855 "'%s' has changes staged in the index\n"

@@ -7832,7 +7858,7 @@ msgstr ""

7858 "\"%s\" har köade ändringar i indexet\n"

7859 "(använd --cached för att behålla filen eller -f för att tvinga borttagning)"

7860

7835 -#: builtin/rm.c:119

7861 +#: builtin/rm.c:191

7862 #, c-format

7863 msgid ""

7864 "'%s' has local modifications\n"

@@ -7841,32 +7867,32 @@ msgstr ""

7867 "\"%s\" har lokala ändringar\n"

7868 "(använd --cached för att behålla filen eller -f för att tvinga borttagning)"

7869

7844 -#: builtin/rm.c:134

7870 +#: builtin/rm.c:207

7871 msgid "do not list removed files"

7872 msgstr "lista inte borttagna filer"

7873

7848 -#: builtin/rm.c:135

7874 +#: builtin/rm.c:208

7875 msgid "only remove from the index"

7876 msgstr "ta bara bort från indexet"

7877

7852 -#: builtin/rm.c:136

7878 +#: builtin/rm.c:209

7879 msgid "override the up-to-date check"

7880 msgstr "överstyr àjour-testet"

7881

7856 -#: builtin/rm.c:137

7882 +#: builtin/rm.c:210

7883 msgid "allow recursive removal"

7884 msgstr "tillåt rekursiv borttagning"

7885

7860 -#: builtin/rm.c:139

7886 +#: builtin/rm.c:212

7887 msgid "exit with a zero status even if nothing matched"

7888 msgstr "avsluta med nollstatus även om inget träffades"

7889

7864 -#: builtin/rm.c:194

7890 +#: builtin/rm.c:268

7891 #, c-format

7892 msgid "not removing '%s' recursively without -r"

7893 msgstr "tar inte bort \"%s\" rekursivt utan -r"

7894

7869 -#: builtin/rm.c:230

7895 +#: builtin/rm.c:307

7896 #, c-format

7897 msgid "git rm: unable to remove %s"

7898 msgstr "git rm: kan inte ta bort %s"

@@ -7993,35 +8019,35 @@ msgstr ""

8019 msgid "git show-ref --exclude-existing[=pattern] < ref-list"

8020 msgstr "git show-ref --exclude-existing[=mönster] < reflista"

8021

7996 -#: builtin/show-ref.c:182

8022 +#: builtin/show-ref.c:165

8023 msgid "only show tags (can be combined with heads)"

8024 msgstr "visa endast taggar (kan kombineras med huvuden)"

8025

8000 -#: builtin/show-ref.c:183

8026 +#: builtin/show-ref.c:166

8027 msgid "only show heads (can be combined with tags)"

8028 msgstr "visa endast huvuden (kan kombineras med taggar)"

8029

8004 -#: builtin/show-ref.c:184

8030 +#: builtin/show-ref.c:167

8031 msgid "stricter reference checking, requires exact ref path"

8032 msgstr "striktare referenskontroll, kräver exakt referenssökväg"

8033

8008 -#: builtin/show-ref.c:187 builtin/show-ref.c:189

8034 +#: builtin/show-ref.c:170 builtin/show-ref.c:172

8035 msgid "show the HEAD reference"

8036 msgstr "visa HEAD-referensen"

8037

8012 -#: builtin/show-ref.c:191

8038 +#: builtin/show-ref.c:174

8039 msgid "dereference tags into object IDs"

8040 msgstr "avreferera taggar till objekt-id"

8041

8016 -#: builtin/show-ref.c:193

8042 +#: builtin/show-ref.c:176

8043 msgid "only show SHA1 hash using <n> digits"

8044 msgstr "visa SHA1-hash endast med <n> siffror"

8045

8020 -#: builtin/show-ref.c:197

8046 +#: builtin/show-ref.c:180

8047 msgid "do not print results to stdout (useful with --verify)"

8048 msgstr "visa inte resultat på standard ut (användbart med --verify)"

8049

8024 -#: builtin/show-ref.c:199

8050 +#: builtin/show-ref.c:182

8051 msgid "show refs from stdin that aren't in local repository"

8052 msgstr "visa referenser från standard in som inte finns i lokalt arkiv"

8053

@@ -8029,20 +8055,28 @@ msgstr "visa referenser från standard in som inte finns i lokalt arkiv"

8055 msgid "git symbolic-ref [options] name [ref]"

8056 msgstr "git symbolic-ref [flaggor] namn [ref]"

8057

8032 -#: builtin/symbolic-ref.c:38

8058 +#: builtin/symbolic-ref.c:8

8059 +msgid "git symbolic-ref -d [-q] name"

8060 +msgstr "git symbolic-ref -d [-q] namn"

8061 +

8062 +#: builtin/symbolic-ref.c:40

8063 msgid "suppress error message for non-symbolic (detached) refs"

8064 msgstr ""

8065 "undertryck felmeddelanden för icke-symboliska (frånkopplade) referenser"

8066

8037 -#: builtin/symbolic-ref.c:39

8067 +#: builtin/symbolic-ref.c:41

8068 +msgid "delete symbolic ref"

8069 +msgstr "ta bort symbolisk referens"

8070 +

8071 +#: builtin/symbolic-ref.c:42

8072 msgid "shorten ref output"

8073 msgstr "förkorta ref-utdata"

8074

8041 -#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18

8075 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18

8076 msgid "reason"

8077 msgstr "skäl"

8078

8045 -#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18

8079 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18

8080 msgid "reason of the update"

8081 msgstr "skäl till uppdateringen"

8082

@@ -8266,111 +8300,111 @@ msgstr "Uppdaterad tagg \"%s\" (var %s)\n"

8300 msgid "git update-index [options] [--] [<file>...]"

8301 msgstr "git update-index [flaggor] [--] [<fil>...]"

8302

8269 -#: builtin/update-index.c:717

8303 +#: builtin/update-index.c:718

8304 msgid "continue refresh even when index needs update"

8305 msgstr "fortsätt uppdatera även när index inte är àjour"

8306

8273 -#: builtin/update-index.c:720

8307 +#: builtin/update-index.c:721

8308 msgid "refresh: ignore submodules"

8309 msgstr "refresh: ignorera undermoduler"

8310

8277 -#: builtin/update-index.c:723

8311 +#: builtin/update-index.c:724

8312 msgid "do not ignore new files"

8313 msgstr "ignorera inte nya filer"

8314

8281 -#: builtin/update-index.c:725

8315 +#: builtin/update-index.c:726

8316 msgid "let files replace directories and vice-versa"

8317 msgstr "låt filer ersätta kataloger och omvänt"

8318

8285 -#: builtin/update-index.c:727

8319 +#: builtin/update-index.c:728

8320 msgid "notice files missing from worktree"

8321 msgstr "lägg märke till filer som saknas i arbetskatalogen"

8322

8289 -#: builtin/update-index.c:729

8323 +#: builtin/update-index.c:730

8324 msgid "refresh even if index contains unmerged entries"

8325 msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"

8326

8293 -#: builtin/update-index.c:732

8327 +#: builtin/update-index.c:733

8328 msgid "refresh stat information"

8329 msgstr "uppdatera statusinformation"

8330

8297 -#: builtin/update-index.c:736

8331 +#: builtin/update-index.c:737

8332 msgid "like --refresh, but ignore assume-unchanged setting"

8333 msgstr "som --refresh, men ignorera assume-unchanged-inställning"

8334

8301 -#: builtin/update-index.c:740

8335 +#: builtin/update-index.c:741

8336 msgid "<mode> <object> <path>"

8337 msgstr "<läge> <objekt> <sökväg>"

8338

8305 -#: builtin/update-index.c:741

8339 +#: builtin/update-index.c:742

8340 msgid "add the specified entry to the index"

8341 msgstr "lägg till angiven post i indexet"

8342

8309 -#: builtin/update-index.c:745

8343 +#: builtin/update-index.c:746

8344 msgid "(+/-)x"

8345 msgstr "(+/-)x"

8346

8313 -#: builtin/update-index.c:746

8347 +#: builtin/update-index.c:747

8348 msgid "override the executable bit of the listed files"

8349 msgstr "överstyr exekveringsbiten för angivna filer"

8350

8317 -#: builtin/update-index.c:750

8351 +#: builtin/update-index.c:751

8352 msgid "mark files as \"not changing\""

8353 msgstr "markera filer som \"ändras inte\""

8354

8321 -#: builtin/update-index.c:753

8355 +#: builtin/update-index.c:754

8356 msgid "clear assumed-unchanged bit"

8357 msgstr "rensa \"assume-unchanged\"-biten"

8358

8325 -#: builtin/update-index.c:756

8359 +#: builtin/update-index.c:757

8360 msgid "mark files as \"index-only\""

8361 msgstr "markera filer som \"endast index\""

8362

8329 -#: builtin/update-index.c:759

8363 +#: builtin/update-index.c:760

8364 msgid "clear skip-worktree bit"

8365 msgstr "töm \"skip-worktree\"-biten"

8366

8333 -#: builtin/update-index.c:762

8367 +#: builtin/update-index.c:763

8368 msgid "add to index only; do not add content to object database"

8369 msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen"

8370

8337 -#: builtin/update-index.c:764

8371 +#: builtin/update-index.c:765

8372 msgid "remove named paths even if present in worktree"

8373 msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen"

8374

8341 -#: builtin/update-index.c:766

8375 +#: builtin/update-index.c:767

8376 msgid "with --stdin: input lines are terminated by null bytes"

8377 msgstr "med --stdin: indatarader termineras med null-byte"

8378

8345 -#: builtin/update-index.c:768

8379 +#: builtin/update-index.c:769

8380 msgid "read list of paths to be updated from standard input"

8381 msgstr "läs lista över sökvägar att uppdatera från standard in"

8382

8349 -#: builtin/update-index.c:772

8383 +#: builtin/update-index.c:773

8384 msgid "add entries from standard input to the index"

8385 msgstr "lägg poster från från standard in till indexet"

8386

8353 -#: builtin/update-index.c:776

8387 +#: builtin/update-index.c:777

8388 msgid "repopulate stages #2 and #3 for the listed paths"

8389 msgstr "återfyll etapp 2 och 3 från angivna sökvägar"

8390

8357 -#: builtin/update-index.c:780

8391 +#: builtin/update-index.c:781

8392 msgid "only update entries that differ from HEAD"

8393 msgstr "uppdatera endast poster som skiljer sig från HEAD"

8394

8361 -#: builtin/update-index.c:784

8395 +#: builtin/update-index.c:785

8396 msgid "ignore files missing from worktree"

8397 msgstr "ignorera filer som saknas i arbetskatalogen"

8398

8365 -#: builtin/update-index.c:787

8399 +#: builtin/update-index.c:788

8400 msgid "report actions to standard output"

8401 msgstr "raportera åtgärder på standard ut"

8402

8369 -#: builtin/update-index.c:789

8403 +#: builtin/update-index.c:790

8404 msgid "(for porcelains) forget saved unresolved conflicts"

8405 msgstr "(för porslin) glöm sparade olösta konflikter"

8406

8373 -#: builtin/update-index.c:793

8407 +#: builtin/update-index.c:794

8408 msgid "write index in this format"

8409 msgstr "skriv index i detta format"

8410

@@ -8888,7 +8922,7 @@ msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet"

8922 #. The working tree and the index file is still based on the

8923 #. $orig_head commit, but we are merging into $curr_head.

8924 #. First update the working tree to match $curr_head.

8891 -#: git-pull.sh:228

8925 +#: git-pull.sh:229

8926 #, sh-format

8927 msgid ""

8928 "Warning: fetch updated the current branch head.\n"

@@ -8899,11 +8933,11 @@ msgstr ""

8933 "Varning: snabbspolar din arbetskatalog från\n"

8934 "Varning: incheckningen $orig_head."

8935

8902 -#: git-pull.sh:253

8936 +#: git-pull.sh:254

8937 msgid "Cannot merge multiple branches into empty head"

8938 msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."

8939

8906 -#: git-pull.sh:257

8940 +#: git-pull.sh:258

8941 msgid "Cannot rebase onto multiple branches"

8942 msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar"

8943

@@ -9160,12 +9194,12 @@ msgstr "Inget grennamn angavs"

9194 msgid "(To restore them type \"git stash apply\")"

9195 msgstr "(För att återställa dem, skriv \"git stash apply\")"

9196

9163 -#: git-submodule.sh:88

9197 +#: git-submodule.sh:89

9198 #, sh-format

9199 msgid "cannot strip one component off url '$remoteurl'"

9200 msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\""

9201

9168 -#: git-submodule.sh:167

9202 +#: git-submodule.sh:168

9203 #, sh-format

9204 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"

9205 msgstr ""

@@ -9181,17 +9215,17 @@ msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$sm_path\""

9215 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"

9216 msgstr "Gitkatalog \"$a\" ingår i underkatalogsökvägen \"$b\" eller omvänt"

9217

9184 -#: git-submodule.sh:312

9218 +#: git-submodule.sh:316

9219 #, sh-format

9220 msgid "repo URL: '$repo' must be absolute or begin with ./|../"

9221 msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"

9222

9189 -#: git-submodule.sh:329

9223 +#: git-submodule.sh:333

9224 #, sh-format

9225 msgid "'$sm_path' already exists in the index"

9226 msgstr "\"$sm_path\" finns redan i indexet"

9227

9194 -#: git-submodule.sh:333

9228 +#: git-submodule.sh:337

9229 #, sh-format

9230 msgid ""

9231 "The following path is ignored by one of your .gitignore files:\n"

@@ -9202,64 +9236,98 @@ msgstr ""

9236 "$sm_path\n"

9237 "Använd -f om du verkligen vill lägga till den"

9238

9205 -#: git-submodule.sh:344

9239 +#: git-submodule.sh:355

9240 #, sh-format

9241 msgid "Adding existing repo at '$sm_path' to the index"

9242 msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"

9243

9210 -#: git-submodule.sh:346

9244 +#: git-submodule.sh:357

9245 #, sh-format

9246 msgid "'$sm_path' already exists and is not a valid git repo"

9247 msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"

9248

9215 -#: git-submodule.sh:360

9249 +#: git-submodule.sh:365

9250 +#, sh-format

9251 +msgid "A git directory for '$sm_name' is found locally with remote(s):"

9252 +msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):"

9253 +

9254 +#: git-submodule.sh:367

9255 +#, sh-format

9256 +msgid ""

9257 +"If you want to reuse this local git directory instead of cloning again from"

9258 +msgstr ""

9259 +"För att återanvända den lokala git-katalogen istället för att på nytt klona "

9260 +"från"

9261 +

9262 +#: git-submodule.sh:369

9263 +#, sh-format

9264 +msgid ""

9265 +"use the '--force' option. If the local git directory is not the correct repo"

9266 +msgstr ""

9267 +"använd flaggan \"--force\". Om den lokala git-katalogen inte är riktigt arkiv"

9268 +

9269 +#: git-submodule.sh:370

9270 +#, sh-format

9271 +msgid ""

9272 +"or you are unsure what this means choose another name with the '--name' "

9273 +"option."

9274 +msgstr ""

9275 +"eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--name"

9276 +"\"."

9277 +

9278 +#: git-submodule.sh:372

9279 +#, sh-format

9280 +msgid "Reactivating local git directory for submodule '$sm_name'."

9281 +msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt."

9282 +

9283 +#: git-submodule.sh:384

9284 #, sh-format

9285 msgid "Unable to checkout submodule '$sm_path'"

9286 msgstr "Kan inte checka ut undermodulen \"$sm_path\""

9287

9220 -#: git-submodule.sh:365

9288 +#: git-submodule.sh:389

9289 #, sh-format

9290 msgid "Failed to add submodule '$sm_path'"

9291 msgstr "Misslyckades lägga till undermodulen \"$sm_path\""

9292

9225 -#: git-submodule.sh:370

9293 +#: git-submodule.sh:394

9294 #, sh-format

9295 msgid "Failed to register submodule '$sm_path'"

9296 msgstr "Misslyckades registrera undermodulen \"$sm_path\""

9297

9230 -#: git-submodule.sh:413

9298 +#: git-submodule.sh:437

9299 #, sh-format

9300 msgid "Entering '$prefix$sm_path'"

9301 msgstr "Går in i \"$prefix$sm_path\""

9302

9235 -#: git-submodule.sh:427

9303 +#: git-submodule.sh:451

9304 #, sh-format

9305 msgid "Stopping at '$sm_path'; script returned non-zero status."

9306 msgstr ""

9307 "Stoppar på \"$sm_path\"; skriptet returnerade en status skild från noll."

9308

9241 -#: git-submodule.sh:471

9309 +#: git-submodule.sh:495

9310 #, sh-format

9311 msgid "No url found for submodule path '$sm_path' in .gitmodules"

9312 msgstr "Hittade ingen url för undermodulsökvägen \"$sm_path\" i .gitmodules"

9313

9246 -#: git-submodule.sh:480

9314 +#: git-submodule.sh:504

9315 #, sh-format

9316 msgid "Failed to register url for submodule path '$sm_path'"

9317 msgstr "Misslyckades registrera url för underkatalogsökväg \"$sm_path\""

9318

9251 -#: git-submodule.sh:482

9319 +#: git-submodule.sh:506

9320 #, sh-format

9321 msgid "Submodule '$name' ($url) registered for path '$sm_path'"

9322 msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$sm_path\""

9323

9256 -#: git-submodule.sh:490

9324 +#: git-submodule.sh:514

9325 #, sh-format

9326 msgid "Failed to register update mode for submodule path '$sm_path'"

9327 msgstr ""

9328 "Misslyckades registrera uppdateringsläge för undermodulsökväg \"$sm_path\""

9329

9262 -#: git-submodule.sh:590

9330 +#: git-submodule.sh:614

9331 #, sh-format

9332 msgid ""

9333 "Submodule path '$sm_path' not initialized\n"

@@ -9268,92 +9336,92 @@ msgstr ""

9336 "Undermodulen \"$sm_path\" har inte initierats\n"

9337 "Kanske du vill köra \"update --init\"?"

9338

9271 -#: git-submodule.sh:603

9339 +#: git-submodule.sh:627

9340 #, sh-format

9341 msgid "Unable to find current revision in submodule path '$sm_path'"

9342 msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$sm_path\""

9343

9276 -#: git-submodule.sh:622

9344 +#: git-submodule.sh:646

9345 #, sh-format

9346 msgid "Unable to fetch in submodule path '$sm_path'"

9347 msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""

9348

9281 -#: git-submodule.sh:636

9349 +#: git-submodule.sh:660

9350 #, sh-format

9351 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"

9352 msgstr "Kan inte ombasera \"$sha1\" i undermodulsökväg \"$sm_path\""

9353

9286 -#: git-submodule.sh:637

9354 +#: git-submodule.sh:661

9355 #, sh-format

9356 msgid "Submodule path '$sm_path': rebased into '$sha1'"

9357 msgstr "Undermodulsökvägen \"$sm_path\": ombaserade in i \"$sha1\""

9358

9291 -#: git-submodule.sh:642

9359 +#: git-submodule.sh:666

9360 #, sh-format

9361 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"

9362 msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$sm_path\""

9363

9296 -#: git-submodule.sh:643

9364 +#: git-submodule.sh:667

9365 #, sh-format

9366 msgid "Submodule path '$sm_path': merged in '$sha1'"

9367 msgstr "Undermodulsökvägen \"$sm_path\": sammanslagen i \"$sha1\""

9368

9301 -#: git-submodule.sh:648

9369 +#: git-submodule.sh:672

9370 #, sh-format

9371 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"

9372 msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$sm_path\""

9373

9306 -#: git-submodule.sh:649

9374 +#: git-submodule.sh:673

9375 #, sh-format

9376 msgid "Submodule path '$sm_path': checked out '$sha1'"

9377 msgstr "Undermodulsökvägen \"$sm_path\": checkade ut \"$sha1\""

9378

9311 -#: git-submodule.sh:671 git-submodule.sh:995

9379 +#: git-submodule.sh:695 git-submodule.sh:1017

9380 #, sh-format

9381 msgid "Failed to recurse into submodule path '$sm_path'"

9382 msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""

9383

9316 -#: git-submodule.sh:779

9384 +#: git-submodule.sh:803

9385 msgid "The --cached option cannot be used with the --files option"

9386 msgstr "Flaggan --cached kan inte användas med flaggan --files"

9387

9388 #. unexpected type

9321 -#: git-submodule.sh:819

9389 +#: git-submodule.sh:843

9390 #, sh-format

9391 msgid "unexpected mode $mod_dst"

9392 msgstr "oväntat läge $mod_dst"

9393

9326 -#: git-submodule.sh:837

9394 +#: git-submodule.sh:861

9395 #, sh-format

9396 msgid " Warn: $name doesn't contain commit $sha1_src"

9397 msgstr " Varning: $name innehåller inte incheckning $sha1_src"

9398

9331 -#: git-submodule.sh:840

9399 +#: git-submodule.sh:864

9400 #, sh-format

9401 msgid " Warn: $name doesn't contain commit $sha1_dst"

9402 msgstr " Varning: $name innehåller inte incheckning $sha1_dst"

9403

9336 -#: git-submodule.sh:843

9404 +#: git-submodule.sh:867

9405 #, sh-format

9406 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"

9407 msgstr " Varning: $name innehåller inte incheckningar $sha1_src och $sha1_dst"

9408

9341 -#: git-submodule.sh:868

9409 +#: git-submodule.sh:892

9410 msgid "blob"

9411 msgstr "blob"

9412

9345 -#: git-submodule.sh:906

9413 +#: git-submodule.sh:930

9414 msgid "# Submodules changed but not updated:"

9415 msgstr "# Undermoduler ändrade men inte uppdaterade:"

9416

9349 -#: git-submodule.sh:908

9417 +#: git-submodule.sh:932

9418 msgid "# Submodule changes to be committed:"

9419 msgstr "# Undermodulers ändringar att checka in:"

9420

9353 -#: git-submodule.sh:1054

9421 +#: git-submodule.sh:1080

9422 #, sh-format

9355 -msgid "Synchronizing submodule url for '$name'"

9356 -msgstr "Synkroniserar undermodul-url för \"$name\""

9423 +msgid "Synchronizing submodule url for '$prefix$sm_path'"

9424 +msgstr "Synkroniserar undermodul-url för \"$prefix$sm_path\""

9425

9426 #~ msgid " 0 files changed"

9427 #~ msgstr " 0 filer ändrade"

l10n: Update Swedish translation (1975t0f0u)