Merge branch '3.1' into 3

composer.json

@@ -2,14 +2,20 @@
     "name": "silverstripe/spamprotection",
     "description": "Spam protection module for SilverStripe.",
     "type": "silverstripe-vendormodule",
-    "keywords": ["silverstripe", "spamprotection"],
-    "authors": [{
+    "keywords": [
+        "silverstripe",
+        "spamprotection"
+    ],
+    "authors": [
+        {
             "name": "Saophalkun Ponlu",
             "email": "phalkunz@silverstripe.com"
-    }, {
+        },
+        {
             "name": "Will Rossiter",
             "email": "will@fullscreen.io"
-    }],
+        }
+    ],
     "require": {
         "silverstripe/framework": "^4.0"
     },
@@ -21,10 +27,7 @@
     "extra": {
         "expose": [
             "images"
-        ],
-        "branch-alias": {
-            "dev-master": "3.x-dev"
-        }
+        ]
     },
     "autoload": {
         "psr-4": {

lang/da.yml

@@ -0,0 +1,9 @@
+da:
+  SilverStripe\SpamProtection\EditableSpamProtectionField:
+    PLURALNAME: 'Spam beskyttelsefelter'
+    PLURALS:
+      one: 'Et spam beskyttelsefelt'
+      other: '{count} Spambeskyttelsefelter'
+    SINGULARNAME: 'Spam beskyttelsesfelt'
+    SPAMFIELDMAPPING: 'Spam felt mapping'
+    SPAMFIELDMAPPINGDESCRIPTION: 'Vælg de formfelter der matcher relevante spam beskyttelses identifikatorer'

lang/de.yml

@@ -1,6 +1,9 @@
 de:
   SilverStripe\SpamProtection\EditableSpamProtectionField:
     PLURALNAME: Spamschutzfelder
+    PLURALS:
+      one: 'Ein Spamschutzfeld'
+      other: '{count} Spamschutzfelder'
     SINGULARNAME: Spamschutzfeld
     SPAMFIELDMAPPING: 'Spamschutzfeld Zuordnung'
     SPAMFIELDMAPPINGDESCRIPTION: 'Wähle die Formularfelder, die mit Spamschutz verbunden sind'

lang/eo.yml

@@ -1,6 +1,9 @@
 eo:
   SilverStripe\SpamProtection\EditableSpamProtectionField:
     PLURALNAME: 'Spamprotektaj kampoj'
+    PLURALS:
+      one: 'Unu spamprotekta kampo'
+      other: '{count} spamprotektaj kampoj'
     SINGULARNAME: 'Spamprotekta kampo'
     SPAMFIELDMAPPING: 'Spamkampa mapigo'
     SPAMFIELDMAPPINGDESCRIPTION: 'Elektu la kampojn kiuj rilatas al eventualaj rilataj spamprotektaj identigiloj'

lang/fi.yml

@@ -1,6 +1,9 @@
 fi:
   SilverStripe\SpamProtection\EditableSpamProtectionField:
     PLURALNAME: 'Roskapostisuojauksen kentät'
+    PLURALS:
+      one: 'Roskapostin suodatuskenttä'
+      other: '{count} Roskapostin suodatuskenttää'
     SINGULARNAME: 'Roskapostisuojauksen kenttä'
     SPAMFIELDMAPPING: 'Roskapostikentän kuvaus'
     SPAMFIELDMAPPINGDESCRIPTION: 'Valitse lomakekenttä, joka vastaa mitä tahansa oleellista roskapostisuodatuksen tunnistetta'

lang/fi_FI.yml

@@ -1,6 +1,9 @@
 fi_FI:
   SilverStripe\SpamProtection\EditableSpamProtectionField:
-    PLURALNAME: 'Roskapostisuotimen kentät'
-    SINGULARNAME: 'Roskapostisuotimen kenttä'
+    PLURALNAME: 'Roskapostisuojauksen kentät'
+    PLURALS:
+      one: 'Roskapostin suodatuskenttä'
+      other: '{count} Roskapostin suodatuskenttää'
+    SINGULARNAME: 'Roskapostisuojauksen kenttä'
     SPAMFIELDMAPPING: 'Roskapostikentän kuvaus'
-    SPAMFIELDMAPPINGDESCRIPTION: 'Valitse lomakekentät, jotka vastaavat mitä tahansa oleellista roskapostisuotimen tunnistetta'
+    SPAMFIELDMAPPINGDESCRIPTION: 'Valitse lomakekenttä, joka vastaa mitä tahansa oleellista roskapostisuodatuksen tunnistetta'

lang/nl.yml

@@ -0,0 +1,9 @@
+nl:
+  SilverStripe\SpamProtection\EditableSpamProtectionField:
+    PLURALNAME: 'Anti-spam velden'
+    PLURALS:
+      one: 'Een anti-spam veld'
+      other: '{count} Anti-spam velden'
+    SINGULARNAME: 'Anti-spam veld'
+    SPAMFIELDMAPPING: 'Spam-velden koppelen'
+    SPAMFIELDMAPPINGDESCRIPTION: 'Kies de velden die overeenkomen met de anti-spam identifiers'

lang/sl.yml

@@ -0,0 +1,4 @@
+sl:
+  SilverStripe\SpamProtection\EditableSpamProtectionField:
+    PLURALNAME: 'Polja za zaščito pred neželeno pošto'
+    SINGULARNAME: 'Polje za zaščito pred neželeno pošto'