6402d7fcd5 · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2017-04-23 09:54+0800\n"

11 -"PO-Revision-Date: 2017-04-23 19:46+0100\n"

10 +"POT-Creation-Date: 2017-05-05 09:35+0800\n"

11 +"PO-Revision-Date: 2017-05-09 08:02+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"

@@ -601,7 +601,7 @@ msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."

601 msgid "Unable to write new index file"

602 msgstr "Kunde inte skriva ny indexfil"

603

604 -#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280

604 +#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279

605 #: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180

606 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629

607 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973

@@ -618,7 +618,7 @@ msgstr "tillämpa inte ändringar som motsvarar given sökväg"

618 msgid "apply changes matching the given path"

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

620

621 -#: apply.c:4917 builtin/am.c:2286

621 +#: apply.c:4917 builtin/am.c:2285

622 msgid "num"

623 msgstr "antal"

624

@@ -670,7 +670,7 @@ msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"

670 msgid "build a temporary index based on embedded index information"

671 msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"

672

673 -#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508

673 +#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515

674 msgid "paths are separated with NUL character"

675 msgstr "sökvägar avdelas med NUL-tecken"

676

@@ -678,7 +678,7 @@ msgstr "sökvägar avdelas med NUL-tecken"

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

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

680

681 -#: apply.c:4949 builtin/am.c:2265

681 +#: apply.c:4949 builtin/am.c:2264

682 msgid "action"

683 msgstr "åtgärd"

684

@@ -720,7 +720,7 @@ msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

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

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

722

723 -#: apply.c:4973 builtin/am.c:2274

723 +#: apply.c:4973 builtin/am.c:2273

724 msgid "root"

725 msgstr "rot"

726

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

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

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

770

771 -#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59

771 +#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60

772 #: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061

773 -#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545

773 +#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552

774 #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129

775 #: parse-options.h:153

776 msgid "file"

@@ -856,27 +856,27 @@ msgstr ""

856 "Negativa mönster ignoreras i git-attribut\n"

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

858

859 -#: bisect.c:443

859 +#: bisect.c:444

860 #, c-format

861 msgid "Could not open file '%s'"

862 msgstr "Kunde inte öppna filen \"%s\""

863

864 -#: bisect.c:448

864 +#: bisect.c:449

865 #, c-format

866 msgid "Badly quoted content in file '%s': %s"

867 msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"

868

869 -#: bisect.c:656

869 +#: bisect.c:657

870 #, c-format

871 msgid "We cannot bisect more!\n"

872 msgstr "Det finns inte mer att göra \"bisect\" på!\n"

873

874 -#: bisect.c:709

874 +#: bisect.c:710

875 #, c-format

876 msgid "Not a valid commit name %s"

877 msgstr "Namnet på incheckningen är inte giltigt: %s"

878

879 -#: bisect.c:733

879 +#: bisect.c:734

880 #, c-format

881 msgid ""

882 "The merge base %s is bad.\n"

@@ -885,7 +885,7 @@ msgstr ""

885 "Sammanslagningsbasen %s är trasig.\n"

886 "Det betyder att felet har rättats mellan %s och [%s].\n"

887

888 -#: bisect.c:738

888 +#: bisect.c:739

889 #, c-format

890 msgid ""

891 "The merge base %s is new.\n"

@@ -894,7 +894,7 @@ msgstr ""

894 "Sammanslagningsbasen %s är ny.\n"

895 "Egenskapen har ändrats mellan %s och [%s].\n"

896

897 -#: bisect.c:743

897 +#: bisect.c:744

898 #, c-format

899 msgid ""

900 "The merge base %s is %s.\n"

@@ -903,7 +903,7 @@ msgstr ""

903 "Sammanslagningsbasen %s är %s.\n"

904 "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"

905

906 -#: bisect.c:751

906 +#: bisect.c:752

907 #, c-format

908 msgid ""

909 "Some %s revs are not ancestors of the %s rev.\n"

@@ -914,7 +914,7 @@ msgstr ""

914 "git bisect kan inte fungera korrekt i detta fall.\n"

915 "Kanske du skrev fel %s- och %s-revisioner?\n"

916

917 -#: bisect.c:764

917 +#: bisect.c:765

918 #, c-format

919 msgid ""

920 "the merge base between %s and [%s] must be skipped.\n"

@@ -926,36 +926,36 @@ msgstr ""

926 "%s.\n"

927 "Vi fortsätter ändå."

928

929 -#: bisect.c:799

929 +#: bisect.c:800

930 #, c-format

931 msgid "Bisecting: a merge base must be tested\n"

932 msgstr "Bisect: en sammanslagningsbas måste testas\n"

933

934 -#: bisect.c:850

934 +#: bisect.c:851

935 #, c-format

936 msgid "a %s revision is needed"

937 msgstr "en %s-revision behövs"

938

939 -#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255

939 +#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255

940 #, c-format

941 msgid "could not create file '%s'"

942 msgstr "kunde inte skapa filen \"%s\""

943

944 -#: bisect.c:918

944 +#: bisect.c:919

945 #, c-format

946 msgid "could not read file '%s'"

947 msgstr "kunde inte läsa filen \"%s\""

948

949 -#: bisect.c:948

949 +#: bisect.c:949

950 msgid "reading bisect refs failed"

951 msgstr "misslyckades läsa bisect-referenser"

952

953 -#: bisect.c:968

953 +#: bisect.c:969

954 #, c-format

955 msgid "%s was both %s and %s\n"

956 msgstr "%s var både %s och %s\n"

957

958 -#: bisect.c:976

958 +#: bisect.c:977

959 #, c-format

960 msgid ""

961 "No testable commit found.\n"

@@ -964,7 +964,7 @@ msgstr ""

964 "Ingen testbar incheckning hittades.\n"

965 "Kanske du startade med felaktiga sökvägsparametrar?\n"

966

967 -#: bisect.c:995

967 +#: bisect.c:996

968 #, c-format

969 msgid "(roughly %d step)"

970 msgid_plural "(roughly %d steps)"

@@ -973,7 +973,7 @@ msgstr[1] "(ungefär %d steg)"

973

974 #. TRANSLATORS: the last %s will be replaced with

975 #. "(roughly %d steps)" translation

976 -#: bisect.c:999

976 +#: bisect.c:1000

977 #, c-format

978 msgid "Bisecting: %d revision left to test after this %s\n"

979 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

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

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

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

1130

1131 -#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777

1131 +#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777

1132 #, c-format

1133 msgid "could not open '%s'"

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

@@ -1137,7 +1137,7 @@ msgstr "kunde inte öppna \"%s\""

1137 msgid "Repository lacks these prerequisite commits:"

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

1139

1140 -#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299

1140 +#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321

1141 #: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353

1142 #: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916

1143 #: builtin/merge.c:359 builtin/shortlog.c:176

@@ -1202,8 +1202,8 @@ msgstr "index-pack dog"

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

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

1204

1205 -#: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457

1206 -#: builtin/am.c:1493 builtin/am.c:2127

1205 +#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455

1206 +#: builtin/am.c:1489 builtin/am.c:2126

1207 #, c-format

1208 msgid "could not parse %s"

1209 msgstr "kunde inte tolka %s"

@@ -1231,156 +1231,156 @@ msgstr "minnet slut"

1231 msgid "relative config include conditionals must come from files"

1232 msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"

1233

1234 -#: config.c:701

1234 +#: config.c:711

1235 #, c-format

1236 msgid "bad config line %d in blob %s"

1237 msgstr "felaktig konfigurationsfil rad %d i blob:en %s"

1238

1239 -#: config.c:705

1239 +#: config.c:715

1240 #, c-format

1241 msgid "bad config line %d in file %s"

1242 msgstr "felaktig konfigurationsfil rad %d i filen %s"

1243

1244 -#: config.c:709

1244 +#: config.c:719

1245 #, c-format

1246 msgid "bad config line %d in standard input"

1247 msgstr "felaktig konfigurationsfil rad %d i standard in"

1248

1249 -#: config.c:713

1249 +#: config.c:723

1250 #, c-format

1251 msgid "bad config line %d in submodule-blob %s"

1252 msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"

1253

1254 -#: config.c:717

1254 +#: config.c:727

1255 #, c-format

1256 msgid "bad config line %d in command line %s"

1257 msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"

1258

1259 -#: config.c:721

1259 +#: config.c:731

1260 #, c-format

1261 msgid "bad config line %d in %s"

1262 msgstr "felaktig konfigurationsfil rad %d i %s"

1263

1264 -#: config.c:840

1264 +#: config.c:859

1265 msgid "out of range"

1266 msgstr "utanför intervallet"

1267

1268 -#: config.c:840

1268 +#: config.c:859

1269 msgid "invalid unit"

1270 msgstr "ogiltig enhet"

1271

1272 -#: config.c:846

1272 +#: config.c:865

1273 #, c-format

1274 msgid "bad numeric config value '%s' for '%s': %s"

1275 msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"

1276

1277 -#: config.c:851

1277 +#: config.c:870

1278 #, c-format

1279 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

1280 msgstr ""

1281 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"

1282

1283 -#: config.c:854

1283 +#: config.c:873

1284 #, c-format

1285 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

1286 msgstr ""

1287 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"

1288

1289 -#: config.c:857

1289 +#: config.c:876

1290 #, c-format

1291 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

1292 msgstr ""

1293 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"

1294

1295 -#: config.c:860

1295 +#: config.c:879

1296 #, c-format

1297 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

1298 msgstr ""

1299 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"

1300 "en %s: %s"

1301

1302 -#: config.c:863

1302 +#: config.c:882

1303 #, c-format

1304 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

1305 msgstr ""

1306 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "

1307 "%s: %s"

1308

1309 -#: config.c:866

1309 +#: config.c:885

1310 #, c-format

1311 msgid "bad numeric config value '%s' for '%s' in %s: %s"

1312 msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"

1313

1314 -#: config.c:953

1314 +#: config.c:980

1315 #, c-format

1316 msgid "failed to expand user dir in: '%s'"

1317 msgstr "misslyckades expandera användarkatalog i: \"%s\""

1318

1319 -#: config.c:1048 config.c:1059

1319 +#: config.c:1075 config.c:1086

1320 #, c-format

1321 msgid "bad zlib compression level %d"

1322 msgstr "felaktigt zlib-komprimeringsgrad %d"

1323

1324 -#: config.c:1176

1324 +#: config.c:1203

1325 #, c-format

1326 msgid "invalid mode for object creation: %s"

1327 msgstr "felaktigt läge för skapande av objekt: %s"

1328

1329 -#: config.c:1332

1329 +#: config.c:1359

1330 #, c-format

1331 msgid "bad pack compression level %d"

1332 msgstr "felaktig paketkomprimeringsgrad %d"

1333

1334 -#: config.c:1522

1334 +#: config.c:1557

1335 msgid "unable to parse command-line config"

1336 msgstr "kan inte tolka kommandoradskonfiguration"

1337

1338 -#: config.c:1572

1338 +#: config.c:1611

1339 msgid "unknown error occurred while reading the configuration files"

1340 msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"

1341

1342 -#: config.c:1931

1342 +#: config.c:1970

1343 #, c-format

1344 msgid "Invalid %s: '%s'"

1345 msgstr "Felaktigt %s: \"%s\""

1346

1347 -#: config.c:1952

1347 +#: config.c:1991

1348 #, c-format

1349 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"

1350 msgstr ""

1351 "okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\""

1352

1353 -#: config.c:1978

1353 +#: config.c:2017

1354 #, c-format

1355 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

1356 msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"

1357

1358 -#: config.c:1989

1358 +#: config.c:2028

1359 #, c-format

1360 msgid "unable to parse '%s' from command-line config"

1361 msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"

1362

1363 -#: config.c:1991

1363 +#: config.c:2030

1364 #, c-format

1365 msgid "bad config variable '%s' in file '%s' at line %d"

1366 msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"

1367

1368 -#: config.c:2050

1368 +#: config.c:2089

1369 #, c-format

1370 msgid "%s has multiple values"

1371 msgstr "%s har flera värden"

1372

1373 -#: config.c:2384 config.c:2609

1373 +#: config.c:2423 config.c:2648

1374 #, c-format

1375 msgid "fstat on %s failed"

1376 msgstr "fstat misslyckades på %s"

1377

1378 -#: config.c:2502

1378 +#: config.c:2541

1379 #, c-format

1380 msgid "could not set '%s' to '%s'"

1381 msgstr "kunde inte ställa in \"%s\" till \"%s\""

1382

1383 -#: config.c:2504 builtin/remote.c:774

1383 +#: config.c:2543 builtin/remote.c:774

1384 #, c-format

1385 msgid "could not unset '%s'"

1386 msgstr "kunde inte ta bort inställning för \"%s\""

@@ -1627,171 +1627,176 @@ msgstr "git fetch-pack: förväntade grund lista"

1627 msgid "git fetch-pack: expected ACK/NAK, got EOF"

1628 msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"

1629

1630 -#: fetch-pack.c:279

1630 +#: fetch-pack.c:280 builtin/archive.c:63

1631 +#, c-format

1632 +msgid "remote error: %s"

1633 +msgstr "fjärrfel: %s"

1634 +

1635 +#: fetch-pack.c:281

1636 #, c-format

1637 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

1638 msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""

1639

1635 -#: fetch-pack.c:331

1640 +#: fetch-pack.c:333

1641 msgid "--stateless-rpc requires multi_ack_detailed"

1642 msgstr "--stateless-rpc kräver \"multi ack detailed\""

1643

1639 -#: fetch-pack.c:417

1644 +#: fetch-pack.c:419

1645 #, c-format

1646 msgid "invalid shallow line: %s"

1647 msgstr "ogiltig \"shallow\"-rad: %s"

1648

1644 -#: fetch-pack.c:423

1649 +#: fetch-pack.c:425

1650 #, c-format

1651 msgid "invalid unshallow line: %s"

1652 msgstr "ogiltig \"unshallow\"-rad: %s"

1653

1649 -#: fetch-pack.c:425

1654 +#: fetch-pack.c:427

1655 #, c-format

1656 msgid "object not found: %s"

1657 msgstr "objektet hittades inte: %s"

1658

1654 -#: fetch-pack.c:428

1659 +#: fetch-pack.c:430

1660 #, c-format

1661 msgid "error in object: %s"

1662 msgstr "fel i objekt: %s"

1663

1659 -#: fetch-pack.c:430

1664 +#: fetch-pack.c:432

1665 #, c-format

1666 msgid "no shallow found: %s"

1667 msgstr "ingen \"shallow\" hittades: %s"

1668

1664 -#: fetch-pack.c:433

1669 +#: fetch-pack.c:435

1670 #, c-format

1671 msgid "expected shallow/unshallow, got %s"

1672 msgstr "förväntade shallow/unshallow, fick %s"

1673

1669 -#: fetch-pack.c:472

1674 +#: fetch-pack.c:474

1675 #, c-format

1676 msgid "got %s %d %s"

1677 msgstr "fick %s %d %s"

1678

1674 -#: fetch-pack.c:486

1679 +#: fetch-pack.c:488

1680 #, c-format

1681 msgid "invalid commit %s"

1682 msgstr "ogiltig incheckning %s"

1683

1679 -#: fetch-pack.c:519

1684 +#: fetch-pack.c:521

1685 msgid "giving up"

1686 msgstr "ger upp"

1687

1683 -#: fetch-pack.c:529 progress.c:235

1688 +#: fetch-pack.c:531 progress.c:235

1689 msgid "done"

1690 msgstr "klart"

1691

1687 -#: fetch-pack.c:541

1692 +#: fetch-pack.c:543

1693 #, c-format

1694 msgid "got %s (%d) %s"

1695 msgstr "fick %s (%d) %s"

1696

1692 -#: fetch-pack.c:587

1697 +#: fetch-pack.c:589

1698 #, c-format

1699 msgid "Marking %s as complete"

1700 msgstr "Markerar %s som komplett"

1701

1697 -#: fetch-pack.c:735

1702 +#: fetch-pack.c:737

1703 #, c-format

1704 msgid "already have %s (%s)"

1705 msgstr "har redan %s (%s)"

1706

1702 -#: fetch-pack.c:773

1707 +#: fetch-pack.c:775

1708 msgid "fetch-pack: unable to fork off sideband demultiplexer"

1709 msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"

1710

1706 -#: fetch-pack.c:781

1711 +#: fetch-pack.c:783

1712 msgid "protocol error: bad pack header"

1713 msgstr "protokollfel: felaktigt packhuvud"

1714

1710 -#: fetch-pack.c:837

1715 +#: fetch-pack.c:839

1716 #, c-format

1717 msgid "fetch-pack: unable to fork off %s"

1718 msgstr "fetch-patch: kunde inte grena av %s"

1719

1715 -#: fetch-pack.c:853

1720 +#: fetch-pack.c:855

1721 #, c-format

1722 msgid "%s failed"

1723 msgstr "%s misslyckades"

1724

1720 -#: fetch-pack.c:855

1725 +#: fetch-pack.c:857

1726 msgid "error in sideband demultiplexer"

1727 msgstr "fel i sidbands-avmultiplexare"

1728

1724 -#: fetch-pack.c:882

1729 +#: fetch-pack.c:884

1730 msgid "Server does not support shallow clients"

1731 msgstr "Servern stöder inte klienter med grunda arkiv"

1732

1728 -#: fetch-pack.c:886

1733 +#: fetch-pack.c:888

1734 msgid "Server supports multi_ack_detailed"

1735 msgstr "Servern stöder \"multi_ack_detailed\""

1736

1732 -#: fetch-pack.c:889

1737 +#: fetch-pack.c:891

1738 msgid "Server supports no-done"

1739 msgstr "Servern stöder \"no-done\""

1740

1736 -#: fetch-pack.c:895

1741 +#: fetch-pack.c:897

1742 msgid "Server supports multi_ack"

1743 msgstr "Servern stöder \"multi_ack\""

1744

1740 -#: fetch-pack.c:899

1745 +#: fetch-pack.c:901

1746 msgid "Server supports side-band-64k"

1747 msgstr "Servern stöder \"side-band-64k\""

1748

1744 -#: fetch-pack.c:903

1749 +#: fetch-pack.c:905

1750 msgid "Server supports side-band"

1751 msgstr "Servern stöder \"side-band\""

1752

1748 -#: fetch-pack.c:907

1753 +#: fetch-pack.c:909

1754 msgid "Server supports allow-tip-sha1-in-want"

1755 msgstr "Servern stöder \"allow-tip-sha1-in-want\""

1756

1752 -#: fetch-pack.c:911

1757 +#: fetch-pack.c:913

1758 msgid "Server supports allow-reachable-sha1-in-want"

1759 msgstr "Servern stöder \"allow-reachable-sha1-in-want\""

1760

1756 -#: fetch-pack.c:921

1761 +#: fetch-pack.c:923

1762 msgid "Server supports ofs-delta"

1763 msgstr "Servern stöder \"ofs-delta\""

1764

1760 -#: fetch-pack.c:928

1765 +#: fetch-pack.c:930

1766 #, c-format

1767 msgid "Server version is %.*s"

1768 msgstr "Serverversionen är %.*s"

1769

1765 -#: fetch-pack.c:934

1770 +#: fetch-pack.c:936

1771 msgid "Server does not support --shallow-since"

1772 msgstr "Servern stöder inte --shallow-since"

1773

1769 -#: fetch-pack.c:938

1774 +#: fetch-pack.c:940

1775 msgid "Server does not support --shallow-exclude"

1776 msgstr "Servern stöder inte --shallow-exclude"

1777

1773 -#: fetch-pack.c:940

1778 +#: fetch-pack.c:942

1779 msgid "Server does not support --deepen"

1780 msgstr "Servern stöder inte --deepen"

1781

1777 -#: fetch-pack.c:951

1782 +#: fetch-pack.c:953

1783 msgid "no common commits"

1784 msgstr "inga gemensamma incheckningar"

1785

1781 -#: fetch-pack.c:963

1786 +#: fetch-pack.c:965

1787 msgid "git fetch-pack: fetch failed."

1788 msgstr "git fetch-patch: hämtning misslyckades."

1789

1785 -#: fetch-pack.c:1125

1790 +#: fetch-pack.c:1127

1791 msgid "no matching remote head"

1792 msgstr "inget motsvarande fjärrhuvud"

1793

1789 -#: fetch-pack.c:1147

1794 +#: fetch-pack.c:1149

1795 #, c-format

1796 msgid "no such remote ref %s"

1797 msgstr "ingen sådan fjärreferens: %s"

1798

1794 -#: fetch-pack.c:1150

1799 +#: fetch-pack.c:1152

1800 #, c-format

1801 msgid "Server does not allow request for unadvertised object %s"

1802 msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"

@@ -1981,7 +1986,7 @@ msgstr "kunde inte skapa \"%s.lock\": %s"

1986 msgid "failed to read the cache"

1987 msgstr "misslyckades läsa cachen"

1988

1984 -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393

1989 +#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393

1990 #: builtin/checkout.c:607 builtin/clone.c:749

1991 msgid "unable to write new index file"

1992 msgstr "kunde inte skriva ny indexfil"

@@ -2315,7 +2320,7 @@ msgstr "-TAL"

2320 msgid "malformed object name '%s'"

2321 msgstr "felformat objektnamn \"%s\""

2322

2318 -#: path.c:805

2323 +#: path.c:810

2324 #, c-format

2325 msgid "Could not make %s writable by group"

2326 msgstr "Kunde inte göra %s skrivbar för gruppen"

@@ -2411,7 +2416,7 @@ msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"

2416 msgid "unable to parse --pretty format"

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

2418

2414 -#: read-cache.c:1307

2419 +#: read-cache.c:1442

2420 #, c-format

2421 msgid ""

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

@@ -2420,7 +2425,7 @@ msgstr ""

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

2426 "Använder version %i"

2427

2423 -#: read-cache.c:1317

2428 +#: read-cache.c:1452

2429 #, c-format

2430 msgid ""

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

@@ -2429,42 +2434,41 @@ msgstr ""

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

2435 "Använder version %i"

2436

2432 -#: read-cache.c:2232

2433 -#, c-format

2434 -msgid "could not stat '%s"

2435 -msgstr "kunde inte ta status på \"%s\""

2436 -

2437 -#: read-cache.c:2232

2437 +#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048

2438 #, c-format

2439 msgid "could not stat '%s'"

2440 msgstr "kunde inte ta status på \"%s\""

2441

2442 -#: read-cache.c:2245

2442 +#: read-cache.c:2388

2443 #, c-format

2444 msgid "unable to open git dir: %s"

2445 msgstr "kunde inte öppna git-katalog: %s"

2446

2447 -#: read-cache.c:2257

2447 +#: read-cache.c:2400

2448 #, c-format

2449 msgid "unable to unlink: %s"

2450 msgstr "misslyckades ta bort länken: %s"

2451

2452 -#: refs.c:619 builtin/merge.c:844

2452 +#: refs.c:620 builtin/merge.c:844

2453 #, c-format

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

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

2456

2457 -#: refs/files-backend.c:2531

2457 +#: refs.c:1667

2458 +msgid "ref updates forbidden inside quarantine environment"

2459 +msgstr "referensuppdateringar förbjudna i karantänmiljö"

2460 +

2461 +#: refs/files-backend.c:1631

2462 #, c-format

2463 msgid "could not delete reference %s: %s"

2464 msgstr "kunde inte ta bort referensen %s: %s"

2465

2462 -#: refs/files-backend.c:2534

2466 +#: refs/files-backend.c:1634

2467 #, c-format

2468 msgid "could not delete references: %s"

2469 msgstr "kunde inte ta bort referenser: %s"

2470

2467 -#: refs/files-backend.c:2543

2471 +#: refs/files-backend.c:1643

2472 #, c-format

2473 msgid "could not remove reference %s"

2474 msgstr "kunde inte ta bort referensen %s"

@@ -2906,12 +2910,12 @@ msgstr ""

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

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

2912

2909 -#: sequencer.c:294 sequencer.c:1675

2913 +#: sequencer.c:294 sequencer.c:1682

2914 #, c-format

2915 msgid "could not lock '%s'"

2916 msgstr "kunde inte låsa \"%s\""

2917

2914 -#: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694

2918 +#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701

2919 #, c-format

2920 msgid "could not write to '%s'"

2921 msgstr "kunde inte skriva till \"%s\""

@@ -2921,12 +2925,12 @@ msgstr "kunde inte skriva till \"%s\""

2925 msgid "could not write eol to '%s'"

2926 msgstr "kunde inte skriva radslut till \"%s\""

2927

2924 -#: sequencer.c:305 sequencer.c:1558 sequencer.c:1682

2928 +#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689

2929 #, c-format

2930 msgid "failed to finalize '%s'."

2931 msgstr "misslyckades färdigställa \"%s\"."

2932

2929 -#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259

2933 +#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257

2934 #: builtin/commit.c:749 builtin/merge.c:1018

2935 #, c-format

2936 msgid "could not read '%s'"

@@ -3100,7 +3104,7 @@ msgstr "kan inte hämta incheckningsmeddelande för %s"

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

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

3106

3103 -#: sequencer.c:1071 sequencer.c:1820

3107 +#: sequencer.c:1071 sequencer.c:1827

3108 #, c-format

3109 msgid "could not rename '%s' to '%s'"

3110 msgstr "kunde inte byta namn på \"%s\" till \"%s\""

@@ -3129,125 +3133,125 @@ msgstr "git %s: misslyckades läsa indexet"

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

3134 msgstr "git %s: misslyckades uppdatera indexet"

3135

3132 -#: sequencer.c:1302

3136 +#: sequencer.c:1303

3137 #, c-format

3138 msgid "invalid line %d: %.*s"

3139 msgstr "ogiltig rad %d: %.*s"

3140

3137 -#: sequencer.c:1310

3141 +#: sequencer.c:1311

3142 #, c-format

3143 msgid "cannot '%s' without a previous commit"

3144 msgstr "Kan inte utföra \"%s\" utan en föregående incheckning"

3145

3142 -#: sequencer.c:1342

3146 +#: sequencer.c:1344

3147 #, c-format

3148 msgid "could not read '%s'."

3149 msgstr "kunde inte läsa \"%s\"."

3150

3147 -#: sequencer.c:1349

3151 +#: sequencer.c:1356

3152 msgid "please fix this using 'git rebase --edit-todo'."

3153 msgstr "rätta det med \"git rebase --edit-todo\"."

3154

3151 -#: sequencer.c:1351

3155 +#: sequencer.c:1358

3156 #, c-format

3157 msgid "unusable instruction sheet: '%s'"

3158 msgstr "oanvändbart manus: %s"

3159

3156 -#: sequencer.c:1356

3160 +#: sequencer.c:1363

3161 msgid "no commits parsed."

3162 msgstr "inga incheckningar lästes."

3163

3160 -#: sequencer.c:1367

3164 +#: sequencer.c:1374

3165 msgid "cannot cherry-pick during a revert."

3166 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."

3167

3164 -#: sequencer.c:1369

3168 +#: sequencer.c:1376

3169 msgid "cannot revert during a cherry-pick."

3170 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."

3171

3168 -#: sequencer.c:1432

3172 +#: sequencer.c:1439

3173 #, c-format

3174 msgid "invalid key: %s"

3175 msgstr "felaktig nyckel: %s"

3176

3173 -#: sequencer.c:1435

3177 +#: sequencer.c:1442

3178 #, c-format

3179 msgid "invalid value for %s: %s"

3180 msgstr "felaktigt värde för %s: %s"

3181

3178 -#: sequencer.c:1492

3182 +#: sequencer.c:1499

3183 #, c-format

3184 msgid "malformed options sheet: '%s'"

3185 msgstr "trasigt manus: %s"

3186

3183 -#: sequencer.c:1530

3187 +#: sequencer.c:1537

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

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

3190

3187 -#: sequencer.c:1531

3191 +#: sequencer.c:1538

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

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

3194

3191 -#: sequencer.c:1534

3195 +#: sequencer.c:1541

3196 #, c-format

3197 msgid "could not create sequencer directory '%s'"

3198 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""

3199

3196 -#: sequencer.c:1548

3200 +#: sequencer.c:1555

3201 msgid "could not lock HEAD"

3202 msgstr "kunde inte låsa HEAD"

3203

3200 -#: sequencer.c:1604 sequencer.c:2159

3204 +#: sequencer.c:1611 sequencer.c:2181

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

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

3207

3204 -#: sequencer.c:1606

3208 +#: sequencer.c:1613

3209 msgid "cannot resolve HEAD"

3210 msgstr "kan inte bestämma HEAD"

3211

3208 -#: sequencer.c:1608 sequencer.c:1642

3212 +#: sequencer.c:1615 sequencer.c:1649

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

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

3215

3212 -#: sequencer.c:1628 builtin/grep.c:910

3216 +#: sequencer.c:1635 builtin/grep.c:910

3217 #, c-format

3218 msgid "cannot open '%s'"

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

3220

3217 -#: sequencer.c:1630

3221 +#: sequencer.c:1637

3222 #, c-format

3223 msgid "cannot read '%s': %s"

3224 msgstr "kan inte läsa \"%s\": %s"

3225

3222 -#: sequencer.c:1631

3226 +#: sequencer.c:1638

3227 msgid "unexpected end of file"

3228 msgstr "oväntat filslut"

3229

3226 -#: sequencer.c:1637

3230 +#: sequencer.c:1644

3231 #, c-format

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

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

3234

3231 -#: sequencer.c:1648

3235 +#: sequencer.c:1655

3236 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3237 msgstr ""

3238 "Du verkar ha flyttat HEAD.\n"

3239 "Spolar inte tillbaka, kontrollera HEAD!"

3240

3237 -#: sequencer.c:1785 sequencer.c:2058

3241 +#: sequencer.c:1792 sequencer.c:2080

3242 msgid "cannot read HEAD"

3243 msgstr "kan inte läsa HEAD"

3244

3241 -#: sequencer.c:1825 builtin/difftool.c:616

3245 +#: sequencer.c:1832 builtin/difftool.c:616

3246 #, c-format

3247 msgid "could not copy '%s' to '%s'"

3248 msgstr "kunde inte kopiera in \"%s\" till \"%s\""

3249

3246 -#: sequencer.c:1841

3250 +#: sequencer.c:1848

3251 msgid "could not read index"

3252 msgstr "Kunde inte läsa indexet"

3253

3250 -#: sequencer.c:1846

3254 +#: sequencer.c:1853

3255 #, c-format

3256 msgid ""

3257 "execution failed: %s\n"

@@ -3262,11 +3266,11 @@ msgstr ""

3266 "\tgit rebase --continue\n"

3267 "\n"

3268

3265 -#: sequencer.c:1852

3269 +#: sequencer.c:1859

3270 msgid "and made changes to the index and/or the working tree\n"

3271 msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"

3272

3269 -#: sequencer.c:1858

3273 +#: sequencer.c:1865

3274 #, c-format

3275 msgid ""

3276 "execution succeeded: %s\n"

@@ -3283,17 +3287,17 @@ msgstr ""

3287 "\tgit rebase --continue\n"

3288 "\n"

3289

3286 -#: sequencer.c:1913 git-rebase.sh:168

3290 +#: sequencer.c:1920 git-rebase.sh:169

3291 #, c-format

3292 msgid "Applied autostash."

3293 msgstr "Tillämpade autostash."

3294

3291 -#: sequencer.c:1925

3295 +#: sequencer.c:1932

3296 #, c-format

3297 msgid "cannot store %s"

3298 msgstr "kan inte spara %s"

3299

3296 -#: sequencer.c:1927 git-rebase.sh:172

3300 +#: sequencer.c:1934 git-rebase.sh:173

3301 #, c-format

3302 msgid ""

3303 "Applying autostash resulted in conflicts.\n"

@@ -3304,57 +3308,57 @@ msgstr ""

3308 "Dina ändringar är säkra i stashen.\n"

3309 "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"

3310

3307 -#: sequencer.c:2009

3311 +#: sequencer.c:2016

3312 #, c-format

3313 msgid "Stopped at %s... %.*s\n"

3314 msgstr "Stoppade på %s... %.*s\n"

3315

3312 -#: sequencer.c:2036

3316 +#: sequencer.c:2058

3317 #, c-format

3318 msgid "unknown command %d"

3319 msgstr "okänt kommando %d"

3320

3317 -#: sequencer.c:2066

3321 +#: sequencer.c:2088

3322 msgid "could not read orig-head"

3323 msgstr "Kunde inte läsa orig-head"

3324

3321 -#: sequencer.c:2070

3325 +#: sequencer.c:2092

3326 msgid "could not read 'onto'"

3327 msgstr "kunde inte läsa \"onto\""

3328

3325 -#: sequencer.c:2077

3329 +#: sequencer.c:2099

3330 #, c-format

3331 msgid "could not update %s"

3332 msgstr "kunde inte uppdatera %s"

3333

3330 -#: sequencer.c:2084

3334 +#: sequencer.c:2106

3335 #, c-format

3336 msgid "could not update HEAD to %s"

3337 msgstr "kunde inte uppdatera HEAD till %s"

3338

3335 -#: sequencer.c:2168

3339 +#: sequencer.c:2190

3340 msgid "cannot rebase: You have unstaged changes."

3341 msgstr "kan inte ombasera: Du har oköade ändringar."

3342

3339 -#: sequencer.c:2173

3343 +#: sequencer.c:2195

3344 msgid "could not remove CHERRY_PICK_HEAD"

3345 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"

3346

3343 -#: sequencer.c:2182

3347 +#: sequencer.c:2204

3348 msgid "cannot amend non-existing commit"

3349 msgstr "kan inte lägga till incheckning som inte finns"

3350

3347 -#: sequencer.c:2184

3351 +#: sequencer.c:2206

3352 #, c-format

3353 msgid "invalid file: '%s'"

3354 msgstr "ogiltig fil: \"%s\""

3355

3352 -#: sequencer.c:2186

3356 +#: sequencer.c:2208

3357 #, c-format

3358 msgid "invalid contents: '%s'"

3359 msgstr "ogiltigt innehåll: \"%s\""

3360

3357 -#: sequencer.c:2189

3361 +#: sequencer.c:2211

3362 msgid ""

3363 "\n"

3364 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3364,21 +3368,21 @@ msgstr ""

3368 "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"

3369 "först och kör sedan \"git rebase --continute\" igen."

3370

3367 -#: sequencer.c:2199

3371 +#: sequencer.c:2221

3372 msgid "could not commit staged changes."

3373 msgstr "kunde inte checka in köade ändringar."

3374

3371 -#: sequencer.c:2279

3375 +#: sequencer.c:2301

3376 #, c-format

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

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

3379

3376 -#: sequencer.c:2283

3380 +#: sequencer.c:2305

3381 #, c-format

3382 msgid "%s: bad revision"

3383 msgstr "%s: felaktig revision"

3384

3381 -#: sequencer.c:2316

3385 +#: sequencer.c:2338

3386 msgid "can't revert as initial commit"

3387 msgstr "kan inte ångra som första incheckning"

3388

@@ -3580,7 +3584,7 @@ msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""

3584 msgid "submodule '%s' has dirty index"

3585 msgstr "undermodulen \"%s\" har ett smutsigt index"

3586

3583 -#: submodule.c:1679

3587 +#: submodule.c:1678

3588 #, c-format

3589 msgid ""

3590 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -3588,18 +3592,18 @@ msgstr ""

3592 "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "

3593 "stöds ej"

3594

3591 -#: submodule.c:1691 submodule.c:1747

3595 +#: submodule.c:1690 submodule.c:1746

3596 #, c-format

3597 msgid "could not lookup name for submodule '%s'"

3598 msgstr "kunde inte slå upp namnet för undermodulen \"%s\""

3599

3596 -#: submodule.c:1695 builtin/submodule--helper.c:678

3600 +#: submodule.c:1694 builtin/submodule--helper.c:678

3601 #: builtin/submodule--helper.c:688

3602 #, c-format

3603 msgid "could not create directory '%s'"

3604 msgstr "kunde inte skapa katalogen \"%s\""

3605

3602 -#: submodule.c:1698

3606 +#: submodule.c:1697

3607 #, c-format

3608 msgid ""

3609 "Migrating git directory of '%s%s' from\n"

@@ -3610,20 +3614,20 @@ msgstr ""

3614 "\"%s\" till\n"

3615 "\"%s\"\n"

3616

3613 -#: submodule.c:1782

3617 +#: submodule.c:1781

3618 #, c-format

3619 msgid "could not recurse into submodule '%s'"

3620 msgstr "kunde inte rekursera in i undermodulen \"%s\""

3621

3618 -#: submodule.c:1826

3622 +#: submodule.c:1825

3623 msgid "could not start ls-files in .."

3624 msgstr "kunde inte starta ls-files i .."

3625

3622 -#: submodule.c:1846

3626 +#: submodule.c:1845

3627 msgid "BUG: returned path string doesn't match cwd?"

3628 msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"

3629

3626 -#: submodule.c:1865

3630 +#: submodule.c:1864

3631 #, c-format

3632 msgid "ls-tree returned unexpected return code %d"

3633 msgstr "ls-tree returnerade en oväntad returkod %d"

@@ -4043,8 +4047,8 @@ msgstr "kunde inte öppna \"%s\" för läsning och skrivning"

4047 msgid "could not open '%s' for writing"

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

4049

4046 -#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759

4047 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015

4050 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757

4051 +#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015

4052 #: builtin/pull.c:341

4053 #, c-format

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

@@ -4702,108 +4706,108 @@ msgstr "Kanske menade du att skriva \"git add .\"?\n"

4706 msgid "index file corrupt"

4707 msgstr "indexfilen trasig"

4708

4705 -#: builtin/am.c:414

4709 +#: builtin/am.c:412

4710 msgid "could not parse author script"

4711 msgstr "kunde inte tolka författarskript"

4712

4709 -#: builtin/am.c:491

4713 +#: builtin/am.c:489

4714 #, c-format

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

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

4717

4714 -#: builtin/am.c:532

4718 +#: builtin/am.c:530

4719 #, c-format

4720 msgid "Malformed input line: '%s'."

4721 msgstr "Felaktig indatarad: \"%s\"."

4722

4719 -#: builtin/am.c:569

4723 +#: builtin/am.c:567

4724 #, c-format

4725 msgid "Failed to copy notes from '%s' to '%s'"

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

4727

4724 -#: builtin/am.c:595

4728 +#: builtin/am.c:593

4729 msgid "fseek failed"

4730 msgstr "\"fseek\" misslyckades"

4731

4728 -#: builtin/am.c:775

4732 +#: builtin/am.c:777

4733 #, c-format

4734 msgid "could not parse patch '%s'"

4735 msgstr "kunde inte tolka patchen \"%s\""

4736

4733 -#: builtin/am.c:840

4737 +#: builtin/am.c:842

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

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

4740

4737 -#: builtin/am.c:887

4741 +#: builtin/am.c:889

4742 msgid "invalid timestamp"

4743 msgstr "ogiltig tidsstämpel"

4744

4741 -#: builtin/am.c:890 builtin/am.c:898

4745 +#: builtin/am.c:892 builtin/am.c:900

4746 msgid "invalid Date line"

4747 msgstr "ogiltig \"Date\"-rad"

4748

4745 -#: builtin/am.c:895

4749 +#: builtin/am.c:897

4750 msgid "invalid timezone offset"

4751 msgstr "ogiltig tidszons-offset"

4752

4749 -#: builtin/am.c:984

4753 +#: builtin/am.c:986

4754 msgid "Patch format detection failed."

4755 msgstr "Misslyckades detektera patchformat."

4756

4753 -#: builtin/am.c:989 builtin/clone.c:397

4757 +#: builtin/am.c:991 builtin/clone.c:397

4758 #, c-format

4759 msgid "failed to create directory '%s'"

4760 msgstr "misslyckades skapa katalogen \"%s\""

4761

4758 -#: builtin/am.c:993

4762 +#: builtin/am.c:995

4763 msgid "Failed to split patches."

4764 msgstr "Misslyckades dela patchar."

4765

4762 -#: builtin/am.c:1125 builtin/commit.c:376

4766 +#: builtin/am.c:1127 builtin/commit.c:376

4767 msgid "unable to write index file"

4768 msgstr "kan inte skriva indexfil"

4769

4766 -#: builtin/am.c:1176

4770 +#: builtin/am.c:1178

4771 #, c-format

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

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

4774

4771 -#: builtin/am.c:1177

4775 +#: builtin/am.c:1179

4776 #, c-format

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

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

4779

4776 -#: builtin/am.c:1178

4780 +#: builtin/am.c:1180

4781 #, c-format

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

4783 msgstr ""

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

4785

4782 -#: builtin/am.c:1316

4786 +#: builtin/am.c:1315

4787 msgid "Patch is empty. Was it split wrong?"

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

4789

4786 -#: builtin/am.c:1390 builtin/log.c:1557

4790 +#: builtin/am.c:1386 builtin/log.c:1557

4791 #, c-format

4792 msgid "invalid ident line: %s"

4793 msgstr "ogiltig ident-rad: %s"

4794

4791 -#: builtin/am.c:1417

4795 +#: builtin/am.c:1413

4796 #, c-format

4797 msgid "unable to parse commit %s"

4798 msgstr "kunde inte tolka incheckningen %s"

4799

4796 -#: builtin/am.c:1610

4800 +#: builtin/am.c:1606

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

4802 msgstr ""

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

4804 "vägssammanslagning."

4805

4802 -#: builtin/am.c:1612

4806 +#: builtin/am.c:1608

4807 msgid "Using index info to reconstruct a base tree..."

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

4809

4806 -#: builtin/am.c:1631

4810 +#: builtin/am.c:1627

4811 msgid ""

4812 "Did you hand edit your patch?\n"

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

@@ -4811,39 +4815,39 @@ msgstr ""

4815 "Har du handredigerat din patch?\n"

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

4817

4814 -#: builtin/am.c:1637

4818 +#: builtin/am.c:1633

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

4820 msgstr ""

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

4822

4819 -#: builtin/am.c:1662

4823 +#: builtin/am.c:1658

4824 msgid "Failed to merge in the changes."

4825 msgstr "Misslyckades slå ihop ändringarna."

4826

4823 -#: builtin/am.c:1686 builtin/merge.c:631

4827 +#: builtin/am.c:1682 builtin/merge.c:631

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

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

4830

4827 -#: builtin/am.c:1693

4831 +#: builtin/am.c:1689

4832 msgid "applying to an empty history"

4833 msgstr "tillämpar på en tom historik"

4834

4831 -#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802

4835 +#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802

4836 #: builtin/merge.c:827

4837 msgid "failed to write commit object"

4838 msgstr "kunde inte skriva incheckningsobjekt"

4839

4836 -#: builtin/am.c:1739 builtin/am.c:1743

4840 +#: builtin/am.c:1735 builtin/am.c:1739

4841 #, c-format

4842 msgid "cannot resume: %s does not exist."

4843 msgstr "kan inte återuppta: %s finns inte."

4844

4841 -#: builtin/am.c:1759

4845 +#: builtin/am.c:1755

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

4847 msgstr ""

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

4849

4846 -#: builtin/am.c:1764

4850 +#: builtin/am.c:1760

4851 msgid "Commit Body is:"

4852 msgstr "Incheckningskroppen är:"

4853

@@ -4851,35 +4855,35 @@ msgstr "Incheckningskroppen är:"

4855 #. in your translation. The program will only accept English

4856 #. input at this point.

4857 #.

4854 -#: builtin/am.c:1774

4858 +#: builtin/am.c:1770

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

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

4861

4858 -#: builtin/am.c:1824

4862 +#: builtin/am.c:1820

4863 #, c-format

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

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

4866

4863 -#: builtin/am.c:1861 builtin/am.c:1933

4867 +#: builtin/am.c:1860 builtin/am.c:1932

4868 #, c-format

4869 msgid "Applying: %.*s"

4870 msgstr "Tillämpar: %.*s"

4871

4868 -#: builtin/am.c:1877

4872 +#: builtin/am.c:1876

4873 msgid "No changes -- Patch already applied."

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

4875

4872 -#: builtin/am.c:1885

4876 +#: builtin/am.c:1884

4877 #, c-format

4878 msgid "Patch failed at %s %.*s"

4879 msgstr "Patch misslyckades på %s %.*s"

4880

4877 -#: builtin/am.c:1891

4881 +#: builtin/am.c:1890

4882 #, c-format

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

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

4885

4882 -#: builtin/am.c:1936

4886 +#: builtin/am.c:1935

4887 msgid ""

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

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

@@ -4889,7 +4893,7 @@ msgstr ""

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

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

4895

4892 -#: builtin/am.c:1943

4896 +#: builtin/am.c:1942

4897 msgid ""

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

4899 "Did you forget to use 'git add'?"

@@ -4897,17 +4901,17 @@ msgstr ""

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

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

4903

4900 -#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308

4904 +#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308

4905 #: builtin/reset.c:316

4906 #, c-format

4907 msgid "Could not parse object '%s'."

4908 msgstr "Kan inte tolka objektet \"%s\""

4909

4906 -#: builtin/am.c:2103

4910 +#: builtin/am.c:2102

4911 msgid "failed to clean index"

4912 msgstr "misslyckades städa upp indexet"

4913

4910 -#: builtin/am.c:2137

4914 +#: builtin/am.c:2136

4915 msgid ""

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

4917 "Not rewinding to ORIG_HEAD"

@@ -4915,75 +4919,75 @@ msgstr ""

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

4920 "Återställer inte till ORIG_HEAD"

4921

4918 -#: builtin/am.c:2200

4922 +#: builtin/am.c:2199

4923 #, c-format

4924 msgid "Invalid value for --patch-format: %s"

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

4926

4923 -#: builtin/am.c:2233

4927 +#: builtin/am.c:2232

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

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

4930

4927 -#: builtin/am.c:2234

4931 +#: builtin/am.c:2233

4932 msgid "git am [<options>] (--continue | --skip | --abort)"

4933 msgstr "git am [<flaggor>] (--continue | --skip | --abort)"

4934

4931 -#: builtin/am.c:2240

4935 +#: builtin/am.c:2239

4936 msgid "run interactively"

4937 msgstr "kör interaktivt"

4938

4935 -#: builtin/am.c:2242

4939 +#: builtin/am.c:2241

4940 msgid "historical option -- no-op"

4941 msgstr "historisk flagga -- no-op"

4942

4939 -#: builtin/am.c:2244

4943 +#: builtin/am.c:2243

4944 msgid "allow fall back on 3way merging if needed"

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

4946

4943 -#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57

4947 +#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57

4948 #: builtin/repack.c:178

4949 msgid "be quiet"

4950 msgstr "var tyst"

4951

4948 -#: builtin/am.c:2247

4952 +#: builtin/am.c:2246

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

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

4955

4952 -#: builtin/am.c:2250

4956 +#: builtin/am.c:2249

4957 msgid "recode into utf8 (default)"

4958 msgstr "koda om till utf8 (standard)"

4959

4956 -#: builtin/am.c:2252

4960 +#: builtin/am.c:2251

4961 msgid "pass -k flag to git-mailinfo"

4962 msgstr "sänd flaggan -k till git-mailinfo"

4963

4960 -#: builtin/am.c:2254

4964 +#: builtin/am.c:2253

4965 msgid "pass -b flag to git-mailinfo"

4966 msgstr "sänd flaggan -b till git-mailinfo"

4967

4964 -#: builtin/am.c:2256

4968 +#: builtin/am.c:2255

4969 msgid "pass -m flag to git-mailinfo"

4970 msgstr "sänd flaggan -m till git-mailinfo"

4971

4968 -#: builtin/am.c:2258

4972 +#: builtin/am.c:2257

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

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

4975

4972 -#: builtin/am.c:2261

4976 +#: builtin/am.c:2260

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

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

4979

4976 -#: builtin/am.c:2264

4980 +#: builtin/am.c:2263

4981 msgid "strip everything before a scissors line"

4982 msgstr "ta bort allting före en saxlinje"

4983

4980 -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275

4981 -#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287

4982 -#: builtin/am.c:2293

4984 +#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274

4985 +#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286

4986 +#: builtin/am.c:2292

4987 msgid "pass it through git-apply"

4988 msgstr "sänd det genom git-apply"

4989

4986 -#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665

4990 +#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665

4991 #: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135

4992 #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191

4993 #: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398

@@ -4991,57 +4995,57 @@ msgstr "sänd det genom git-apply"

4995 msgid "n"

4996 msgstr "n"

4997

4994 -#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37

4995 -#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38

4998 +#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37

4999 +#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38

5000 msgid "format"

5001 msgstr "format"

5002

4999 -#: builtin/am.c:2290

5003 +#: builtin/am.c:2289

5004 msgid "format the patch(es) are in"

5005 msgstr "format för patch(ar)"

5006

5003 -#: builtin/am.c:2296

5007 +#: builtin/am.c:2295

5008 msgid "override error message when patch failure occurs"

5009 msgstr "överstyr felmeddelanden när patchfel uppstår"

5010

5007 -#: builtin/am.c:2298

5011 +#: builtin/am.c:2297

5012 msgid "continue applying patches after resolving a conflict"

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

5014

5011 -#: builtin/am.c:2301

5015 +#: builtin/am.c:2300

5016 msgid "synonyms for --continue"

5017 msgstr "synonymer till --continue"

5018

5015 -#: builtin/am.c:2304

5019 +#: builtin/am.c:2303

5020 msgid "skip the current patch"

5021 msgstr "hoppa över den aktuella grenen"

5022

5019 -#: builtin/am.c:2307

5023 +#: builtin/am.c:2306

5024 msgid "restore the original branch and abort the patching operation."

5025 msgstr "återställ originalgrenen och avbryt patchningen."

5026

5023 -#: builtin/am.c:2311

5027 +#: builtin/am.c:2310

5028 msgid "lie about committer date"

5029 msgstr "ljug om incheckningsdatum"

5030

5027 -#: builtin/am.c:2313

5031 +#: builtin/am.c:2312

5032 msgid "use current timestamp for author date"

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

5034

5031 -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232

5035 +#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232

5036 #: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413

5037 msgid "key-id"

5038 msgstr "nyckel-id"

5039

5036 -#: builtin/am.c:2316

5040 +#: builtin/am.c:2315

5041 msgid "GPG-sign commits"

5042 msgstr "GPG-signera incheckningar"

5043

5040 -#: builtin/am.c:2319

5044 +#: builtin/am.c:2318

5045 msgid "(internal use for git-rebase)"

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

5047

5044 -#: builtin/am.c:2334

5048 +#: builtin/am.c:2333

5049 msgid ""

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

5051 "it will be removed. Please do not use it anymore."

@@ -5049,16 +5053,16 @@ msgstr ""

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

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

5055

5052 -#: builtin/am.c:2341

5056 +#: builtin/am.c:2340

5057 msgid "failed to read the index"

5058 msgstr "misslyckades läsa indexet"

5059

5056 -#: builtin/am.c:2356

5060 +#: builtin/am.c:2355

5061 #, c-format

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

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

5064

5061 -#: builtin/am.c:2380

5065 +#: builtin/am.c:2379

5066 #, c-format

5067 msgid ""

5068 "Stray %s directory found.\n"

@@ -5067,7 +5071,7 @@ msgstr ""

5071 "Kvarbliven katalog %s hittades.\n"

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

5073

5070 -#: builtin/am.c:2386

5074 +#: builtin/am.c:2385

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

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

5077

@@ -5097,11 +5101,6 @@ msgstr "git archive: förväntade ACK/NAK, fick EOF"

5101 msgid "git archive: NACK %s"

5102 msgstr "git archive: NACK %s"

5103

5100 -#: builtin/archive.c:63

5101 -#, c-format

5102 -msgid "remote error: %s"

5103 -msgstr "fjärrfel: %s"

5104 -

5104 #: builtin/archive.c:64

5105 msgid "git archive: protocol error"

5106 msgstr "git archive: protokollfel"

@@ -5782,7 +5781,7 @@ msgstr "läs filnamn från standard in"

5781 msgid "terminate input and output records by a NUL character"

5782 msgstr "avsluta in- och utdataposter med NUL-tecken"

5783

5785 -#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352

5784 +#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356

5785 msgid "suppress progress reporting"

5786 msgstr "undertryck förloppsrapportering"

5787

@@ -5874,7 +5873,7 @@ msgstr "skriv innehåll till temporära filer"

5873 #: builtin/checkout-index.c:174 builtin/column.c:30

5874 #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638

5875 #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980

5877 -#: builtin/worktree.c:472

5876 +#: builtin/worktree.c:477

5877 msgid "string"

5878 msgstr "sträng"

5879

@@ -6090,8 +6089,8 @@ msgid "Cannot switch branch to a non-commit '%s'"

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

6090

6091 #: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111

6093 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325

6094 -#: builtin/worktree.c:327

6092 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329

6093 +#: builtin/worktree.c:331

6094 msgid "branch"

6095 msgstr "gren"

6096

@@ -6107,7 +6106,7 @@ msgstr "skapa/nollställ och checka ut en gren"

6106 msgid "create reflog for new branch"

6107 msgstr "skapa reflogg för ny gren"

6108

6110 -#: builtin/checkout.c:1164 builtin/worktree.c:329

6109 +#: builtin/checkout.c:1164 builtin/worktree.c:333

6110 msgid "detach HEAD at named commit"

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

6112

@@ -6358,7 +6357,7 @@ msgid "remove whole directories"

6357 msgstr "ta bort hela kataloger"

6358

6359 #: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451

6361 -#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348

6360 +#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348

6361 #: builtin/name-rev.c:350 builtin/show-ref.c:176

6362 msgid "pattern"

6363 msgstr "mönster"

@@ -6614,7 +6613,7 @@ msgstr "kan inte packa om för att städa upp"

6613 msgid "cannot unlink temporary alternates file"

6614 msgstr "kunde inte ta bort temporär \"alternates\"-fil"

6615

6617 -#: builtin/clone.c:884 builtin/receive-pack.c:1901

6616 +#: builtin/clone.c:884 builtin/receive-pack.c:1900

6617 msgid "Too many arguments."

6618 msgstr "För många argument."

6619

@@ -6652,7 +6651,7 @@ msgid "working tree '%s' already exists."

6651 msgstr "arbetsträdet \"%s\" finns redan."

6652

6653 #: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252

6655 -#: builtin/worktree.c:222 builtin/worktree.c:249

6654 +#: builtin/worktree.c:221 builtin/worktree.c:251

6655 #, c-format

6656 msgid "could not create leading directories of '%s'"

6657 msgstr "kunde inte skapa inledande kataloger för \"%s\""

@@ -7104,7 +7103,7 @@ msgid "version"

7103 msgstr "version"

7104

7105 #: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525

7107 -#: builtin/worktree.c:443

7106 +#: builtin/worktree.c:448

7107 msgid "machine-readable output"

7108 msgstr "maskinläsbar utdata"

7109

@@ -7185,7 +7184,7 @@ msgstr "författare"

7184 msgid "override author for commit"

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

7186

7188 -#: builtin/commit.c:1588 builtin/gc.c:353

7187 +#: builtin/commit.c:1588 builtin/gc.c:357

7188 msgid "date"

7189 msgstr "datum"

7190

@@ -7350,139 +7349,139 @@ msgstr ""

7349 msgid "git config [<options>]"

7350 msgstr "git config [<flaggor>]"

7351

7353 -#: builtin/config.c:55

7352 +#: builtin/config.c:56

7353 msgid "Config file location"

7354 msgstr "Konfigurationsfilens plats"

7355

7357 -#: builtin/config.c:56

7356 +#: builtin/config.c:57

7357 msgid "use global config file"

7358 msgstr "använd global konfigurationsfil"

7359

7361 -#: builtin/config.c:57

7360 +#: builtin/config.c:58

7361 msgid "use system config file"

7362 msgstr "använd systemets konfigurationsfil"

7363

7365 -#: builtin/config.c:58

7364 +#: builtin/config.c:59

7365 msgid "use repository config file"

7366 msgstr "använd arkivets konfigurationsfil"

7367

7369 -#: builtin/config.c:59

7368 +#: builtin/config.c:60

7369 msgid "use given config file"

7370 msgstr "använd angiven konfigurationsfil"

7371

7373 -#: builtin/config.c:60

7372 +#: builtin/config.c:61

7373 msgid "blob-id"

7374 msgstr "blob-id"

7375

7377 -#: builtin/config.c:60

7376 +#: builtin/config.c:61

7377 msgid "read config from given blob object"

7378 msgstr "läs konfiguration från givet blob-objekt"

7379

7381 -#: builtin/config.c:61

7380 +#: builtin/config.c:62

7381 msgid "Action"

7382 msgstr "Åtgärd"

7383

7385 -#: builtin/config.c:62

7384 +#: builtin/config.c:63

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

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

7387

7389 -#: builtin/config.c:63

7388 +#: builtin/config.c:64

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

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

7391

7393 -#: builtin/config.c:64

7392 +#: builtin/config.c:65

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

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

7395

7397 -#: builtin/config.c:65

7396 +#: builtin/config.c:66

7397 msgid "get value specific for the URL: section[.var] URL"

7398 msgstr "hämta värde specifikt URL:en: sektion[.var] URL"

7399

7401 -#: builtin/config.c:66

7400 +#: builtin/config.c:67

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

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

7403

7405 -#: builtin/config.c:67

7404 +#: builtin/config.c:68

7405 msgid "add a new variable: name value"

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

7407

7409 -#: builtin/config.c:68

7408 +#: builtin/config.c:69

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

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

7411

7413 -#: builtin/config.c:69

7412 +#: builtin/config.c:70

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

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

7415

7417 -#: builtin/config.c:70

7416 +#: builtin/config.c:71

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

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

7419

7421 -#: builtin/config.c:71

7420 +#: builtin/config.c:72

7421 msgid "remove a section: name"

7422 msgstr "ta bort en sektion: namn"

7423

7425 -#: builtin/config.c:72

7424 +#: builtin/config.c:73

7425 msgid "list all"

7426 msgstr "visa alla"

7427

7429 -#: builtin/config.c:73

7428 +#: builtin/config.c:74

7429 msgid "open an editor"

7430 msgstr "öppna textredigeringsprogram"

7431

7433 -#: builtin/config.c:74

7432 +#: builtin/config.c:75

7433 msgid "find the color configured: slot [default]"

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

7435

7437 -#: builtin/config.c:75

7436 +#: builtin/config.c:76

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

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

7439

7441 -#: builtin/config.c:76

7440 +#: builtin/config.c:77

7441 msgid "Type"

7442 msgstr "Typ"

7443

7445 -#: builtin/config.c:77

7444 +#: builtin/config.c:78

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

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

7447

7449 -#: builtin/config.c:78

7448 +#: builtin/config.c:79

7449 msgid "value is decimal number"

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

7451

7453 -#: builtin/config.c:79

7452 +#: builtin/config.c:80

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

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

7455

7457 -#: builtin/config.c:80

7456 +#: builtin/config.c:81

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

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

7459

7461 -#: builtin/config.c:81

7460 +#: builtin/config.c:82

7461 msgid "Other"

7462 msgstr "Andra"

7463

7465 -#: builtin/config.c:82

7464 +#: builtin/config.c:83

7465 msgid "terminate values with NUL byte"

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

7467

7469 -#: builtin/config.c:83

7468 +#: builtin/config.c:84

7469 msgid "show variable names only"

7470 msgstr "visa endast variabelnamn"

7471

7473 -#: builtin/config.c:84

7472 +#: builtin/config.c:85

7473 msgid "respect include directives on lookup"

7474 msgstr "respektera inkluderingsdirektiv vid uppslag"

7475

7477 -#: builtin/config.c:85

7476 +#: builtin/config.c:86

7477 msgid "show origin of config (file, standard input, blob, command line)"

7478 msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"

7479

7481 -#: builtin/config.c:327

7480 +#: builtin/config.c:328

7481 msgid "unable to parse default color value"

7482 msgstr "kan inte tolka standardfärgvärde"

7483

7485 -#: builtin/config.c:471

7484 +#: builtin/config.c:472

7485 #, c-format

7486 msgid ""

7487 "# This is Git's per-user configuration file.\n"

@@ -7497,12 +7496,12 @@ msgstr ""

7496 "#\tname = %s\n"

7497 "#\temail = %s\n"

7498

7500 -#: builtin/config.c:611

7499 +#: builtin/config.c:615

7500 #, c-format

7501 msgid "cannot create configuration file %s"

7502 msgstr "kan inte skapa konfigurationsfilen \"%s\""

7503

7505 -#: builtin/config.c:623

7504 +#: builtin/config.c:627

7505 #, c-format

7506 msgid ""

7507 "cannot overwrite multiple values with a single value\n"

@@ -8297,12 +8296,12 @@ msgstr "git gc [<flaggor>]"

8296 msgid "Failed to fstat %s: %s"

8297 msgstr "Misslyckades ta status (fstat) på %s: %s"

8298

8300 -#: builtin/gc.c:306

8299 +#: builtin/gc.c:310

8300 #, c-format

8301 msgid "Can't stat %s"

8302 msgstr "Kan inte ta status på %s"

8303

8305 -#: builtin/gc.c:315

8304 +#: builtin/gc.c:319

8305 #, c-format

8306 msgid ""

8307 "The last gc run reported the following. Please correct the root cause\n"

@@ -8317,43 +8316,43 @@ msgstr ""

8316 "\n"

8317 "%s"

8318

8320 -#: builtin/gc.c:354

8319 +#: builtin/gc.c:358

8320 msgid "prune unreferenced objects"

8321 msgstr "rensa ej refererade objekt"

8322

8324 -#: builtin/gc.c:356

8323 +#: builtin/gc.c:360

8324 msgid "be more thorough (increased runtime)"

8325 msgstr "var mer grundlig (ökar körtiden)"

8326

8328 -#: builtin/gc.c:357

8327 +#: builtin/gc.c:361

8328 msgid "enable auto-gc mode"

8329 msgstr "aktivera auto-gc-läge"

8330

8332 -#: builtin/gc.c:358

8331 +#: builtin/gc.c:362

8332 msgid "force running gc even if there may be another gc running"

8333 msgstr "tvinga gc-körning även om en annan gc kanske körs"

8334

8336 -#: builtin/gc.c:375

8335 +#: builtin/gc.c:379

8336 #, c-format

8337 msgid "Failed to parse gc.logexpiry value %s"

8338 msgstr "Kan inte tolka värdet %s för gc.logexpiry"

8339

8341 -#: builtin/gc.c:403

8340 +#: builtin/gc.c:407

8341 #, c-format

8342 msgid "Auto packing the repository in background for optimum performance.\n"

8343 msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"

8344

8346 -#: builtin/gc.c:405

8345 +#: builtin/gc.c:409

8346 #, c-format

8347 msgid "Auto packing the repository for optimum performance.\n"

8348 msgstr "Packar arkivet automatiskt för optimal prestanda.\n"

8349

8351 -#: builtin/gc.c:406

8350 +#: builtin/gc.c:410

8351 #, c-format

8352 msgid "See \"git help gc\" for manual housekeeping.\n"

8353 msgstr "Se \"git help gc\" för manuell hushållning.\n"

8354

8356 -#: builtin/gc.c:427

8355 +#: builtin/gc.c:431

8356 #, c-format

8357 msgid ""

8358 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

@@ -8361,7 +8360,7 @@ msgstr ""

8360 "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "

8361 "är fallet)"

8362

8364 -#: builtin/gc.c:471

8363 +#: builtin/gc.c:475

8364 msgid ""

8365 "There are too many unreachable loose objects; run 'git prune' to remove them."

8366 msgstr ""

@@ -9559,103 +9558,103 @@ msgid ""

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

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

9560

9562 -#: builtin/ls-files.c:461

9561 +#: builtin/ls-files.c:468

9562 msgid "git ls-files [<options>] [<file>...]"

9563 msgstr "git ls-files [<flaggor>] [<fil>...]"

9564

9566 -#: builtin/ls-files.c:510

9565 +#: builtin/ls-files.c:517

9566 msgid "identify the file status with tags"

9567 msgstr "identifiera filstatus med taggar"

9568

9570 -#: builtin/ls-files.c:512

9569 +#: builtin/ls-files.c:519

9570 msgid "use lowercase letters for 'assume unchanged' files"

9571 msgstr "använd små bokstäver för \"anta oförändrade\"-filer"

9572

9574 -#: builtin/ls-files.c:514

9573 +#: builtin/ls-files.c:521

9574 msgid "show cached files in the output (default)"

9575 msgstr "visa cachade filer i utdata (standard)"

9576

9578 -#: builtin/ls-files.c:516

9577 +#: builtin/ls-files.c:523

9578 msgid "show deleted files in the output"

9579 msgstr "visa borttagna filer i utdata"

9580

9582 -#: builtin/ls-files.c:518

9581 +#: builtin/ls-files.c:525

9582 msgid "show modified files in the output"

9583 msgstr "visa modifierade filer i utdata"

9584

9586 -#: builtin/ls-files.c:520

9585 +#: builtin/ls-files.c:527

9586 msgid "show other files in the output"

9587 msgstr "visa andra filer i utdata"

9588

9590 -#: builtin/ls-files.c:522

9589 +#: builtin/ls-files.c:529

9590 msgid "show ignored files in the output"

9591 msgstr "visa ignorerade filer i utdata"

9592

9594 -#: builtin/ls-files.c:525

9593 +#: builtin/ls-files.c:532

9594 msgid "show staged contents' object name in the output"

9595 msgstr "visa köat innehålls objektnamn i utdata"

9596

9598 -#: builtin/ls-files.c:527

9597 +#: builtin/ls-files.c:534

9598 msgid "show files on the filesystem that need to be removed"

9599 msgstr "visa filer i filsystemet som behöver tas bort"

9600

9602 -#: builtin/ls-files.c:529

9601 +#: builtin/ls-files.c:536

9602 msgid "show 'other' directories' names only"

9603 msgstr "visa endast namn för \"andra\" kataloger"

9604

9606 -#: builtin/ls-files.c:531

9605 +#: builtin/ls-files.c:538

9606 msgid "show line endings of files"

9607 msgstr "visa radslut i filer"

9608

9610 -#: builtin/ls-files.c:533

9609 +#: builtin/ls-files.c:540

9610 msgid "don't show empty directories"

9611 msgstr "visa inte tomma kataloger"

9612

9614 -#: builtin/ls-files.c:536

9613 +#: builtin/ls-files.c:543

9614 msgid "show unmerged files in the output"

9615 msgstr "visa ej sammanslagna filer i utdata"

9616

9618 -#: builtin/ls-files.c:538

9617 +#: builtin/ls-files.c:545

9618 msgid "show resolve-undo information"

9619 msgstr "visa \"resolve-undo\"-information"

9620

9622 -#: builtin/ls-files.c:540

9621 +#: builtin/ls-files.c:547

9622 msgid "skip files matching pattern"

9623 msgstr "hoppa över filer som motsvarar mönster"

9624

9626 -#: builtin/ls-files.c:543

9625 +#: builtin/ls-files.c:550

9626 msgid "exclude patterns are read from <file>"

9627 msgstr "exkludera mönster som läses från <fil>"

9628

9630 -#: builtin/ls-files.c:546

9629 +#: builtin/ls-files.c:553

9630 msgid "read additional per-directory exclude patterns in <file>"

9631 msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"

9632

9634 -#: builtin/ls-files.c:548

9633 +#: builtin/ls-files.c:555

9634 msgid "add the standard git exclusions"

9635 msgstr "lägg till git:s standardexkluderingar"

9636

9638 -#: builtin/ls-files.c:551

9637 +#: builtin/ls-files.c:558

9638 msgid "make the output relative to the project top directory"

9639 msgstr "gör utdata relativ till projektets toppkatalog"

9640

9642 -#: builtin/ls-files.c:554

9641 +#: builtin/ls-files.c:561

9642 msgid "recurse through submodules"

9643 msgstr "rekursera ner i undermoduler"

9644

9646 -#: builtin/ls-files.c:556

9645 +#: builtin/ls-files.c:563

9646 msgid "if any <file> is not in the index, treat this as an error"

9647 msgstr "om en <fil> inte är indexet, betrakta det som ett fel"

9648

9650 -#: builtin/ls-files.c:557

9649 +#: builtin/ls-files.c:564

9650 msgid "tree-ish"

9651 msgstr "träd-igt"

9652

9654 -#: builtin/ls-files.c:558

9653 +#: builtin/ls-files.c:565

9654 msgid "pretend that paths removed since <tree-ish> are still present"

9655 msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"

9656

9658 -#: builtin/ls-files.c:560

9657 +#: builtin/ls-files.c:567

9658 msgid "show debugging data"

9659 msgstr "visa felsökningsutdata"

9660

@@ -11117,7 +11116,7 @@ msgstr "Se git-pull(1) för detaljer."

11116 msgid "<remote>"

11117 msgstr "<fjärr>"

11118

11120 -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455

11119 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456

11120 #: git-parse-remote.sh:65

11121 msgid "<branch>"

11122 msgstr "<gren>"

@@ -11583,7 +11582,7 @@ msgstr "avbryt ombasering"

11582 msgid "git receive-pack <git-dir>"

11583 msgstr "git receive-pack <git-katalog>"

11584

11586 -#: builtin/receive-pack.c:796

11585 +#: builtin/receive-pack.c:795

11586 msgid ""

11587 "By default, updating the current branch in a non-bare repository\n"

11588 "is denied, because it will make the index and work tree inconsistent\n"

@@ -11613,7 +11612,7 @@ msgstr ""

11612 "För att undvika detta meddelande och fortfarande behålla det\n"

11613 "normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"."

11614

11616 -#: builtin/receive-pack.c:816

11615 +#: builtin/receive-pack.c:815

11616 msgid ""

11617 "By default, deleting the current branch is denied, because the next\n"

11618 "'git clone' won't result in any file checked out, causing confusion.\n"

@@ -11634,11 +11633,11 @@ msgstr ""

11633 "\n"

11634 "För att undvika detta meddelande kan du sätta det till \"refuse\"."

11635

11637 -#: builtin/receive-pack.c:1889

11636 +#: builtin/receive-pack.c:1888

11637 msgid "quiet"

11638 msgstr "tyst"

11639

11641 -#: builtin/receive-pack.c:1903

11640 +#: builtin/receive-pack.c:1902

11641 msgid "You must specify a directory."

11642 msgstr "Du måste ange en katalog."

11643

@@ -12269,22 +12268,22 @@ msgstr "git replace -d <objekt>..."

12268 msgid "git replace [--format=<format>] [-l [<pattern>]]"

12269 msgstr "git replace [--format=<format>] [-l [<mönster>]]"

12270

12272 -#: builtin/replace.c:329 builtin/replace.c:367 builtin/replace.c:395

12271 +#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396

12272 #, c-format

12273 msgid "Not a valid object name: '%s'"

12274 msgstr "Objektnamnet är inte giltigt: \"%s\""

12275

12277 -#: builtin/replace.c:359

12276 +#: builtin/replace.c:360

12277 #, c-format

12278 msgid "bad mergetag in commit '%s'"

12279 msgstr "felaktig sammanslagningstagg i incheckningen \"%s\""

12280

12282 -#: builtin/replace.c:361

12281 +#: builtin/replace.c:362

12282 #, c-format

12283 msgid "malformed mergetag in commit '%s'"

12284 msgstr "felformad sammanslagningstagg i incheckningen \"%s\""

12285

12287 -#: builtin/replace.c:372

12286 +#: builtin/replace.c:373

12287 #, c-format

12288 msgid ""

12289 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "

@@ -12293,45 +12292,45 @@ msgstr ""

12292 "den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s"

12293 "\" som har förkastats; använd --edit istället för --graft"

12294

12296 -#: builtin/replace.c:405

12295 +#: builtin/replace.c:406

12296 #, c-format

12297 msgid "the original commit '%s' has a gpg signature."

12298 msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur."

12299

12301 -#: builtin/replace.c:406

12300 +#: builtin/replace.c:407

12301 msgid "the signature will be removed in the replacement commit!"

12302 msgstr "signaturen kommer att tas bort i ersättningsincheckningen!"

12303

12305 -#: builtin/replace.c:412

12304 +#: builtin/replace.c:413

12305 #, c-format

12306 msgid "could not write replacement commit for: '%s'"

12307 msgstr "kunde inte skriva ersättningsincheckning för: \"%s\""

12308

12310 -#: builtin/replace.c:436

12309 +#: builtin/replace.c:437

12310 msgid "list replace refs"

12311 msgstr "visa ersättningsreferenser"

12312

12314 -#: builtin/replace.c:437

12313 +#: builtin/replace.c:438

12314 msgid "delete replace refs"

12315 msgstr "ta bort ersättningsreferenser"

12316

12318 -#: builtin/replace.c:438

12317 +#: builtin/replace.c:439

12318 msgid "edit existing object"

12319 msgstr "redigera befintligt objekt"

12320

12322 -#: builtin/replace.c:439

12321 +#: builtin/replace.c:440

12322 msgid "change a commit's parents"

12323 msgstr "ändra en inchecknings föräldrar"

12324

12326 -#: builtin/replace.c:440

12325 +#: builtin/replace.c:441

12326 msgid "replace the ref if it exists"

12327 msgstr "ersätt referensen om den finns"

12328

12330 -#: builtin/replace.c:441

12329 +#: builtin/replace.c:442

12330 msgid "do not pretty-print contents for --edit"

12331 msgstr "använd inte snygg visning av innehåll för --edit"

12332

12334 -#: builtin/replace.c:442

12333 +#: builtin/replace.c:443

12334 msgid "use this format"

12335 msgstr "använd detta format"

12336

@@ -12944,7 +12943,7 @@ msgstr "alternativa ankare för relativa sökvägar"

12943 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"

12944 msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"

12945

12947 -#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:382

12946 +#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380

12947 #, c-format

12948 msgid "No url found for submodule path '%s' in .gitmodules"

12949 msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"

@@ -13258,30 +13257,6 @@ msgstr "inget taggmeddelande?"

13257 msgid "The tag message has been left in %s\n"

13258 msgstr "Taggmeddelandet har lämnats i %s\n"

13259

13261 -#: builtin/tag.c:312

13262 -msgid "tag: tagging "

13263 -msgstr "tag: taggar"

13264 -

13265 -#: builtin/tag.c:320

13266 -msgid "object of unknown type"

13267 -msgstr "objekt av okänd typ"

13268 -

13269 -#: builtin/tag.c:327

13270 -msgid "commit object"

13271 -msgstr "incheckningsobjekt"

13272 -

13273 -#: builtin/tag.c:335

13274 -msgid "tree object"

13275 -msgstr "trädobjekt"

13276 -

13277 -#: builtin/tag.c:338

13278 -msgid "blob object"

13279 -msgstr "blob-objekt"

13280 -

13281 -#: builtin/tag.c:341

13282 -msgid "other tag object"

13283 -msgstr "annat taggobjekt"

13284 -

13260 #: builtin/tag.c:397

13261 msgid "list tag names"

13262 msgstr "lista taggnamn"

@@ -13715,27 +13690,27 @@ msgstr "git worktree prune [<flaggor>]"

13690 msgid "git worktree unlock <path>"

13691 msgstr "git worktree unlock <sökväg>"

13692

13718 -#: builtin/worktree.c:42

13693 +#: builtin/worktree.c:43

13694 #, c-format

13695 msgid "Removing worktrees/%s: not a valid directory"

13696 msgstr "Tar bort worktrees/%s: inte en giltig katalog"

13697

13723 -#: builtin/worktree.c:48

13698 +#: builtin/worktree.c:49

13699 #, c-format

13700 msgid "Removing worktrees/%s: gitdir file does not exist"

13701 msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"

13702

13728 -#: builtin/worktree.c:53

13703 +#: builtin/worktree.c:54

13704 #, c-format

13705 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"

13706 msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"

13707

13733 -#: builtin/worktree.c:64

13708 +#: builtin/worktree.c:65

13709 #, c-format

13710 msgid "Removing worktrees/%s: invalid gitdir file"

13711 msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"

13712

13738 -#: builtin/worktree.c:80

13713 +#: builtin/worktree.c:81

13714 #, c-format

13715 msgid "Removing worktrees/%s: gitdir file points to non-existent location"

13716 msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"

@@ -13753,61 +13728,65 @@ msgstr "låt tid gå ut för arbetskataloger äldre än <tid>"

13728 msgid "'%s' already exists"

13729 msgstr "\"%s\" finns redan"

13730

13756 -#: builtin/worktree.c:236

13731 +#: builtin/worktree.c:235

13732 #, c-format

13733 msgid "could not create directory of '%s'"

13734 msgstr "kunde inte skapa katalogen \"%s\""

13735

13761 -#: builtin/worktree.c:272

13736 +#: builtin/worktree.c:274

13737 #, c-format

13738 msgid "Preparing %s (identifier %s)"

13739 msgstr "Förbereder %s (identifieraren %s)"

13740

13766 -#: builtin/worktree.c:324

13741 +#: builtin/worktree.c:328

13742 msgid "checkout <branch> even if already checked out in other worktree"

13743 msgstr ""

13744 "checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"

13745

13771 -#: builtin/worktree.c:326

13746 +#: builtin/worktree.c:330

13747 msgid "create a new branch"

13748 msgstr "skapa en ny gren"

13749

13775 -#: builtin/worktree.c:328

13750 +#: builtin/worktree.c:332

13751 msgid "create or reset a branch"

13752 msgstr "skapa eller återställ en gren"

13753

13779 -#: builtin/worktree.c:330

13754 +#: builtin/worktree.c:334

13755 msgid "populate the new working tree"

13756 msgstr "befolka den nya arbetskatalogen"

13757

13783 -#: builtin/worktree.c:338

13758 +#: builtin/worktree.c:335

13759 +msgid "keep the new working tree locked"

13760 +msgstr "låt arbetskatalogen förbli låst"

13761 +

13762 +#: builtin/worktree.c:343

13763 msgid "-b, -B, and --detach are mutually exclusive"

13764 msgstr "-b, -B och --detach är ömsesidigt uteslutande"

13765

13787 -#: builtin/worktree.c:473

13766 +#: builtin/worktree.c:478

13767 msgid "reason for locking"

13768 msgstr "orsak till lås"

13769

13791 -#: builtin/worktree.c:485 builtin/worktree.c:518

13770 +#: builtin/worktree.c:490 builtin/worktree.c:523

13771 #, c-format

13772 msgid "'%s' is not a working tree"

13773 msgstr "\"%s\" är inte en arbetskatalog"

13774

13796 -#: builtin/worktree.c:487 builtin/worktree.c:520

13775 +#: builtin/worktree.c:492 builtin/worktree.c:525

13776 msgid "The main working tree cannot be locked or unlocked"

13777 msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"

13778

13800 -#: builtin/worktree.c:492

13779 +#: builtin/worktree.c:497

13780 #, c-format

13781 msgid "'%s' is already locked, reason: %s"

13782 msgstr "\"%s\" är redan låst, orsak: %s"

13783

13805 -#: builtin/worktree.c:494

13784 +#: builtin/worktree.c:499

13785 #, c-format

13786 msgid "'%s' is already locked"

13787 msgstr "\"%s\" är redan låst"

13788

13810 -#: builtin/worktree.c:522

13789 +#: builtin/worktree.c:527

13790 #, c-format

13791 msgid "'%s' is not locked"

13792 msgstr "\"%s\" är inte låst"

@@ -13875,15 +13854,20 @@ msgstr ""

13854 "några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"

13855 "<koncept>\" för att läsa mer om specifika underkommandon och koncept."

13856

13878 -#: http.c:355

13857 +#: http.c:336

13858 +#, c-format

13859 +msgid "negative value for http.postbuffer; defaulting to %d"

13860 +msgstr "http.postbuffer har negativt värde; använder förvalet %d"

13861 +

13862 +#: http.c:357

13863 msgid "Delegation control is not supported with cURL < 7.22.0"

13864 msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"

13865

13882 -#: http.c:364

13866 +#: http.c:366

13867 msgid "Public key pinning not supported with cURL < 7.44.0"

13868 msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0"

13869

13886 -#: http.c:1755

13870 +#: http.c:1766

13871 #, c-format

13872 msgid ""

13873 "unable to update url base from redirection:\n"

@@ -14271,7 +14255,7 @@ msgstr "Försök enkel sammanslagning med $pretty_name"

14255 msgid "Simple merge did not work, trying automatic merge."

14256 msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."

14257

14274 -#: git-rebase.sh:57

14258 +#: git-rebase.sh:58

14259 msgid ""

14260 "When you have resolved this problem, run \"git rebase --continue\".\n"

14261 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"

@@ -14282,37 +14266,37 @@ msgstr ""

14266 "Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n"

14267 "För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"."

14268

14285 -#: git-rebase.sh:157 git-rebase.sh:396

14269 +#: git-rebase.sh:158 git-rebase.sh:397

14270 #, sh-format

14271 msgid "Could not move back to $head_name"

14272 msgstr "Kunde inte flytta tillbaka till $head_name"

14273

14290 -#: git-rebase.sh:171

14274 +#: git-rebase.sh:172

14275 #, sh-format

14276 msgid "Cannot store $stash_sha1"

14277 msgstr "Kan inte spara $stash_sha1"

14278

14295 -#: git-rebase.sh:211

14279 +#: git-rebase.sh:212

14280 msgid "The pre-rebase hook refused to rebase."

14281 msgstr "Kroken pre-rebase vägrade ombaseringen."

14282

14299 -#: git-rebase.sh:216

14283 +#: git-rebase.sh:217

14284 msgid "It looks like git-am is in progress. Cannot rebase."

14285 msgstr "Det verkar som en git-am körs. Kan inte ombasera."

14286

14303 -#: git-rebase.sh:357

14287 +#: git-rebase.sh:358

14288 msgid "No rebase in progress?"

14289 msgstr "Ingen ombasering pågår?"

14290

14307 -#: git-rebase.sh:368

14291 +#: git-rebase.sh:369

14292 msgid "The --edit-todo action can only be used during interactive rebase."

14293 msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."

14294

14311 -#: git-rebase.sh:375

14295 +#: git-rebase.sh:376

14296 msgid "Cannot read HEAD"

14297 msgstr "Kan inte läsa HEAD"

14298

14315 -#: git-rebase.sh:378

14299 +#: git-rebase.sh:379

14300 msgid ""

14301 "You must edit all merge conflicts and then\n"

14302 "mark them as resolved using git add"

@@ -14320,7 +14304,7 @@ msgstr ""

14304 "Du måste redigera alla sammanslagningskonflikter och\n"

14305 "därefter markera dem som lösta med git add"

14306

14323 -#: git-rebase.sh:418

14307 +#: git-rebase.sh:419

14308 #, sh-format

14309 msgid ""

14310 "It seems that there is already a $state_dir_base directory, and\n"

@@ -14341,65 +14325,65 @@ msgstr ""

14325 "och kör programmet igen. Jag avslutar ifall du fortfarande har\n"

14326 "något av värde där."

14327

14344 -#: git-rebase.sh:469

14328 +#: git-rebase.sh:470

14329 #, sh-format

14330 msgid "invalid upstream $upstream_name"

14331 msgstr "ogiltig uppström $upstream_name"

14332

14349 -#: git-rebase.sh:493

14333 +#: git-rebase.sh:494

14334 #, sh-format

14335 msgid "$onto_name: there are more than one merge bases"

14336 msgstr "$onto_name: mer än en sammanslagningsbas finns"

14337

14354 -#: git-rebase.sh:496 git-rebase.sh:500

14338 +#: git-rebase.sh:497 git-rebase.sh:501

14339 #, sh-format

14340 msgid "$onto_name: there is no merge base"

14341 msgstr "$onto_name: ingen sammanslagningsbas finns"

14342

14359 -#: git-rebase.sh:505

14343 +#: git-rebase.sh:506

14344 #, sh-format

14345 msgid "Does not point to a valid commit: $onto_name"

14346 msgstr "Peka på en giltig incheckning: $onto_name"

14347

14364 -#: git-rebase.sh:528

14348 +#: git-rebase.sh:529

14349 #, sh-format

14350 msgid "fatal: no such branch: $branch_name"

14351 msgstr "ödesdigert: ingen sådan gren: $branch_name"

14352

14369 -#: git-rebase.sh:561

14353 +#: git-rebase.sh:562

14354 msgid "Cannot autostash"

14355 msgstr "Kan inte utföra \"autostash\""

14356

14373 -#: git-rebase.sh:566

14357 +#: git-rebase.sh:567

14358 #, sh-format

14359 msgid "Created autostash: $stash_abbrev"

14360 msgstr "Skapade autostash: $stash_abbrev"

14361

14378 -#: git-rebase.sh:570

14362 +#: git-rebase.sh:571

14363 msgid "Please commit or stash them."

14364 msgstr "Checka in eller använd \"stash\" på dem."

14365

14382 -#: git-rebase.sh:590

14366 +#: git-rebase.sh:591

14367 #, sh-format

14368 msgid "Current branch $branch_name is up to date."

14369 msgstr "Aktuell gren $branch_name är à jour."

14370

14387 -#: git-rebase.sh:594

14371 +#: git-rebase.sh:595

14372 #, sh-format

14373 msgid "Current branch $branch_name is up to date, rebase forced."

14374 msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."

14375

14392 -#: git-rebase.sh:605

14376 +#: git-rebase.sh:606

14377 #, sh-format

14378 msgid "Changes from $mb to $onto:"

14379 msgstr "Ändringar från $mb till $onto:"

14380

14397 -#: git-rebase.sh:614

14381 +#: git-rebase.sh:615

14382 msgid "First, rewinding head to replay your work on top of it..."

14383 msgstr ""

14384 "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."

14385

14402 -#: git-rebase.sh:624

14386 +#: git-rebase.sh:625

14387 #, sh-format

14388 msgid "Fast-forwarded $branch_name to $onto_name."

14389 msgstr "Snabbspolade $branch_name till $onto_name."

@@ -16157,6 +16141,27 @@ msgstr ""

16141 msgid "Do you really want to send %s? [y|N]: "

16142 msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "

16143

16144 +#~ msgid "could not stat '%s"

16145 +#~ msgstr "kunde inte ta status på \"%s\""

16146 +

16147 +#~ msgid "tag: tagging "

16148 +#~ msgstr "tag: taggar"

16149 +

16150 +#~ msgid "object of unknown type"

16151 +#~ msgstr "objekt av okänd typ"

16152 +

16153 +#~ msgid "commit object"

16154 +#~ msgstr "incheckningsobjekt"

16155 +

16156 +#~ msgid "tree object"

16157 +#~ msgstr "trädobjekt"

16158 +

16159 +#~ msgid "blob object"

16160 +#~ msgstr "blob-objekt"

16161 +

16162 +#~ msgid "other tag object"

16163 +#~ msgstr "annat taggobjekt"

16164 +

16165 #~ msgid ""

16166 #~ "There is nothing to exclude from by :(exclude) patterns.\n"

16167 #~ "Perhaps you forgot to add either ':/' or '.' ?"

l10n: sv.po: Update Swedish translation (3195t0f0u)