Merge branch 'master' into settings-bundle

translations/messages.en.xlf

@@ -3587,7 +3587,7 @@ Sub elements will be moved upwards.]]></target>
       <segment>
         <source>tfa_google.disable.confirm_message</source>
         <target><![CDATA[If you disable the Authenticator App, all backup codes will be deleted, so you may need to reprint them.<br>
-Also note that without two-factor authentication your account is not as well protected against attackers!]]></target>
+Also note that without two-factor authentication, your account is no longer as well protected against attackers!]]></target>
       </segment>
     </unit>
     <unit id="VYOAO2c" name="tfa_google.disabled_message">
@@ -3617,7 +3617,7 @@ Also note that without two-factor authentication your account is not as well pro
       </notes>
       <segment>
         <source>tfa_google.step.scan</source>
-        <target>Scan the adjoining QR Code with the app or enter the data manually</target>
+        <target>Scan the adjacent QR Code with the app or enter the data manually</target>
       </segment>
     </unit>
     <unit id="A9Ex8CO" name="tfa_google.step.input_code">

translations/security.nl.xlf

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:2.0" version="2.0" srcLang="en" trgLang="nl">
+  <file id="security.en">
+    <unit id="aazoCks" name="user.login_error.user_disabled">
+      <segment state="translated">
+        <source>user.login_error.user_disabled</source>
+        <target>Uw account is gedeactiveerd! Neem contact op met een beheerder indien dit incorrect is.</target>
+      </segment>
+    </unit>
+    <unit id="Dpb9AmY" name="saml.error.cannot_login_local_user_per_saml">
+      <segment state="translated">
+        <source>saml.error.cannot_login_local_user_per_saml</source>
+        <target>U kunt niet inloggen als lokale gebruiker met SSO! Gebruik uw lokale wachtwoord.</target>
+      </segment>
+    </unit>
+  </file>
+</xliff>

translations/validators.en.xlf

@@ -353,5 +353,11 @@
         <target>Invalid file size format. Use an integer number plus K, M, G as suffix for Kilo, Mega or Gigabytes.</target>
       </segment>
     </unit>
+    <unit id="iXcU7ce" name="validator.invalid_range">
+      <segment>
+        <source>validator.invalid_range</source>
+        <target>The given range is not valid!</target>
+      </segment>
+    </unit>
   </file>
 </xliff>