Merge remote-tracking branch 'upstream/master'

Conflicts:
	DependencyInjection/Configuration.php

DependencyInjection/Configuration.php

@@ -45,6 +45,7 @@ class Configuration implements ConfigurationInterface
                 ->arrayNode('text_color')->prototype('scalar')->end()->end()
                 ->arrayNode('background_color')->prototype('scalar')->end()->end()
                 ->arrayNode('background_images')->prototype('scalar')->end()->end()
+                ->scalarNode('disabled')->defaultValue(false)->end()
                 ->scalarNode('ignore_all_effects')->defaultValue(false)->end()
             ->end()
         ;

README.md

@@ -123,6 +123,8 @@ You can define the following configuration options globally or on the CaptchaTyp
 
 * **width**: the width of the captcha image (default=120)
 * **height**: the height of the captcha image (default=40)
+* **disabled**: disable globally the CAPTCHAs (can be useful in dev environment), it will
+  still appear but won't be editable and won't be checked
 * **length**: the length of the captcha (number of chars, default 5)
 * **quality**: jpeg quality of captchas (default=15)
 * **charset**: the charset used for code generation (default=abcdefhjkmnprstuvwxyz23456789)

Resources/translations/gregwar_captcha.cs.yml

@@ -0,0 +1 @@
+Renew: Obnovit

Resources/translations/gregwar_captcha.en.yml

@@ -0,0 +1 @@
+Renew: Renew

Resources/translations/gregwar_captcha.nl.yml

@@ -0,0 +1 @@
+Renew: Vernieuwen

Resources/translations/gregwar_captcha.pt_BR.yml

@@ -0,0 +1 @@
+Renew: Regerar

Resources/translations/validators.cs.yml

@@ -0,0 +1 @@
+Bad code value: Špatný kontrolní kód

Resources/translations/validators.en.yml

@@ -0,0 +1 @@
+Bad code value: Code does not match

Resources/translations/validators.nl.yml

@@ -0,0 +1 @@
+Bad code value: Code komt niet overeen

Resources/translations/validators.pt_BR.yml

@@ -0,0 +1 @@
+Bad code value: Código de verificação inválido

composer.json

@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "gregwar/captcha": "v1.0.8"
+        "gregwar/captcha": "v1.0.11"
     },
     "autoload": {
         "psr-0": {