Skip to content

Commit 7e1bcce

Browse files
Merge branch '5.1' into 5.2
* 5.1: µCS fix CS fix CS fix [travis] use PHP 8.0 to patch return types and run deps=low Add me as a Notifier code owner Update sl_SI translations Don't trigger deprecation for deprecated aliases pointing to deprecated definitions [HttpFoundation] use atomic writes in MockFileSessionStorage Make EmailMessage & SmsMessage transport nullable remove unused argument [DI] fix param annotation [Config] Add \Symfony\Component\Config\Loader::load() return type Simplify PHP CS Fixer config Rename normalize param
2 parents 72388f6 + 1470f27 commit 7e1bcce

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

Resources/translations/validators.sl.xlf

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,26 @@
366366
<source>This value should be between {{ min }} and {{ max }}.</source>
367367
<target>Ta vrednost bi morala biti med {{ min }} in {{ max }}.</target>
368368
</trans-unit>
369+
<trans-unit id="95">
370+
<source>This value is not a valid hostname.</source>
371+
<target>Ta vrednost ni veljavno ime gostitelja.</target>
372+
</trans-unit>
373+
<trans-unit id="96">
374+
<source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
375+
<target>Število elementov v tej zbirki bi moralo biti mnogokratnik {{ compared_value }}.</target>
376+
</trans-unit>
377+
<trans-unit id="97">
378+
<source>This value should satisfy at least one of the following constraints:</source>
379+
<target>Ta vrednost bi morala zadostiti vsaj eni izmed sledečih omejitev:</target>
380+
</trans-unit>
381+
<trans-unit id="98">
382+
<source>Each element of this collection should satisfy its own set of constraints.</source>
383+
<target>Vsak element te zbirke bi moral zadostiti svojemu lastnemu naboru omejitev.</target>
384+
</trans-unit>
385+
<trans-unit id="99">
386+
<source>This value is not a valid International Securities Identification Number (ISIN).</source>
387+
<target>Ta vrednost ni veljavna mednarodna identifikacijska koda vrednostnih papirjev (ISIN).</target>
388+
</trans-unit>
369389
</body>
370390
</file>
371391
</xliff>

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"symfony/property-access": "^4.4|^5.0",
4141
"symfony/property-info": "^4.4|^5.0",
4242
"symfony/translation": "^4.4|^5.0",
43-
"doctrine/annotations": "~1.7",
43+
"doctrine/annotations": "^1.10.4",
4444
"doctrine/cache": "~1.0",
4545
"egulias/email-validator": "^2.1.10"
4646
},

0 commit comments

Comments
 (0)