@matheusbsbs / matheus-bagliano / commits / 7345044379

l10n: sv.po: Update Swedish translation (4187t0f0u)

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>

Peter Krefting committed Dec 2, 2018 at 15:43 UTC 734504437952db743941cbd2265430bb04d0cde1
1 file changed +231 -221
po/sv.po
+231 -221
@@ -7,8 +7,8 @@ msgid ""
7 msgstr ""
8 "Project-Id-Version: git 2.20.0\n"
9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10 -"POT-Creation-Date: 2018-11-20 10:05+0800\n"
11 -"PO-Revision-Date: 2018-11-29 12:54+0100\n"
10 +"POT-Creation-Date: 2018-12-02 10:55+0800\n"
11 +"PO-Revision-Date: 2018-12-02 15:41+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"
@@ -694,7 +694,7 @@ msgstr "se till att åtminstone <n> rader sammanhang är lika"
694
695 #: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97
696 #: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
697 -#: builtin/pack-objects.c:3310 builtin/rebase.c:839
697 +#: builtin/pack-objects.c:3312 builtin/rebase.c:857
698 msgid "action"
699 msgstr "åtgärd"
700
@@ -1060,7 +1060,7 @@ msgstr ""
1060 #: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963
1061 #: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932
1062 #: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406
1063 -#: builtin/pack-objects.c:3135 builtin/pack-objects.c:3150
1063 +#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
1064 #: builtin/shortlog.c:192
1065 msgid "revision walk setup failed"
1066 msgstr "misslyckades skapa revisionstraversering"
@@ -1641,7 +1641,7 @@ msgstr "felformat värde för %s: %s"
1641 msgid "must be one of nothing, matching, simple, upstream or current"
1642 msgstr "måste vara en av nothing, matching, simple, upstream eller current"
1643
1644 -#: config.c:1481 builtin/pack-objects.c:3389
1644 +#: config.c:1481 builtin/pack-objects.c:3391
1645 #, c-format
1646 msgid "bad pack compression level %d"
1647 msgstr "felaktig paketkomprimeringsgrad %d"
@@ -1690,87 +1690,87 @@ msgstr ""
1690 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1691 msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
1692
1693 -#: config.c:2319
1693 +#: config.c:2322
1694 #, c-format
1695 msgid "unable to parse '%s' from command-line config"
1696 msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
1697
1698 -#: config.c:2321
1698 +#: config.c:2324
1699 #, c-format
1700 msgid "bad config variable '%s' in file '%s' at line %d"
1701 msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
1702
1703 -#: config.c:2402
1703 +#: config.c:2405
1704 #, c-format
1705 msgid "invalid section name '%s'"
1706 msgstr "felaktigt sektionsnamn \"%s\""
1707
1708 -#: config.c:2434
1708 +#: config.c:2437
1709 #, c-format
1710 msgid "%s has multiple values"
1711 msgstr "%s har flera värden"
1712
1713 -#: config.c:2463
1713 +#: config.c:2466
1714 #, c-format
1715 msgid "failed to write new configuration file %s"
1716 msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
1717
1718 -#: config.c:2714 config.c:3038
1718 +#: config.c:2717 config.c:3041
1719 #, c-format
1720 msgid "could not lock config file %s"
1721 msgstr "kunde inte låsa konfigurationsfilen %s"
1722
1723 -#: config.c:2725
1723 +#: config.c:2728
1724 #, c-format
1725 msgid "opening %s"
1726 msgstr "öppnar %s"
1727
1728 -#: config.c:2760 builtin/config.c:327
1728 +#: config.c:2763 builtin/config.c:327
1729 #, c-format
1730 msgid "invalid pattern: %s"
1731 msgstr "ogiltigt mönster: %s"
1732
1733 -#: config.c:2785
1733 +#: config.c:2788
1734 #, c-format
1735 msgid "invalid config file %s"
1736 msgstr "ogiltig konfigurationsfil: \"%s\""
1737
1738 -#: config.c:2798 config.c:3051
1738 +#: config.c:2801 config.c:3054
1739 #, c-format
1740 msgid "fstat on %s failed"
1741 msgstr "fstat misslyckades på %s"
1742
1743 -#: config.c:2809
1743 +#: config.c:2812
1744 #, c-format
1745 msgid "unable to mmap '%s'"
1746 msgstr "kunde inte utföra mmap på \"%s\""
1747
1748 -#: config.c:2818 config.c:3056
1748 +#: config.c:2821 config.c:3059
1749 #, c-format
1750 msgid "chmod on %s failed"
1751 msgstr "chmod misslyckades på %s"
1752
1753 -#: config.c:2903 config.c:3153
1753 +#: config.c:2906 config.c:3156
1754 #, c-format
1755 msgid "could not write config file %s"
1756 msgstr "kunde inte skriva konfigurationsfilen %s"
1757
1758 -#: config.c:2937
1758 +#: config.c:2940
1759 #, c-format
1760 msgid "could not set '%s' to '%s'"
1761 msgstr "kunde inte ställa in \"%s\" till \"%s\""
1762
1763 -#: config.c:2939 builtin/remote.c:782
1763 +#: config.c:2942 builtin/remote.c:782
1764 #, c-format
1765 msgid "could not unset '%s'"
1766 msgstr "kunde inte ta bort inställning för \"%s\""
1767
1768 -#: config.c:3029
1768 +#: config.c:3032
1769 #, c-format
1770 msgid "invalid section name: %s"
1771 msgstr "felaktigt namn på stycke: %s"
1772
1773 -#: config.c:3196
1773 +#: config.c:3199
1774 #, c-format
1775 msgid "missing value for '%s'"
1776 msgstr "värde saknas för \"%s\""
@@ -3347,8 +3347,8 @@ msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""
3347
3348 #: midx.c:205
3349 #, c-format
3350 -msgid "bad pack-int-id: %u (%u total packs"
3351 -msgstr "bad pack-int-id: %u (%u paket totalt"
3350 +msgid "bad pack-int-id: %u (%u total packs)"
3351 +msgstr "bad pack-int-id: %u (%u paket totalt)"
3352
3353 #: midx.c:246
3354 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
@@ -3736,32 +3736,32 @@ msgstr "kunde inte läsa in cache_entries-tråden: %s"
3736 msgid "unable to join load_cache_entries thread: %s"
3737 msgstr "kunde inte utföra join på cache_entries-tråden: %s"
3738
3739 -#: read-cache.c:2200
3739 +#: read-cache.c:2201
3740 #, c-format
3741 msgid "unable to create load_index_extensions thread: %s"
3742 msgstr "kunde inte skapa load_index_extensions-tråden: %s"
3743
3744 -#: read-cache.c:2227
3744 +#: read-cache.c:2228
3745 #, c-format
3746 msgid "unable to join load_index_extensions thread: %s"
3747 msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"
3748
3749 -#: read-cache.c:2953 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
3749 +#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086
3750 #, c-format
3751 msgid "could not close '%s'"
3752 msgstr "kunde inte stänga \"%s\""
3753
3754 -#: read-cache.c:3026 sequencer.c:2203 sequencer.c:3592
3754 +#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592
3755 #, c-format
3756 msgid "could not stat '%s'"
3757 msgstr "kunde inte ta status på \"%s\""
3758
3759 -#: read-cache.c:3039
3759 +#: read-cache.c:3068
3760 #, c-format
3761 msgid "unable to open git dir: %s"
3762 msgstr "kunde inte öppna git-katalog: %s"
3763
3764 -#: read-cache.c:3051
3764 +#: read-cache.c:3080
3765 #, c-format
3766 msgid "unable to unlink: %s"
3767 msgstr "misslyckades ta bort länken: %s"
@@ -3958,18 +3958,18 @@ msgstr "\"%s\" finns; kan inte skapa \"%s\""
3958 msgid "cannot process '%s' and '%s' at the same time"
3959 msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
3960
3961 -#: refs/files-backend.c:1227
3961 +#: refs/files-backend.c:1228
3962 #, c-format
3963 msgid "could not remove reference %s"
3964 msgstr "kunde inte ta bort referensen %s"
3965
3966 -#: refs/files-backend.c:1241 refs/packed-backend.c:1532
3966 +#: refs/files-backend.c:1242 refs/packed-backend.c:1532
3967 #: refs/packed-backend.c:1542
3968 #, c-format
3969 msgid "could not delete reference %s: %s"
3970 msgstr "kunde inte ta bort referensen %s: %s"
3971
3972 -#: refs/files-backend.c:1244 refs/packed-backend.c:1545
3972 +#: refs/files-backend.c:1245 refs/packed-backend.c:1545
3973 #, c-format
3974 msgid "could not delete references: %s"
3975 msgstr "kunde inte ta bort referenser: %s"
@@ -5101,8 +5101,8 @@ msgstr "Kunde inte slå ihop %.*s"
5101 msgid "could not copy '%s' to '%s'"
5102 msgstr "kunde inte kopiera in \"%s\" till \"%s\""
5103
5104 -#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:999
5105 -#: builtin/rebase.c:1350 builtin/rebase.c:1404
5104 +#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019
5105 +#: builtin/rebase.c:1372 builtin/rebase.c:1426
5106 msgid "could not read index"
5107 msgstr "kunde inte läsa indexet"
5108
@@ -5155,12 +5155,12 @@ msgstr "skriver fejkad rotincheckning"
5155 msgid "writing squash-onto"
5156 msgstr "skriver squash-onto"
5157
5158 -#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:590
5158 +#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591
5159 #, c-format
5160 msgid "failed to find tree of %s"
5161 msgstr "kunde inte hitta trädet för %s."
5162
5163 -#: sequencer.c:3015 builtin/rebase.c:603
5163 +#: sequencer.c:3015 builtin/rebase.c:604
5164 msgid "could not write index"
5165 msgstr "kunde inte skriva indexet"
5166
@@ -7606,7 +7606,7 @@ msgstr "sänd det genom git-apply"
7606
7607 #: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671
7608 #: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239
7609 -#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:836
7609 +#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854
7610 #: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
7611 #: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
7612 #: parse-options.h:144 parse-options.h:146 parse-options.h:268
@@ -7614,7 +7614,7 @@ msgid "n"
7614 msgstr "n"
7615
7616 #: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38
7617 -#: builtin/replace.c:543 builtin/tag.c:422 builtin/verify-tag.c:39
7617 +#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
7618 msgid "format"
7619 msgstr "format"
7620
@@ -7659,12 +7659,12 @@ msgid "use current timestamp for author date"
7659 msgstr "använd nuvarande tidsstämpel för författardatum"
7660
7661 #: builtin/am.c:2253 builtin/commit.c:1483 builtin/merge.c:273
7662 -#: builtin/pull.c:184 builtin/rebase.c:880 builtin/rebase--interactive.c:183
7662 +#: builtin/pull.c:184 builtin/rebase.c:898 builtin/rebase--interactive.c:183
7663 #: builtin/revert.c:113 builtin/tag.c:402
7664 msgid "key-id"
7665 msgstr "nyckel-id"
7666
7667 -#: builtin/am.c:2254 builtin/rebase.c:881 builtin/rebase--interactive.c:184
7667 +#: builtin/am.c:2254 builtin/rebase.c:899 builtin/rebase--interactive.c:184
7668 msgid "GPG-sign commits"
7669 msgstr "GPG-signera incheckningar"
7670
@@ -9182,7 +9182,7 @@ msgid "use --reference only while cloning"
9182 msgstr "använd --reference endast under kloningen"
9183
9184 #: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46
9185 -#: builtin/pack-objects.c:3299 builtin/repack.c:329
9185 +#: builtin/pack-objects.c:3301 builtin/repack.c:329
9186 msgid "name"
9187 msgstr "namn"
9188
@@ -9207,7 +9207,7 @@ msgstr "djup"
9207 msgid "create a shallow clone of that depth"
9208 msgstr "skapa en grund klon på detta djup"
9209
9210 -#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3290
9210 +#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292
9211 msgid "time"
9212 msgstr "tid"
9213
@@ -9216,7 +9216,7 @@ msgid "create a shallow clone since a specific time"
9216 msgstr "skapa en grund klon från en angiven tidpunkt"
9217
9218 #: builtin/clone.c:127 builtin/fetch.c:146 builtin/fetch.c:169
9219 -#: builtin/rebase.c:813
9219 +#: builtin/rebase.c:831
9220 msgid "revision"
9221 msgstr "revision"
9222
@@ -9810,7 +9810,7 @@ msgid "terminate entries with NUL"
9810 msgstr "terminera poster med NUL"
9811
9812 #: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509
9813 -#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:892
9813 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910
9814 #: builtin/tag.c:400
9815 msgid "mode"
9816 msgstr "läge"
@@ -11537,7 +11537,7 @@ msgstr "kan inte slå upp revision: %s"
11537 msgid "invalid option combination, ignoring --threads"
11538 msgstr "ogiltig kombination av flaggor, ignorerar --threads"
11539
11540 -#: builtin/grep.c:1054 builtin/pack-objects.c:3395
11540 +#: builtin/grep.c:1054 builtin/pack-objects.c:3397
11541 msgid "no threads support, ignoring --threads"
11542 msgstr "trådstöd saknas, ignorerar --threads"
11543
@@ -12705,7 +12705,7 @@ msgstr ""
12705 msgid "do not print remote URL"
12706 msgstr "visa inte fjärr-URL"
12707
12708 -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:885
12708 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:903
12709 msgid "exec"
12710 msgstr "exec"
12711
@@ -12851,7 +12851,7 @@ msgid "verify that the named commit has a valid GPG signature"
12851 msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
12852
12853 #: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177
12854 -#: builtin/rebase.c:898 builtin/rebase--interactive.c:186 builtin/revert.c:110
12854 +#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110
12855 msgid "strategy"
12856 msgstr "strategi"
12857
@@ -13979,235 +13979,235 @@ msgstr ""
13979 "förväntade objekt-id, fick skräp:\n"
13980 " %s"
13981
13982 -#: builtin/pack-objects.c:2855
13982 +#: builtin/pack-objects.c:2857
13983 msgid "invalid value for --missing"
13984 msgstr "ogiltigt värde för --missing"
13985
13986 -#: builtin/pack-objects.c:2914 builtin/pack-objects.c:3022
13986 +#: builtin/pack-objects.c:2916 builtin/pack-objects.c:3024
13987 msgid "cannot open pack index"
13988 msgstr "kan inte öppna paketfilen"
13989
13990 -#: builtin/pack-objects.c:2945
13990 +#: builtin/pack-objects.c:2947
13991 #, c-format
13992 msgid "loose object at %s could not be examined"
13993 msgstr "lösa objekt på %s kunde inte underökas"
13994
13995 -#: builtin/pack-objects.c:3030
13995 +#: builtin/pack-objects.c:3032
13996 msgid "unable to force loose object"
13997 msgstr "kan inte tvinga lösa objekt"
13998
13999 -#: builtin/pack-objects.c:3120
13999 +#: builtin/pack-objects.c:3122
14000 #, c-format
14001 msgid "not a rev '%s'"
14002 msgstr "inte en referens \"%s\""
14003
14004 -#: builtin/pack-objects.c:3123
14004 +#: builtin/pack-objects.c:3125
14005 #, c-format
14006 msgid "bad revision '%s'"
14007 msgstr "felaktig revision \"%s\""
14008
14009 -#: builtin/pack-objects.c:3148
14009 +#: builtin/pack-objects.c:3150
14010 msgid "unable to add recent objects"
14011 msgstr "kan inte lägga till nya objekt"
14012
14013 -#: builtin/pack-objects.c:3201
14013 +#: builtin/pack-objects.c:3203
14014 #, c-format
14015 msgid "unsupported index version %s"
14016 msgstr "indexversionen %s stöds ej"
14017
14018 -#: builtin/pack-objects.c:3205
14018 +#: builtin/pack-objects.c:3207
14019 #, c-format
14020 msgid "bad index version '%s'"
14021 msgstr "felaktig indexversion \"%s\""
14022
14023 -#: builtin/pack-objects.c:3235
14023 +#: builtin/pack-objects.c:3237
14024 msgid "do not show progress meter"
14025 msgstr "visa inte förloppsindikator"
14026
14027 -#: builtin/pack-objects.c:3237
14027 +#: builtin/pack-objects.c:3239
14028 msgid "show progress meter"
14029 msgstr "visa förloppsindikator"
14030
14031 -#: builtin/pack-objects.c:3239
14031 +#: builtin/pack-objects.c:3241
14032 msgid "show progress meter during object writing phase"
14033 msgstr "visa förloppsindikator under objektskrivningsfasen"
14034
14035 -#: builtin/pack-objects.c:3242
14035 +#: builtin/pack-objects.c:3244
14036 msgid "similar to --all-progress when progress meter is shown"
14037 msgstr "som --all-progress när förloppsindikatorn visas"
14038
14039 -#: builtin/pack-objects.c:3243
14039 +#: builtin/pack-objects.c:3245
14040 msgid "<version>[,<offset>]"
14041 msgstr "<version>[,<offset>]"
14042
14043 -#: builtin/pack-objects.c:3244
14043 +#: builtin/pack-objects.c:3246
14044 msgid "write the pack index file in the specified idx format version"
14045 msgstr "skriv paketindexfilen i angiven indexformatversion"
14046
14047 -#: builtin/pack-objects.c:3247
14047 +#: builtin/pack-objects.c:3249
14048 msgid "maximum size of each output pack file"
14049 msgstr "maximal storlek på varje utdatapaketfil"
14050
14051 -#: builtin/pack-objects.c:3249
14051 +#: builtin/pack-objects.c:3251
14052 msgid "ignore borrowed objects from alternate object store"
14053 msgstr "ignorera lånade objekt från alternativa objektlager"
14054
14055 -#: builtin/pack-objects.c:3251
14055 +#: builtin/pack-objects.c:3253
14056 msgid "ignore packed objects"
14057 msgstr "ignorera packade objekt"
14058
14059 -#: builtin/pack-objects.c:3253
14059 +#: builtin/pack-objects.c:3255
14060 msgid "limit pack window by objects"
14061 msgstr "begränsa paketfönster efter objekt"
14062
14063 -#: builtin/pack-objects.c:3255
14063 +#: builtin/pack-objects.c:3257
14064 msgid "limit pack window by memory in addition to object limit"
14065 msgstr "begränsa paketfönster efter minne förutom objektgräns"
14066
14067 -#: builtin/pack-objects.c:3257
14067 +#: builtin/pack-objects.c:3259
14068 msgid "maximum length of delta chain allowed in the resulting pack"
14069 msgstr "maximal längd på deltakedja tillåten i slutligt paket"
14070
14071 -#: builtin/pack-objects.c:3259
14071 +#: builtin/pack-objects.c:3261
14072 msgid "reuse existing deltas"
14073 msgstr "återanvänd befintliga delta"
14074
14075 -#: builtin/pack-objects.c:3261
14075 +#: builtin/pack-objects.c:3263
14076 msgid "reuse existing objects"
14077 msgstr "återanvänd befintliga objekt"
14078
14079 -#: builtin/pack-objects.c:3263
14079 +#: builtin/pack-objects.c:3265
14080 msgid "use OFS_DELTA objects"
14081 msgstr "använd OFS_DELTA-objekt"
14082
14083 -#: builtin/pack-objects.c:3265
14083 +#: builtin/pack-objects.c:3267
14084 msgid "use threads when searching for best delta matches"
14085 msgstr "använd trådar vid sökning efter bästa deltaträffar"
14086
14087 -#: builtin/pack-objects.c:3267
14087 +#: builtin/pack-objects.c:3269
14088 msgid "do not create an empty pack output"
14089 msgstr "försök inte skapa tom paketutdata"
14090
14091 -#: builtin/pack-objects.c:3269
14091 +#: builtin/pack-objects.c:3271
14092 msgid "read revision arguments from standard input"
14093 msgstr "läs revisionsargument från standard in"
14094
14095 -#: builtin/pack-objects.c:3271
14095 +#: builtin/pack-objects.c:3273
14096 msgid "limit the objects to those that are not yet packed"
14097 msgstr "begränsa objekt till de som ännu inte packats"
14098
14099 -#: builtin/pack-objects.c:3274
14099 +#: builtin/pack-objects.c:3276
14100 msgid "include objects reachable from any reference"
14101 msgstr "inkludera objekt som kan nås från någon referens"
14102
14103 -#: builtin/pack-objects.c:3277
14103 +#: builtin/pack-objects.c:3279
14104 msgid "include objects referred by reflog entries"
14105 msgstr "inkludera objekt som refereras från referensloggposter"
14106
14107 -#: builtin/pack-objects.c:3280
14107 +#: builtin/pack-objects.c:3282
14108 msgid "include objects referred to by the index"
14109 msgstr "inkludera objekt som refereras från indexet"
14110
14111 -#: builtin/pack-objects.c:3283
14111 +#: builtin/pack-objects.c:3285
14112 msgid "output pack to stdout"
14113 msgstr "skriv paket på standard ut"
14114
14115 -#: builtin/pack-objects.c:3285
14115 +#: builtin/pack-objects.c:3287
14116 msgid "include tag objects that refer to objects to be packed"
14117 msgstr "inkludera taggobjekt som refererar objekt som skall packas"
14118
14119 -#: builtin/pack-objects.c:3287
14119 +#: builtin/pack-objects.c:3289
14120 msgid "keep unreachable objects"
14121 msgstr "behåll onåbara objekt"
14122
14123 -#: builtin/pack-objects.c:3289
14123 +#: builtin/pack-objects.c:3291
14124 msgid "pack loose unreachable objects"
14125 msgstr "packa lösa onåbara objekt"
14126
14127 -#: builtin/pack-objects.c:3291
14127 +#: builtin/pack-objects.c:3293
14128 msgid "unpack unreachable objects newer than <time>"
14129 msgstr "packa upp onåbara objekt nyare än <tid>"
14130
14131 -#: builtin/pack-objects.c:3294
14131 +#: builtin/pack-objects.c:3296
14132 msgid "create thin packs"
14133 msgstr "skapa tunna paket"
14134
14135 -#: builtin/pack-objects.c:3296
14135 +#: builtin/pack-objects.c:3298
14136 msgid "create packs suitable for shallow fetches"
14137 msgstr "skapa packfiler lämpade för grunda hämtningar"
14138
14139 -#: builtin/pack-objects.c:3298
14139 +#: builtin/pack-objects.c:3300
14140 msgid "ignore packs that have companion .keep file"
14141 msgstr "ignorera paket som har tillhörande .keep-fil"
14142
14143 -#: builtin/pack-objects.c:3300
14143 +#: builtin/pack-objects.c:3302
14144 msgid "ignore this pack"
14145 msgstr "ignorera detta paket"
14146
14147 -#: builtin/pack-objects.c:3302
14147 +#: builtin/pack-objects.c:3304
14148 msgid "pack compression level"
14149 msgstr "komprimeringsgrad för paket"
14150
14151 -#: builtin/pack-objects.c:3304
14151 +#: builtin/pack-objects.c:3306
14152 msgid "do not hide commits by grafts"
14153 msgstr "göm inte incheckningar med ympningar (\"grafts\")"
14154
14155 -#: builtin/pack-objects.c:3306
14155 +#: builtin/pack-objects.c:3308
14156 msgid "use a bitmap index if available to speed up counting objects"
14157 msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"
14158
14159 -#: builtin/pack-objects.c:3308
14159 +#: builtin/pack-objects.c:3310
14160 msgid "write a bitmap index together with the pack index"
14161 msgstr "använd bitkartindex tillsammans med packindexet"
14162
14163 -#: builtin/pack-objects.c:3311
14163 +#: builtin/pack-objects.c:3313
14164 msgid "handling for missing objects"
14165 msgstr "hantering av saknade objekt"
14166
14167 -#: builtin/pack-objects.c:3314
14167 +#: builtin/pack-objects.c:3316
14168 msgid "do not pack objects in promisor packfiles"
14169 msgstr "packa inte objekt i kontraktspackfiler"
14170
14171 -#: builtin/pack-objects.c:3316
14171 +#: builtin/pack-objects.c:3318
14172 msgid "respect islands during delta compression"
14173 msgstr "respektera öar under deltakomprimering"
14174
14175 -#: builtin/pack-objects.c:3340
14175 +#: builtin/pack-objects.c:3342
14176 #, c-format
14177 msgid "delta chain depth %d is too deep, forcing %d"
14178 msgstr "deltakedjedjupet %d är för djupt, påtvingar %d"
14179
14180 -#: builtin/pack-objects.c:3345
14180 +#: builtin/pack-objects.c:3347
14181 #, c-format
14182 msgid "pack.deltaCacheLimit is too high, forcing %d"
14183 msgstr "pack.deltaCacheLimit är för högt, påtvingar %d"
14184
14185 -#: builtin/pack-objects.c:3399
14185 +#: builtin/pack-objects.c:3401
14186 msgid "--max-pack-size cannot be used to build a pack for transfer"
14187 msgstr ""
14188 "--max-pack-size kan inte användas för att bygga ett paket som skall överföras"
14189
14190 -#: builtin/pack-objects.c:3401
14190 +#: builtin/pack-objects.c:3403
14191 msgid "minimum pack size limit is 1 MiB"
14192 msgstr "minsta packstorlek är 1 MiB"
14193
14194 -#: builtin/pack-objects.c:3406
14194 +#: builtin/pack-objects.c:3408
14195 msgid "--thin cannot be used to build an indexable pack"
14196 msgstr "--thin kan inte användas för att bygga ett indexerbart paket"
14197
14198 -#: builtin/pack-objects.c:3409
14198 +#: builtin/pack-objects.c:3411
14199 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
14200 msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt"
14201
14202 -#: builtin/pack-objects.c:3415
14202 +#: builtin/pack-objects.c:3417
14203 msgid "cannot use --filter without --stdout"
14204 msgstr "kan inte använda --filter utan --stdout"
14205
14206 -#: builtin/pack-objects.c:3474
14206 +#: builtin/pack-objects.c:3476
14207 msgid "Enumerating objects"
14208 msgstr "Räknar upp objekt"
14209
14210 -#: builtin/pack-objects.c:3493
14210 +#: builtin/pack-objects.c:3495
14211 #, c-format
14212 msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
14213 msgstr ""
@@ -14333,7 +14333,7 @@ msgstr ""
14333 "gren. Eftersom det inte är den fjärr som är konfigurerad som\n"
14334 "standard för aktuell gren måste du ange en gren på kommandoraden."
14335
14336 -#: builtin/pull.c:432 builtin/rebase.c:760 git-parse-remote.sh:73
14336 +#: builtin/pull.c:432 builtin/rebase.c:761 git-parse-remote.sh:73
14337 msgid "You are not currently on a branch."
14338 msgstr "Du är inte på någon gren för närvarande."
14339
@@ -14350,16 +14350,16 @@ msgid "See git-pull(1) for details."
14350 msgstr "Se git-pull(1) för detaljer."
14351
14352 #: builtin/pull.c:439 builtin/pull.c:445 builtin/pull.c:454
14353 -#: builtin/rebase.c:766 git-parse-remote.sh:64
14353 +#: builtin/rebase.c:767 git-parse-remote.sh:64
14354 msgid "<remote>"
14355 msgstr "<fjärr>"
14356
14357 #: builtin/pull.c:439 builtin/pull.c:454 builtin/pull.c:459
14358 -#: git-legacy-rebase.sh:548 git-parse-remote.sh:65
14358 +#: git-legacy-rebase.sh:556 git-parse-remote.sh:65
14359 msgid "<branch>"
14360 msgstr "<gren>"
14361
14362 -#: builtin/pull.c:447 builtin/rebase.c:758 git-parse-remote.sh:75
14362 +#: builtin/pull.c:447 builtin/rebase.c:759 git-parse-remote.sh:75
14363 msgid "There is no tracking information for the current branch."
14364 msgstr "Det finns ingen spårningsinformation för aktuell gren."
14365
@@ -14474,7 +14474,7 @@ msgid ""
14474 "\n"
14475 "To push to the branch of the same name on the remote, use\n"
14476 "\n"
14477 -" git push %s %s\n"
14477 +" git push %s HEAD\n"
14478 "%s"
14479 msgstr ""
14480 "Uppströmsgrenen för din nuvarande gren stämmer inte överens\n"
@@ -14485,7 +14485,7 @@ msgstr ""
14485 "\n"
14486 "För att sända till grenen med samma namn i fjärrarkivet använder du\n"
14487 "\n"
14488 -" git push %s %s\n"
14488 +" git push %s HEAD\n"
14489 "%s"
14490
14491 #: builtin/push.c:183
@@ -14903,7 +14903,7 @@ msgstr ""
14903 msgid "could not determine HEAD revision"
14904 msgstr "kunde inte bestämma HEAD-revision"
14905
14906 -#: builtin/rebase.c:752
14906 +#: builtin/rebase.c:753
14907 #, c-format
14908 msgid ""
14909 "%s\n"
@@ -14920,7 +14920,7 @@ msgstr ""
14920 " git rebase '<gren>'\n"
14921 "\n"
14922
14923 -#: builtin/rebase.c:768
14923 +#: builtin/rebase.c:769
14924 #, c-format
14925 msgid ""
14926 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -14933,148 +14933,148 @@ msgstr ""
14933 " git branch --set-upstream-to=%s/<gren> %s\n"
14934 "\n"
14935
14936 -#: builtin/rebase.c:814
14936 +#: builtin/rebase.c:832
14937 msgid "rebase onto given branch instead of upstream"
14938 msgstr "ombasera mot given grenen istället för uppström"
14939
14940 -#: builtin/rebase.c:816
14940 +#: builtin/rebase.c:834
14941 msgid "allow pre-rebase hook to run"
14942 msgstr "tillåt pre-rebase-krok att köra"
14943
14944 -#: builtin/rebase.c:818
14944 +#: builtin/rebase.c:836
14945 msgid "be quiet. implies --no-stat"
14946 msgstr "var tyst. implicerar --no-stat"
14947
14948 -#: builtin/rebase.c:821
14948 +#: builtin/rebase.c:839
14949 msgid "display a diffstat of what changed upstream"
14950 msgstr "vis diffstat för vad som ändrats uppströms"
14951
14952 -#: builtin/rebase.c:824
14952 +#: builtin/rebase.c:842
14953 msgid "do not show diffstat of what changed upstream"
14954 msgstr "visa inte en diffstat för vad som ändrats uppströms"
14955
14956 -#: builtin/rebase.c:827
14956 +#: builtin/rebase.c:845
14957 msgid "add a Signed-off-by: line to each commit"
14958 msgstr "lägg \"Signed-off-by:\"-rad till varje incheckning"
14959
14960 -#: builtin/rebase.c:829 builtin/rebase.c:833 builtin/rebase.c:835
14960 +#: builtin/rebase.c:847 builtin/rebase.c:851 builtin/rebase.c:853
14961 msgid "passed to 'git am'"
14962 msgstr "sänds till \"git am\""
14963
14964 -#: builtin/rebase.c:837 builtin/rebase.c:839
14964 +#: builtin/rebase.c:855 builtin/rebase.c:857
14965 msgid "passed to 'git apply'"
14966 msgstr "sänds till \"git apply\""
14967
14968 -#: builtin/rebase.c:841 builtin/rebase.c:844
14968 +#: builtin/rebase.c:859 builtin/rebase.c:862
14969 msgid "cherry-pick all commits, even if unchanged"
14970 msgstr "utför cherry-pick på alla incheckningar, även om oändrad"
14971
14972 -#: builtin/rebase.c:846
14972 +#: builtin/rebase.c:864
14973 msgid "continue"
14974 msgstr "fortsätt"
14975
14976 -#: builtin/rebase.c:849
14976 +#: builtin/rebase.c:867
14977 msgid "skip current patch and continue"
14978 msgstr "hoppa över nuvarande patch och fortsätt"
14979
14980 -#: builtin/rebase.c:851
14980 +#: builtin/rebase.c:869
14981 msgid "abort and check out the original branch"
14982 msgstr "avbryt och checka ut ursprungsgrenen"
14983
14984 -#: builtin/rebase.c:854
14984 +#: builtin/rebase.c:872
14985 msgid "abort but keep HEAD where it is"
14986 msgstr "avbryt men behåll HEAD där det är"
14987
14988 -#: builtin/rebase.c:855
14988 +#: builtin/rebase.c:873
14989 msgid "edit the todo list during an interactive rebase"
14990 msgstr "redigera attgöra-listan under interaktiv ombasering."
14991
14992 -#: builtin/rebase.c:858
14992 +#: builtin/rebase.c:876
14993 msgid "show the patch file being applied or merged"
14994 msgstr "visa patchen som tillämpas eller slås samman"
14995
14996 -#: builtin/rebase.c:861
14996 +#: builtin/rebase.c:879
14997 msgid "use merging strategies to rebase"
14998 msgstr "använd sammanslagningsstrategier för sammanslagning"
14999
15000 -#: builtin/rebase.c:865
15000 +#: builtin/rebase.c:883
15001 msgid "let the user edit the list of commits to rebase"
15002 msgstr "låt användaren redigera listan över incheckningar att ombasera"
15003
15004 -#: builtin/rebase.c:869
15004 +#: builtin/rebase.c:887
15005 msgid "try to recreate merges instead of ignoring them"
15006 msgstr "försök återskapa sammanslagningar istället för att ignorera dem"
15007
15008 -#: builtin/rebase.c:873
15009 -msgid "allow rerere to update index with resolved conflict"
15008 +#: builtin/rebase.c:891
15009 +msgid "allow rerere to update index with resolved conflict"
15010 msgstr "tillåt rerere att uppdatera index med lösa konflikter"
15011
15012 -#: builtin/rebase.c:876
15012 +#: builtin/rebase.c:894
15013 msgid "preserve empty commits during rebase"
15014 msgstr "behåll tomma incheckningar under ombasering"
15015
15016 -#: builtin/rebase.c:878
15016 +#: builtin/rebase.c:896
15017 msgid "move commits that begin with squash!/fixup! under -i"
15018 msgstr "flytta incheckningar som börjar med squash!/fixup! under -i"
15019
15020 -#: builtin/rebase.c:884
15020 +#: builtin/rebase.c:902
15021 msgid "automatically stash/stash pop before and after"
15022 msgstr "utför automatiskt stash/stash pop före och efter"
15023
15024 -#: builtin/rebase.c:886
15024 +#: builtin/rebase.c:904
15025 msgid "add exec lines after each commit of the editable list"
15026 msgstr "lägg till exec-rader efter varje incheckning i den redigerbara listan"
15027
15028 -#: builtin/rebase.c:890
15028 +#: builtin/rebase.c:908
15029 msgid "allow rebasing commits with empty messages"
15030 msgstr "tillåt ombasering av incheckningar med tomt meddelande"
15031
15032 -#: builtin/rebase.c:893
15032 +#: builtin/rebase.c:911
15033 msgid "try to rebase merges instead of skipping them"
15034 msgstr "försök ombasera sammanslagningar istället för att ignorera dem"
15035
15036 -#: builtin/rebase.c:896
15036 +#: builtin/rebase.c:914
15037 msgid "use 'merge-base --fork-point' to refine upstream"
15038 msgstr "använd \"merge-base --fork-point\" för att förfina uppström"
15039
15040 -#: builtin/rebase.c:898
15040 +#: builtin/rebase.c:916
15041 msgid "use the given merge strategy"
15042 msgstr "använd angiven sammanslagningsstrategi"
15043
15044 -#: builtin/rebase.c:900 builtin/revert.c:111
15044 +#: builtin/rebase.c:918 builtin/revert.c:111
15045 msgid "option"
15046 msgstr "alternativ"
15047
15048 -#: builtin/rebase.c:901
15048 +#: builtin/rebase.c:919
15049 msgid "pass the argument through to the merge strategy"
15050 msgstr "sänd flaggan till sammanslagningsstrategin"
15051
15052 -#: builtin/rebase.c:904
15052 +#: builtin/rebase.c:922
15053 msgid "rebase all reachable commits up to the root(s)"
15054 msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna"
15055
15056 -#: builtin/rebase.c:920
15056 +#: builtin/rebase.c:938
15057 #, c-format
15058 msgid "could not exec %s"
15059 msgstr "kunde inte köra %s"
15060
15061 -#: builtin/rebase.c:938 git-legacy-rebase.sh:213
15061 +#: builtin/rebase.c:956 git-legacy-rebase.sh:213
15062 msgid "It looks like 'git am' is in progress. Cannot rebase."
15063 msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera."
15064
15065 -#: builtin/rebase.c:979 git-legacy-rebase.sh:387
15065 +#: builtin/rebase.c:997 git-legacy-rebase.sh:395
15066 msgid "No rebase in progress?"
15067 msgstr "Ingen ombasering pågår?"
15068
15069 -#: builtin/rebase.c:982 git-legacy-rebase.sh:398
15069 +#: builtin/rebase.c:1001 git-legacy-rebase.sh:406
15070 msgid "The --edit-todo action can only be used during interactive rebase."
15071 msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
15072
15073 -#: builtin/rebase.c:995 git-legacy-rebase.sh:405
15073 +#: builtin/rebase.c:1015 git-legacy-rebase.sh:413
15074 msgid "Cannot read HEAD"
15075 msgstr "Kan inte läsa HEAD"
15076
15077 -#: builtin/rebase.c:1008 git-legacy-rebase.sh:408
15077 +#: builtin/rebase.c:1028 git-legacy-rebase.sh:416
15078 msgid ""
15079 "You must edit all merge conflicts and then\n"
15080 "mark them as resolved using git add"
@@ -15082,21 +15082,21 @@ msgstr ""
15082 "Du måste redigera alla sammanslagningskonflikter och\n"
15083 "därefter markera dem som lösta med git add"
15084
15085 -#: builtin/rebase.c:1026
15085 +#: builtin/rebase.c:1047
15086 msgid "could not discard worktree changes"
15087 msgstr "kunde inte kasta ändringar i arbetskatalogen"
15088
15089 -#: builtin/rebase.c:1044
15089 +#: builtin/rebase.c:1066
15090 #, c-format
15091 msgid "could not move back to %s"
15092 msgstr "kunde inte flytta tillbaka till %s"
15093
15094 -#: builtin/rebase.c:1055 builtin/rm.c:368
15094 +#: builtin/rebase.c:1077 builtin/rm.c:368
15095 #, c-format
15096 msgid "could not remove '%s'"
15097 msgstr "kunde inte ta bort \"%s\""
15098
15099 -#: builtin/rebase.c:1081
15099 +#: builtin/rebase.c:1103
15100 #, c-format
15101 msgid ""
15102 "It seems that there is already a %s directory, and\n"
@@ -15117,20 +15117,20 @@ msgstr ""
15117 "och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
15118 "något av värde där.\n"
15119
15120 -#: builtin/rebase.c:1102
15120 +#: builtin/rebase.c:1124
15121 msgid "switch `C' expects a numerical value"
15122 msgstr "flaggan \"C\" förväntar ett numeriskt värde"
15123
15124 -#: builtin/rebase.c:1139
15124 +#: builtin/rebase.c:1161
15125 #, c-format
15126 msgid "Unknown mode: %s"
15127 msgstr "Okänt läge: %s"
15128
15129 -#: builtin/rebase.c:1161
15129 +#: builtin/rebase.c:1183
15130 msgid "--strategy requires --merge or --interactive"
15131 msgstr "--strategy kräver --merge eller --interactive"
15132
15133 -#: builtin/rebase.c:1204
15133 +#: builtin/rebase.c:1226
15134 #, c-format
15135 msgid ""
15136 "error: cannot combine interactive options (--interactive, --exec, --rebase-"
@@ -15140,7 +15140,7 @@ msgstr ""
15140 "fel: kan inte kombinera interaktiva flaggor (--interactive, --exec, --rebase-"
15141 "merges, --preserve-merges, --keep-empty, --root + --onto) med am-flaggor (%s)"
15142
15143 -#: builtin/rebase.c:1209
15143 +#: builtin/rebase.c:1231
15144 #, c-format
15145 msgid ""
15146 "error: cannot combine merge options (--merge, --strategy, --strategy-option) "
@@ -15149,137 +15149,142 @@ msgstr ""
15149 "fel: kan inte kombinera sammanslagningsflaggor (--merge, --strategy, --"
15150 "strategy-option) med am-flaggor (%s)"
15151
15152 -#: builtin/rebase.c:1229 git-legacy-rebase.sh:528
15152 +#: builtin/rebase.c:1251 git-legacy-rebase.sh:536
15153 msgid "error: cannot combine '--preserve-merges' with '--rebase-merges'"
15154 msgstr "fel: kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\""
15155
15156 -#: builtin/rebase.c:1234 git-legacy-rebase.sh:534
15156 +#: builtin/rebase.c:1256 git-legacy-rebase.sh:542
15157 msgid "error: cannot combine '--rebase-merges' with '--strategy-option'"
15158 msgstr "fel: kan inte kombinera \"--rebase-merges\" med \"--strategy-option\""
15159
15160 -#: builtin/rebase.c:1237 git-legacy-rebase.sh:536
15160 +#: builtin/rebase.c:1259 git-legacy-rebase.sh:544
15161 msgid "error: cannot combine '--rebase-merges' with '--strategy'"
15162 msgstr "fel: kan inte kombinera \"--rebase-merges\" med \"--strategy\""
15163
15164 -#: builtin/rebase.c:1261
15164 +#: builtin/rebase.c:1283
15165 #, c-format
15166 msgid "invalid upstream '%s'"
15167 msgstr "felaktig uppström ”%s”"
15168
15169 -#: builtin/rebase.c:1267
15169 +#: builtin/rebase.c:1289
15170 msgid "Could not create new root commit"
15171 msgstr "kunde inte skapa ny rotincheckning"
15172
15173 -#: builtin/rebase.c:1285
15173 +#: builtin/rebase.c:1307
15174 #, c-format
15175 msgid "'%s': need exactly one merge base"
15176 msgstr "\"%s\": behöver precis en sammanslagningsbas"
15177
15178 -#: builtin/rebase.c:1292
15178 +#: builtin/rebase.c:1314
15179 #, c-format
15180 msgid "Does not point to a valid commit '%s'"
15181 msgstr "Pekar inte på en giltig incheckning: \"%s\""
15182
15183 -#: builtin/rebase.c:1317
15183 +#: builtin/rebase.c:1339
15184 #, c-format
15185 msgid "fatal: no such branch/commit '%s'"
15186 msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\""
15187
15188 -#: builtin/rebase.c:1325 builtin/submodule--helper.c:37
15188 +#: builtin/rebase.c:1347 builtin/submodule--helper.c:37
15189 #: builtin/submodule--helper.c:1930
15190 #, c-format
15191 msgid "No such ref: %s"
15192 msgstr "Ingen sådan referens: %s"
15193
15194 -#: builtin/rebase.c:1337
15194 +#: builtin/rebase.c:1359
15195 msgid "Could not resolve HEAD to a revision"
15196 msgstr "Kunde inte bestämma HEAD:s incheckning"
15197
15198 -#: builtin/rebase.c:1377 git-legacy-rebase.sh:657
15198 +#: builtin/rebase.c:1399 git-legacy-rebase.sh:665
15199 msgid "Cannot autostash"
15200 msgstr "Kan inte utföra \"autostash\""
15201
15202 -#: builtin/rebase.c:1380
15202 +#: builtin/rebase.c:1402
15203 #, c-format
15204 msgid "Unexpected stash response: '%s'"
15205 msgstr "Oväntat svar från stash: \"%s\""
15206
15207 -#: builtin/rebase.c:1386
15207 +#: builtin/rebase.c:1408
15208 #, c-format
15209 msgid "Could not create directory for '%s'"
15210 msgstr "Kunde inte skapa katalog för \"%s\""
15211
15212 -#: builtin/rebase.c:1389
15212 +#: builtin/rebase.c:1411
15213 #, c-format
15214 msgid "Created autostash: %s\n"
15215 msgstr "Skapade autostash: %s\n"
15216
15217 -#: builtin/rebase.c:1392
15217 +#: builtin/rebase.c:1414
15218 msgid "could not reset --hard"
15219 msgstr "kunde inte utföra \"reset --hard\""
15220
15221 -#: builtin/rebase.c:1393 builtin/reset.c:113
15221 +#: builtin/rebase.c:1415 builtin/reset.c:113
15222 #, c-format
15223 msgid "HEAD is now at %s"
15224 msgstr "HEAD är nu på %s"
15225
15226 -#: builtin/rebase.c:1409 git-legacy-rebase.sh:666
15226 +#: builtin/rebase.c:1431 git-legacy-rebase.sh:674
15227 msgid "Please commit or stash them."
15228 msgstr "Checka in eller använd \"stash\" på dem."
15229
15230 -#: builtin/rebase.c:1436
15230 +#: builtin/rebase.c:1458
15231 #, c-format
15232 msgid "could not parse '%s'"
15233 msgstr "kunde inte tolka \"%s\""
15234
15235 -#: builtin/rebase.c:1447
15235 +#: builtin/rebase.c:1470
15236 #, c-format
15237 msgid "could not switch to %s"
15238 msgstr "kunde inte växla till %s"
15239
15240 -#: builtin/rebase.c:1458 git-legacy-rebase.sh:689
15240 +#: builtin/rebase.c:1481 git-legacy-rebase.sh:697
15241 #, sh-format
15242 msgid "HEAD is up to date."
15243 msgstr "HEAD är à jour."
15244
15245 -#: builtin/rebase.c:1460
15245 +#: builtin/rebase.c:1483
15246 #, c-format
15247 msgid "Current branch %s is up to date.\n"
15248 msgstr "Aktuell gren %s är à jour.\n"
15249
15250 -#: builtin/rebase.c:1468 git-legacy-rebase.sh:699
15250 +#: builtin/rebase.c:1491 git-legacy-rebase.sh:707
15251 #, sh-format
15252 msgid "HEAD is up to date, rebase forced."
15253 msgstr "HEAD är à jour, ombasering framtvingad."
15254
15255 -#: builtin/rebase.c:1470
15255 +#: builtin/rebase.c:1493
15256 #, c-format
15257 msgid "Current branch %s is up to date, rebase forced.\n"
15258 msgstr "Aktuell gren %s är à jour, ombasering framtvingad.\n"
15259
15260 -#: builtin/rebase.c:1478 git-legacy-rebase.sh:208
15260 +#: builtin/rebase.c:1501 git-legacy-rebase.sh:208
15261 msgid "The pre-rebase hook refused to rebase."
15262 msgstr "Kroken pre-rebase vägrade ombaseringen."
15263
15264 -#: builtin/rebase.c:1484
15264 +#: builtin/rebase.c:1508
15265 +#, c-format
15266 +msgid "Changes to %s:\n"
15267 +msgstr "Ändringar till %s:\n"
15268 +
15269 +#: builtin/rebase.c:1511
15270 #, c-format
15271 msgid "Changes from %s to %s:\n"
15272 msgstr "Ändringar från %s till %s:\n"
15273
15269 -#: builtin/rebase.c:1507
15274 +#: builtin/rebase.c:1536
15275 #, c-format
15276 msgid "First, rewinding head to replay your work on top of it...\n"
15277 msgstr ""
15278 "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det...\n"
15279
15275 -#: builtin/rebase.c:1513
15280 +#: builtin/rebase.c:1543
15281 msgid "Could not detach HEAD"
15282 msgstr "Kunde inte koppla från HEAD"
15283
15279 -#: builtin/rebase.c:1522
15284 +#: builtin/rebase.c:1552
15285 #, c-format
15281 -msgid "Fast-forwarded %s to %s. \n"
15282 -msgstr "Snabbspolade %s till %s. \n"
15286 +msgid "Fast-forwarded %s to %s.\n"
15287 +msgstr "Snabbspolade %s till %s.\n"
15288
15289 #: builtin/rebase--interactive.c:24
15290 msgid "no HEAD?"
@@ -16294,7 +16299,7 @@ msgstr "ympning för \"%s\" behövs inte"
16299 msgid "new commit is the same as the old one: '%s'"
16300 msgstr "ny incheckning är samma som den gamla: \"%s\""
16301
16297 -#: builtin/replace.c:514
16302 +#: builtin/replace.c:515
16303 #, c-format
16304 msgid ""
16305 "could not convert the following graft(s):\n"
@@ -16303,71 +16308,71 @@ msgstr ""
16308 "kunde inte konvertera följande ympning(ar):\n"
16309 "%s"
16310
16306 -#: builtin/replace.c:535
16311 +#: builtin/replace.c:536
16312 msgid "list replace refs"
16313 msgstr "visa ersättningsreferenser"
16314
16310 -#: builtin/replace.c:536
16315 +#: builtin/replace.c:537
16316 msgid "delete replace refs"
16317 msgstr "ta bort ersättningsreferenser"
16318
16314 -#: builtin/replace.c:537
16319 +#: builtin/replace.c:538
16320 msgid "edit existing object"
16321 msgstr "redigera befintligt objekt"
16322
16318 -#: builtin/replace.c:538
16323 +#: builtin/replace.c:539
16324 msgid "change a commit's parents"
16325 msgstr "ändra en inchecknings föräldrar"
16326
16322 -#: builtin/replace.c:539
16327 +#: builtin/replace.c:540
16328 msgid "convert existing graft file"
16329 msgstr "konvertera befintlig ympningsfil"
16330
16326 -#: builtin/replace.c:540
16331 +#: builtin/replace.c:541
16332 msgid "replace the ref if it exists"
16333 msgstr "ersätt referensen om den finns"
16334
16330 -#: builtin/replace.c:542
16335 +#: builtin/replace.c:543
16336 msgid "do not pretty-print contents for --edit"
16337 msgstr "använd inte snygg visning av innehåll för --edit"
16338
16334 -#: builtin/replace.c:543
16339 +#: builtin/replace.c:544
16340 msgid "use this format"
16341 msgstr "använd detta format"
16342
16338 -#: builtin/replace.c:556
16343 +#: builtin/replace.c:557
16344 msgid "--format cannot be used when not listing"
16345 msgstr "--format kan inte användas utanför listning"
16346
16342 -#: builtin/replace.c:564
16347 +#: builtin/replace.c:565
16348 msgid "-f only makes sense when writing a replacement"
16349 msgstr "-f kan endast användas vid skrivning av ersättning"
16350
16346 -#: builtin/replace.c:568
16351 +#: builtin/replace.c:569
16352 msgid "--raw only makes sense with --edit"
16353 msgstr "--raw kan bara användas med --edit"
16354
16350 -#: builtin/replace.c:574
16355 +#: builtin/replace.c:575
16356 msgid "-d needs at least one argument"
16357 msgstr "-d behöver minst ett argument"
16358
16354 -#: builtin/replace.c:580
16359 +#: builtin/replace.c:581
16360 msgid "bad number of arguments"
16361 msgstr "fel antal argument"
16362
16358 -#: builtin/replace.c:586
16363 +#: builtin/replace.c:587
16364 msgid "-e needs exactly one argument"
16365 msgstr "-e tar exakt ett argument"
16366
16362 -#: builtin/replace.c:592
16367 +#: builtin/replace.c:593
16368 msgid "-g needs at least one argument"
16369 msgstr "-g tar minst ett argument"
16370
16366 -#: builtin/replace.c:598
16371 +#: builtin/replace.c:599
16372 msgid "--convert-graft-file takes no argument"
16373 msgstr "--convert-graft-file tar inga argument"
16374
16370 -#: builtin/replace.c:604
16375 +#: builtin/replace.c:605
16376 msgid "only one pattern can be given with -l"
16377 msgstr "endast ett mönster kan anges med -l"
16378
@@ -18405,7 +18410,7 @@ msgid "Public key pinning not supported with cURL < 7.44.0"
18410 msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0"
18411
18412 #: http.c:837
18408 -msgid "CURLSSLOPT_NO_REVOKE not suported with cURL < 7.44.0"
18413 +msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
18414 msgstr "CURLSSLOPT_NO_REVOKE stöds inte av cURL < 7.44.0"
18415
18416 #: http.c:910
@@ -19343,12 +19348,12 @@ msgstr "Försök enkel sammanslagning med $pretty_name"
19348 msgid "Simple merge did not work, trying automatic merge."
19349 msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."
19350
19346 -#: git-legacy-rebase.sh:426
19351 +#: git-legacy-rebase.sh:434
19352 #, sh-format
19353 msgid "Could not move back to $head_name"
19354 msgstr "Kunde inte flytta tillbaka till $head_name"
19355
19351 -#: git-legacy-rebase.sh:452
19356 +#: git-legacy-rebase.sh:460
19357 #, sh-format
19358 msgid ""
19359 "It seems that there is already a $state_dir_base directory, and\n"
@@ -19369,61 +19374,66 @@ msgstr ""
19374 "och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
19375 "något av värde där."
19376
19372 -#: git-legacy-rebase.sh:517
19377 +#: git-legacy-rebase.sh:525
19378 msgid "error: cannot combine '--signoff' with '--preserve-merges'"
19379 msgstr "fel: kan inte kombinera \"--signoff\" med \"--preserve-merges\""
19380
19376 -#: git-legacy-rebase.sh:562
19381 +#: git-legacy-rebase.sh:570
19382 #, sh-format
19383 msgid "invalid upstream '$upstream_name'"
19384 msgstr "ogiltig uppström \"$upstream_name\""
19385
19381 -#: git-legacy-rebase.sh:586
19386 +#: git-legacy-rebase.sh:594
19387 #, sh-format
19388 msgid "$onto_name: there are more than one merge bases"
19389 msgstr "$onto_name: mer än en sammanslagningsbas finns"
19390
19386 -#: git-legacy-rebase.sh:589 git-legacy-rebase.sh:593
19391 +#: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601
19392 #, sh-format
19393 msgid "$onto_name: there is no merge base"
19394 msgstr "$onto_name: ingen sammanslagningsbas finns"
19395
19391 -#: git-legacy-rebase.sh:598
19396 +#: git-legacy-rebase.sh:606
19397 #, sh-format
19398 msgid "Does not point to a valid commit: $onto_name"
19399 msgstr "Peka på en giltig incheckning: $onto_name"
19400
19396 -#: git-legacy-rebase.sh:624
19401 +#: git-legacy-rebase.sh:632
19402 #, sh-format
19403 msgid "fatal: no such branch/commit '$branch_name'"
19404 msgstr "ödesdigert: ingen sådan gren/incheckning: $branch_name"
19405
19401 -#: git-legacy-rebase.sh:662
19406 +#: git-legacy-rebase.sh:670
19407 #, sh-format
19408 msgid "Created autostash: $stash_abbrev"
19409 msgstr "Skapade autostash: $stash_abbrev"
19410
19406 -#: git-legacy-rebase.sh:691
19411 +#: git-legacy-rebase.sh:699
19412 #, sh-format
19413 msgid "Current branch $branch_name is up to date."
19414 msgstr "Aktuell gren $branch_name är à jour."
19415
19411 -#: git-legacy-rebase.sh:701
19416 +#: git-legacy-rebase.sh:709
19417 #, sh-format
19418 msgid "Current branch $branch_name is up to date, rebase forced."
19419 msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
19420
19416 -#: git-legacy-rebase.sh:713
19421 +#: git-legacy-rebase.sh:723
19422 +#, sh-format
19423 +msgid "Changes to $onto:"
19424 +msgstr "Ändringar till $onto:"
19425 +
19426 +#: git-legacy-rebase.sh:725
19427 #, sh-format
19428 msgid "Changes from $mb to $onto:"
19429 msgstr "Ändringar från $mb till $onto:"
19430
19421 -#: git-legacy-rebase.sh:722
19431 +#: git-legacy-rebase.sh:736
19432 msgid "First, rewinding head to replay your work on top of it..."
19433 msgstr ""
19434 "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
19435
19426 -#: git-legacy-rebase.sh:732
19436 +#: git-legacy-rebase.sh:746
19437 #, sh-format
19438 msgid "Fast-forwarded $branch_name to $onto_name."
19439 msgstr "Snabbspolade $branch_name till $onto_name."