Skip to content

Commit 3359629

Browse files
committed
Merge branch '5.1' into 5.2
* 5.1: [HttpFoundation] Removed obsolete test. [HttpFoundation] Fix TypeError: Argument 1 passed to JsonResponse::setJson() must be of the type string, object given [Security][Validator] Add missing Portuguese translations Add Croatian (hr) translations
2 parents 030d56f + e519029 commit 3359629

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

Resources/translations/security.hr.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@
6262
<source>Account is locked.</source>
6363
<target>Račun je zaključan.</target>
6464
</trans-unit>
65+
<trans-unit id="17">
66+
<source>Too many failed login attempts, please try again later.</source>
67+
<target>Previše neuspjelih pokušaja prijave, molim pokušajte ponovo kasnije.</target>
68+
</trans-unit>
69+
<trans-unit id="18">
70+
<source>Invalid or expired login link.</source>
71+
<target>Link za prijavu je isteako ili je neispravan.</target>
72+
</trans-unit>
6573
</body>
6674
</file>
6775
</xliff>

Resources/translations/security.pt.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@
6262
<source>Account is locked.</source>
6363
<target>A conta está trancada.</target>
6464
</trans-unit>
65+
<trans-unit id="17">
66+
<source>Too many failed login attempts, please try again later.</source>
67+
<target>Várias tentativas de login falhadas, por favor tente mais tarde.</target>
68+
</trans-unit>
69+
<trans-unit id="18">
70+
<source>Invalid or expired login link.</source>
71+
<target>Ligação de login inválida ou expirada.</target>
72+
</trans-unit>
6573
</body>
6674
</file>
6775
</xliff>

0 commit comments

Comments
 (0)