Merge branch '4.4' into 5.4

* 4.4: [Validator] [Security] Add Norwegian translations add tests covering union types in MessengerPass [HttpFoundation] Prevent BinaryFileResponse::prepare from adding content type if no content is sent
symfony · Sep 17, 2022 · 71bc477 · 71bc477
2 parents 662f1f3 + 71aaf5a
commit 71bc477
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/Resources/translations/security.nb.xlf b/Resources/translations/security.nb.xlf
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>Ugyldig eller utløpt påloggingskobling.</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>For mange mislykkede påloggingsforsøk, prøv igjen om %minutes% minutt.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>For mange mislykkede påloggingsforsøk, prøv igjen om %minutes% minutter.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Resources/translations/security.no.xlf b/Resources/translations/security.no.xlf
@@ -70,6 +70,14 @@
                 <source>Invalid or expired login link.</source>
                 <target>Ugyldig eller utløpt påloggingskobling.</target>
             </trans-unit>
+            <trans-unit id="19">
+                <source>Too many failed login attempts, please try again in %minutes% minute.</source>
+                <target>For mange mislykkede påloggingsforsøk, prøv igjen om %minutes% minutt.</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
+                <target>For mange mislykkede påloggingsforsøk, prøv igjen om %minutes% minutter.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>