Skip to content

Commit d058598

Browse files
committed
Merge branch '5.1' into 5.2
* 5.1: Remove void return type from test methods Added basque translations Updated Luxembourgish translations [Mailer] Fix parsing Dsn with empty user/password Normalize exceptions messages containing methods references [Ldap] Incorrect determination of RelativeDistinguishedName for the "move" operation
2 parents bab6277 + fb6337d commit d058598

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

Resources/translations/security.eu.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>Kontua blokeatuta dago.</target>
6464
</trans-unit>
65+
<trans-unit id="17">
66+
<source>Too many failed login attempts, please try again later.</source>
67+
<target>Saioa hasteko saio huts gehiegi, saiatu berriro geroago.</target>
68+
</trans-unit>
69+
<trans-unit id="18">
70+
<source>Invalid or expired login link.</source>
71+
<target>Sartzeko esteka baliogabea edo iraungia.</target>
72+
</trans-unit>
6573
</body>
6674
</file>
6775
</xliff>

Resources/translations/security.lb.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>De Konto ass gespaart.</target>
6464
</trans-unit>
65+
<trans-unit id="17">
66+
<source>Too many failed login attempts, please try again later.</source>
67+
<target>Ze vill mësslonge Login-Versich, w.e.g. méi spéit nach emol probéieren.</target>
68+
</trans-unit>
69+
<trans-unit id="18">
70+
<source>Invalid or expired login link.</source>
71+
<target>Ongëltegen oder ofgelafene Login-Link.</target>
72+
</trans-unit>
6573
</body>
6674
</file>
6775
</xliff>

0 commit comments

Comments
 (0)