Skip to content

Commit 9b17af8

Browse files
Merge branch '5.4' into 6.0
* 5.4: (46 commits) move username/password fix to non-deprecated Connection class cs fix [VarDumper] Fix dumping twig templates found in exceptions do not replace definition arguments that have not been configured fix Console tests on Windows [Validator] Add translations for CIDR constraint [Dotenv] Fix testLoadEnv() to start from a fresh context [Console] Add completion to server:dump command bug #42194 [RateLimiter] fix: sliding window policy to use microtime [Validator] Update validators.sr_Cyrl.xlf [Validator] Update validators.sr_Latn.xlf Add suggestions for the option 'format' of lints commands: twig, yaml and xliff [VarDumper] Add support for Fiber uzb translation Update validators.uz.xlf Fix logging of impersonator introduced in 5.3 [Console] Add show proxified command class in completion debug skip command completion tests with older Symfony Console versions [Uid] Allow use autocompletion [Console] Add completion to messenger:setup-transports command ...
2 parents ac5675e + 6ef2b2b commit 9b17af8

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

Resources/translations/security.el.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</trans-unit>
4545
<trans-unit id="12">
4646
<source>Username could not be found.</source>
47-
<target>Το Username δε βρέθηκε.</target>
47+
<target>Το όνομα χρήστη δε βρέθηκε.</target>
4848
</trans-unit>
4949
<trans-unit id="13">
5050
<source>Account has expired.</source>

Resources/translations/security.uz.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,14 @@
7070
<source>Invalid or expired login link.</source>
7171
<target>Kirish havolasi yaroqsiz yoki muddati tugagan.</target>
7272
</trans-unit>
73+
<trans-unit id="19">
74+
<source>Too many failed login attempts, please try again in %minutes% minute.</source>
75+
<target>Kirish uchun muvaffaqiyatsiz urinishlar, %minutes% daqiqadan so'ng qayta urinib ko'ring.</target>
76+
</trans-unit>
77+
<trans-unit id="20">
78+
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
79+
<target>Kirish uchun muvaffaqiyatsiz urinishlar, %minutes% daqiqadan so'ng qayta urinib ko'ring.</target>
80+
</trans-unit>
7381
</body>
7482
</file>
7583
</xliff>

User/UserInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ interface UserInterface
3838
* return ['ROLE_USER'];
3939
* }
4040
*
41-
* Alternatively, the roles might be stored on a ``roles`` property,
41+
* Alternatively, the roles might be stored in a ``roles`` property,
4242
* and populated in any number of different ways when the user object
4343
* is created.
4444
*

0 commit comments

Comments
 (0)