Skip to content

Commit 03c80bd

Browse files
committed
Merge branch '4.2'
* 4.2: fix tests fix PHPUnit 4.8 compatibility [Debug] Fixed error handling when an error is already handled when another error is already handled (5) sync validator translations
2 parents c2f9643 + 062f879 commit 03c80bd

File tree

3 files changed

+39
-23
lines changed

3 files changed

+39
-23
lines changed

Resources/translations/validators.de.xlf

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -335,29 +335,33 @@
335335
<target>Dieser Wert sollte gültiges JSON sein.</target>
336336
</trans-unit>
337337
<trans-unit id="87">
338-
<source>This value should be positive.</source>
339-
<target>Dieser Wert sollte positiv sein.</target>
338+
<source>This collection should contain only unique elements.</source>
339+
<target>Diese Sammlung darf keine doppelten Elemente enthalten.</target>
340340
</trans-unit>
341341
<trans-unit id="88">
342-
<source>This value should be either positive or zero.</source>
343-
<target>Dieser Wert sollte entweder positiv oder 0 sein.</target>
342+
<source>This value should be positive.</source>
343+
<target>Diese Zahl sollte positiv sein.</target>
344344
</trans-unit>
345345
<trans-unit id="89">
346-
<source>This value should be negative.</source>
347-
<target>Dieser Wert sollte negativ sein.</target>
346+
<source>This value should be either positive or zero.</source>
347+
<target>Diese Zahl sollte entweder positiv oder 0 sein.</target>
348348
</trans-unit>
349349
<trans-unit id="90">
350-
<source>This value should be either negative or zero.</source>
351-
<target>Dieser Wert sollte entweder negativ oder 0 sein.</target>
350+
<source>This value should be negative.</source>
351+
<target>Diese Zahl sollte negativ sein.</target>
352352
</trans-unit>
353353
<trans-unit id="91">
354-
<source>This collection should contain only unique elements.</source>
355-
<target>Diese Sammlung darf keine doppelten Elemente enthalten.</target>
354+
<source>This value should be either negative or zero.</source>
355+
<target>Diese Zahl sollte entweder negativ oder 0 sein.</target>
356356
</trans-unit>
357357
<trans-unit id="92">
358358
<source>This value is not a valid timezone.</source>
359359
<target>Dieser Wert ist keine gültige Zeitzone.</target>
360360
</trans-unit>
361+
<trans-unit id="93">
362+
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
363+
<target>Dieses Passwort ist Teil eines Datenlecks, es darf nicht verwendet werden.</target>
364+
</trans-unit>
361365
</body>
362366
</file>
363367
</xliff>

Resources/translations/validators.en.xlf

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -335,29 +335,33 @@
335335
<target>This value should be valid JSON.</target>
336336
</trans-unit>
337337
<trans-unit id="87">
338+
<source>This collection should contain only unique elements.</source>
339+
<target>This collection should contain only unique elements.</target>
340+
</trans-unit>
341+
<trans-unit id="88">
338342
<source>This value should be positive.</source>
339343
<target>This value should be positive.</target>
340344
</trans-unit>
341-
<trans-unit id="88">
345+
<trans-unit id="89">
342346
<source>This value should be either positive or zero.</source>
343347
<target>This value should be either positive or zero.</target>
344348
</trans-unit>
345-
<trans-unit id="89">
349+
<trans-unit id="90">
346350
<source>This value should be negative.</source>
347351
<target>This value should be negative.</target>
348352
</trans-unit>
349-
<trans-unit id="90">
353+
<trans-unit id="91">
350354
<source>This value should be either negative or zero.</source>
351355
<target>This value should be either negative or zero.</target>
352356
</trans-unit>
353-
<trans-unit id="91">
354-
<source>This collection should contain only unique elements.</source>
355-
<target>This collection should contain only unique elements.</target>
356-
</trans-unit>
357357
<trans-unit id="92">
358358
<source>This value is not a valid timezone.</source>
359359
<target>This value is not a valid timezone.</target>
360360
</trans-unit>
361+
<trans-unit id="93">
362+
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
363+
<target>This password has been leaked in a data breach, it must not be used. Please use another password.</target>
364+
</trans-unit>
361365
</body>
362366
</file>
363367
</xliff>

Resources/translations/validators.vi.xlf

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -335,25 +335,33 @@
335335
<target>Giá trị này nên đúng định dạng JSON.</target>
336336
</trans-unit>
337337
<trans-unit id="87">
338+
<source>This collection should contain only unique elements.</source>
339+
<target>Danh sách này chỉ nên chứa các phần tử khác nhau.</target>
340+
</trans-unit>
341+
<trans-unit id="88">
338342
<source>This value should be positive.</source>
339343
<target>Giá trị này có thể thực hiện được.</target>
340344
</trans-unit>
341-
<trans-unit id="88">
345+
<trans-unit id="89">
342346
<source>This value should be either positive or zero.</source>
343347
<target>Giá trị này có thể thực hiện được hoặc bằng không.</target>
344348
</trans-unit>
345-
<trans-unit id="89">
349+
<trans-unit id="90">
346350
<source>This value should be negative.</source>
347351
<target>Giá trị này nên bị từ chối.</target>
348352
</trans-unit>
349-
<trans-unit id="90">
353+
<trans-unit id="91">
350354
<source>This value should be either negative or zero.</source>
351355
<target>Giá trị này nên bị từ chối hoặc bằng không.</target>
352356
</trans-unit>
353-
<trans-unit id="91">
354-
<source>This collection should contain only unique elements.</source>
355-
<target>Danh sách này chỉ nên chứa các phần tử khác nhau.</target>
357+
<trans-unit id="92">
358+
<source>This value is not a valid timezone.</source>
359+
<target>Giá trị này không phải là múi giờ hợp lệ.</target>
356360
</trans-unit>
361+
<trans-unit id="93">
362+
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
363+
<target>Mật khẩu này đã bị rò rỉ dữ liệu, không được sử dụng nữa. Xin vui lòng sử dụng mật khẩu khác.</target>
364+
</trans-unit>
357365
</body>
358366
</file>
359367
</xliff>

0 commit comments

Comments
 (0)