Merge branch 'wk/pull-signoff'

diff --git a/po/sv.po b/po/sv.po
index d5ec676af0081b9056cafe640db983f1d46161ba..011df87acb35300cb353312f361791078cf4f404 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git 2.15.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-10-08 09:48+0800\n"
-"PO-Revision-Date: 2017-10-11 11:31+0100\n"
+"POT-Creation-Date: 2017-10-17 09:44+0800\n"
+"PO-Revision-Date: 2017-10-18 19:34+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -1001,7 +1001,7 @@ msgstr ""
 "--reverse och --first-parent tillsammans kräver att du anger senaste "
 "incheckningen"
 
-#: blame.c:1797 bundle.c:169 ref-filter.c:1932 sequencer.c:1168
+#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168
 #: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911
 #: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369
 #: builtin/shortlog.c:191
@@ -1671,7 +1671,7 @@ msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
 msgid "Filtering content"
 msgstr "Filtrerar innehåll"
 
-#: entry.c:417
+#: entry.c:433
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "kunde inte ta status på filen \"%s\""
@@ -2548,7 +2548,7 @@ msgstr "misslyckades ta bort länken: %s"
 msgid "Could not open '%s' for writing"
 msgstr "Kunde inte öppna \"%s\" för skrivning"
 
-#: refs.c:1779
+#: refs.c:1792
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "referensuppdateringar förbjudna i karantänmiljö"
 
@@ -2587,157 +2587,157 @@ msgstr "bakom %d"
 msgid "ahead %d, behind %d"
 msgstr "före %d, bakom %d"
 
-#: ref-filter.c:104
+#: ref-filter.c:105
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "förväntat format: %%(color:<color>)"
 
-#: ref-filter.c:106
+#: ref-filter.c:107
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "okänd färg: %%(color:%s)"
 
-#: ref-filter.c:126
+#: ref-filter.c:127
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Heltalsvärde förväntades refname:lstrip=%s"
 
-#: ref-filter.c:130
+#: ref-filter.c:131
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Heltalsvärde förväntades refname:rstrip=%s"
 
-#: ref-filter.c:132
+#: ref-filter.c:133
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "okänt %%(%s)-argument: %s"
 
-#: ref-filter.c:172
+#: ref-filter.c:173
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) tar inte argument"
 
-#: ref-filter.c:179
+#: ref-filter.c:180
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) tar inte argument"
 
-#: ref-filter.c:186
+#: ref-filter.c:198
 #, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) tar inte argument"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "okänt %%(trailers)-argument: %s"
 
-#: ref-filter.c:205
+#: ref-filter.c:221
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "positivt värde förväntat contents:lines=%s"
 
-#: ref-filter.c:207
+#: ref-filter.c:223
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "okänt %%(contents)-argument: %s"
 
-#: ref-filter.c:220
+#: ref-filter.c:236
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "positivt värde förväntat objectname:short=%s"
 
-#: ref-filter.c:224
+#: ref-filter.c:240
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "okänt %%(objectname)-argument: %s"
 
-#: ref-filter.c:251
+#: ref-filter.c:267
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "förväntat format: %%(align:<bredd>,<position>)"
 
-#: ref-filter.c:263
+#: ref-filter.c:279
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "okänd position:%s"
 
-#: ref-filter.c:267
+#: ref-filter.c:283
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "okänd bredd:%s"
 
-#: ref-filter.c:273
+#: ref-filter.c:289
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "okänt %%(align)-argument: %s"
 
-#: ref-filter.c:277
+#: ref-filter.c:293
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "positiv bredd förväntad med atomen %%(align)"
 
-#: ref-filter.c:292
+#: ref-filter.c:308
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "okänt %%(if)-argument: %s"
 
-#: ref-filter.c:382
+#: ref-filter.c:398
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "felformat fältnamn: %.*s"
 
-#: ref-filter.c:408
+#: ref-filter.c:424
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "okänt fältnamn: %.*s"
 
-#: ref-filter.c:520
+#: ref-filter.c:536
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
 
-#: ref-filter.c:580
+#: ref-filter.c:596
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
 
-#: ref-filter.c:582
+#: ref-filter.c:598
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format: atomen %%(then) använd mer än en gång"
 
-#: ref-filter.c:584
+#: ref-filter.c:600
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: atomen %%(then) använd efter %%(else)"
 
-#: ref-filter.c:610
+#: ref-filter.c:626
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
 
-#: ref-filter.c:612
+#: ref-filter.c:628
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
 
-#: ref-filter.c:614
+#: ref-filter.c:630
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "format: atomen %%(else) använd mer än en gång"
 
-#: ref-filter.c:627
+#: ref-filter.c:643
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "format: atomen %%(end) använd utan motsvarande atom"
 
-#: ref-filter.c:682
+#: ref-filter.c:698
 #, c-format
 msgid "malformed format string %s"
 msgstr "felformad formatsträng %s"
 
-#: ref-filter.c:1268
+#: ref-filter.c:1283
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(ingen gren, ombaserar %s)"
 
-#: ref-filter.c:1271
+#: ref-filter.c:1286
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(ingen gren, \"bisect\" startad på %s)"
@@ -2745,7 +2745,7 @@ msgstr "(ingen gren, \"bisect\" startad på %s)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #.
-#: ref-filter.c:1279
+#: ref-filter.c:1294
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD frånkopplat vid %s)"
@@ -2753,46 +2753,46 @@ msgstr "(HEAD frånkopplat vid %s)"
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #.
-#: ref-filter.c:1286
+#: ref-filter.c:1301
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD frånkopplat från %s)"
 
-#: ref-filter.c:1290
+#: ref-filter.c:1305
 msgid "(no branch)"
 msgstr "(ingen gren)"
 
-#: ref-filter.c:1439 ref-filter.c:1470
+#: ref-filter.c:1454 ref-filter.c:1485
 #, c-format
 msgid "missing object %s for %s"
 msgstr "objektet %s saknas för %s"
 
-#: ref-filter.c:1442 ref-filter.c:1473
+#: ref-filter.c:1457 ref-filter.c:1488
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer misslyckades på %s för %s"
 
-#: ref-filter.c:1773
+#: ref-filter.c:1788
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "felformat objekt vid \"%s\""
 
-#: ref-filter.c:1840
+#: ref-filter.c:1855
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ignorerar referens med trasigt namn %s"
 
-#: ref-filter.c:1845
+#: ref-filter.c:1860
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ignorerar trasig referens %s"
 
-#: ref-filter.c:2107
+#: ref-filter.c:2122
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: atomen %%(end) saknas"
 
-#: ref-filter.c:2201
+#: ref-filter.c:2216
 #, c-format
 msgid "malformed object name %s"
 msgstr "felformat objektnamn %s"
@@ -3500,13 +3500,8 @@ msgstr "kunde inte öppna \"%s\" för skrivning"
 
 #: sequencer.c:2561
 #, c-format
-msgid "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring."
-msgstr ""
-"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
-
-#: sequencer.c:2561
-#, c-format
-msgid "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
 
@@ -16425,6 +16420,14 @@ msgstr ""
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 
+#~ msgid "%%(trailers) does not take arguments"
+#~ msgstr "%%(trailers) tar inte argument"
+
+#~ msgid ""
+#~ "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring."
+#~ msgstr ""
+#~ "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
+
 #~ msgid "%"
 #~ msgid_plural "%"
 #~ msgstr[0] "%"