Merge b1a8445a75 into 38d168bd01

_config.php

@@ -8,4 +8,4 @@
  *
  * @package spamprotection
  */
-Deprecation::notification_version('1.1', 'spamprotection');
+Deprecation::notification_version('1.1', 'spamprotection');

composer.json

@@ -1,25 +1,27 @@
 {
-	"name": "silverstripe/spamprotection",
-	"description": "Spam protection module for SilverStripe.",
-	"type": "silverstripe-module",
-	"keywords": ["silverstripe", "spamprotection"],
-	"authors": [{
-		"name": "Saophalkun Ponlu",
-		"email": "phalkunz@silverstripe.com"
-	}, {
-		"name": "Will Rossiter",
-		"email": "will@fullscreen.io"
-	}],
-	"require": {
-		"silverstripe/framework": "~3.1"
-	},
-	"require-dev": {
-		"phpunit/PHPUnit": "~3.7@stable"
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "2.0.x-dev"
-		}
-	},
-	"license": "BSD-3-Clause"
-}
+    "name": "silverstripe/spamprotection",
+    "description": "Spam protection module for SilverStripe.",
+    "type": "silverstripe-module",
+    "keywords": [
+        "silverstripe",
+        "spamprotection"
+    ],
+    "authors": [
+        {
+            "name": "Saophalkun Ponlu",
+            "email": "phalkunz@silverstripe.com"
+        },
+        {
+            "name": "Will Rossiter",
+            "email": "will@fullscreen.io"
+        }
+    ],
+    "require": {
+        "silverstripe/framework": "~3.1"
+    },
+    "require-dev": {
+        "phpunit/PHPUnit": "~3.7@stable"
+    },
+    "extra": [],
+    "license": "BSD-3-Clause"
+}

lang/de.yml

@@ -1,6 +1,6 @@
 de:
   EditableSpamProtectionField:
-    PLURALNAME: 'Spamschutzfelder'
-    SINGULARNAME: 'Spamschutzfeld'
+    PLURALNAME: Spamschutzfelder
+    SINGULARNAME: Spamschutzfeld
     SPAMFIELDMAPPING: 'Spamschutzfeld Zuordnung'
     SPAMFIELDMAPPINGDESCRIPTION: 'Wähle die Formularfelder, die mit Spamschutz verbunden sind'

lang/ru.yml

@@ -3,3 +3,4 @@ ru:
     PLURALNAME: 'Поля защиты от спама'
     SINGULARNAME: 'Поле защиты от спама'
     SPAMFIELDMAPPING: 'Привязка полей для защиты от спама'
+    SPAMFIELDMAPPINGDESCRIPTION: 'Выберите поля формы, которые соответствуют любому индентификатору защиты от спама'