Skip to content

Commit 8535417

Browse files
committed
Merge branch '7.4' into 8.0
* 7.4: sync nb translations with no translations fix: added new indonesian translations Fix Norwegian translations - remove needs-review-translation status Update Luxembourgish translations by removing 'needs-review-translation' state from multiple entries in security and validator files. Improve Russian translations for video and image validators [Validator] it: approve video/image/Twig translations and fix spacing (refs #60464) [HttpFoundation] Deprecate HTTP method override for methods GET, HEAD, CONNECT and TRACE [Translation][sv] Remove needs-review on Swedish strings; align phrasing and punctuation [HttpFoundation] Add `Request::$allowedHttpMethodOverride` to list which HTTP methods can be overridden
2 parents a1ddd9a + 9906163 commit 8535417

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Resources/translations/validators.nb.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</trans-unit>
1313
<trans-unit id="30">
1414
<source>The CSRF token is invalid. Please try to resubmit the form.</source>
15-
<target state="needs-review-translation">CSRF-tokenen er ugyldig. Vennligst prøv å sende inn skjemaet på nytt.</target>
15+
<target>CSRF-tokenen er ugyldig. Vennligst prøv å sende inn skjemaet på nytt.</target>
1616
</trans-unit>
1717
<trans-unit id="99">
1818
<source>This value is not a valid HTML5 color.</source>

Resources/translations/validators.no.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</trans-unit>
1313
<trans-unit id="30">
1414
<source>The CSRF token is invalid. Please try to resubmit the form.</source>
15-
<target state="needs-review-translation">CSRF-tokenen er ugyldig. Vennligst prøv å sende inn skjemaet på nytt.</target>
15+
<target>CSRF-tokenen er ugyldig. Vennligst prøv å sende inn skjemaet på nytt.</target>
1616
</trans-unit>
1717
<trans-unit id="99">
1818
<source>This value is not a valid HTML5 color.</source>

0 commit comments

Comments
 (0)