Skip to content

Commit 844f694

Browse files
Merge branch '4.4' into 5.3
* 4.4: [Validator] Add translations for CIDR constraint [Dotenv] Fix testLoadEnv() to start from a fresh context [Validator] Update validators.sr_Cyrl.xlf [Validator] Update validators.sr_Latn.xlf uzb translation Update validators.uz.xlf [Validator] Fix typos in Latvian translations [Messenger] Fix Redis Transport when username is empty
2 parents 9f3aec5 + 979a9d3 commit 844f694

File tree

8 files changed

+47
-3
lines changed

8 files changed

+47
-3
lines changed

Resources/translations/validators.de.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,14 @@
394394
<source>This value is not a valid CSS color.</source>
395395
<target>Dieser Wert ist keine gültige CSS-Farbe.</target>
396396
</trans-unit>
397+
<trans-unit id="102">
398+
<source>This value is not a valid CIDR notation.</source>
399+
<target>Dieser Wert entspricht nicht der CIDR-Notation.</target>
400+
</trans-unit>
401+
<trans-unit id="103">
402+
<source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
403+
<target>Der Wert der Subnetzmaske sollte zwischen {{ min }} und {{ max }} liegen.</target>
404+
</trans-unit>
397405
</body>
398406
</file>
399407
</xliff>

Resources/translations/validators.en.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,14 @@
394394
<source>This value is not a valid CSS color.</source>
395395
<target>This value is not a valid CSS color.</target>
396396
</trans-unit>
397+
<trans-unit id="102">
398+
<source>This value is not a valid CIDR notation.</source>
399+
<target>This value is not a valid CIDR notation.</target>
400+
</trans-unit>
401+
<trans-unit id="103">
402+
<source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
403+
<target>The value of the netmask should be between {{ min }} and {{ max }}.</target>
404+
</trans-unit>
397405
</body>
398406
</file>
399407
</xliff>

Resources/translations/validators.fr.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,14 @@
394394
<source>This value is not a valid CSS color.</source>
395395
<target>Cette valeur n'est pas une couleur CSS valide.</target>
396396
</trans-unit>
397+
<trans-unit id="102">
398+
<source>This value is not a valid CIDR notation.</source>
399+
<target>Cette valeur n'est pas une notation CIDR valide.</target>
400+
</trans-unit>
401+
<trans-unit id="103">
402+
<source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
403+
<target>La valeur du masque de réseau doit être comprise entre {{ min }} et {{ max }}.</target>
404+
</trans-unit>
397405
</body>
398406
</file>
399407
</xliff>

Resources/translations/validators.lv.xlf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,15 +340,15 @@
340340
</trans-unit>
341341
<trans-unit id="88">
342342
<source>This value should be positive.</source>
343-
<target>Šai vērtībāi jābūt pozitīvai.</target>
343+
<target>Šai vērtībai jābūt pozitīvai.</target>
344344
</trans-unit>
345345
<trans-unit id="89">
346346
<source>This value should be either positive or zero.</source>
347-
<target>Šai vērtībāi jābūt pozitīvai vai vienādai ar nulli.</target>
347+
<target>Šai vērtībai jābūt pozitīvai vai vienādai ar nulli.</target>
348348
</trans-unit>
349349
<trans-unit id="90">
350350
<source>This value should be negative.</source>
351-
<target>Šai vērtībāi jābūt negatīvai.</target>
351+
<target>Šai vērtībai jābūt negatīvai.</target>
352352
</trans-unit>
353353
<trans-unit id="91">
354354
<source>This value should be either negative or zero.</source>

Resources/translations/validators.ro.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,14 @@
390390
<source>This value should be a valid expression.</source>
391391
<target>Această valoare ar trebui să fie o expresie validă.</target>
392392
</trans-unit>
393+
<trans-unit id="102">
394+
<source>This value is not a valid CIDR notation.</source>
395+
<target>Această valoare nu este o notație CIDR validă.</target>
396+
</trans-unit>
397+
<trans-unit id="103">
398+
<source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
399+
<target>Valoarea netmask-ului trebuie sa fie intre {{ min }} si {{ max }}.</target>
400+
</trans-unit>
393401
</body>
394402
</file>
395403
</xliff>

Resources/translations/validators.sr_Cyrl.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,10 @@
390390
<source>This value should be a valid expression.</source>
391391
<target>Ова вредност треба да буде валидан израз.</target>
392392
</trans-unit>
393+
<trans-unit id="101">
394+
<source>This value is not a valid CSS color.</source>
395+
<target>Ова вредност није исправна CSS боја.</target>
396+
</trans-unit>
393397
</body>
394398
</file>
395399
</xliff>

Resources/translations/validators.sr_Latn.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,10 @@
390390
<source>This value should be a valid expression.</source>
391391
<target>Ova vrednost treba da bude validan izraz.</target>
392392
</trans-unit>
393+
<trans-unit id="101">
394+
<source>This value is not a valid CSS color.</source>
395+
<target>Ova vrednost nije ispravna CSS boja.</target>
396+
</trans-unit>
393397
</body>
394398
</file>
395399
</xliff>

Resources/translations/validators.uz.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,10 @@
390390
<source>This value should be a valid expression.</source>
391391
<target>Ushbu qiymat to'g'ri ifoda bo'lishi kerak.</target>
392392
</trans-unit>
393+
<trans-unit id="101">
394+
<source>This value is not a valid CSS color.</source>
395+
<target>Bu qiymat haqiqiy CSS rangi emas.</target>
396+
</trans-unit>
393397
</body>
394398
</file>
395399
</xliff>

0 commit comments

Comments
 (0)