Skip to content

Commit 0d83ae4

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: relax assertions in tests [Validator] Translate messages into Japanese Fix Thai translation in validators.th.xlf [FramworkBundle] mark any env vars found in the ide setting as used
2 parents a643230 + cc3f577 commit 0d83ae4

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed

Resources/translations/validators.ja.xlf

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,38 @@
330330
<source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
331331
<target>このSWIFTコードはIBANコード({{ iban }})に関連付けられていません。</target>
332332
</trans-unit>
333+
<trans-unit id="86">
334+
<source>This value should be valid JSON.</source>
335+
<target>JSONでなければなりません。</target>
336+
</trans-unit>
337+
<trans-unit id="87">
338+
<source>This collection should contain only unique elements.</source>
339+
<target>要素は重複してはなりません。</target>
340+
</trans-unit>
341+
<trans-unit id="88">
342+
<source>This value should be positive.</source>
343+
<target>正の数でなければなりません。</target>
344+
</trans-unit>
345+
<trans-unit id="89">
346+
<source>This value should be either positive or zero.</source>
347+
<target>正の数、または0でなければなりません。</target>
348+
</trans-unit>
349+
<trans-unit id="90">
350+
<source>This value should be negative.</source>
351+
<target>負の数でなければなりません。</target>
352+
</trans-unit>
353+
<trans-unit id="91">
354+
<source>This value should be either negative or zero.</source>
355+
<target>負の数、または0でなければなりません。</target>
356+
</trans-unit>
357+
<trans-unit id="92">
358+
<source>This value is not a valid timezone.</source>
359+
<target>有効なタイムゾーンではありません。</target>
360+
</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>このパスワードは漏洩している為使用できません。</target>
364+
</trans-unit>
333365
</body>
334366
</file>
335367
</xliff>

Resources/translations/validators.th.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
</trans-unit>
153153
<trans-unit id="41">
154154
<source>This value is already used.</source>
155-
<target>Tค่านี้ถูกใช้งานไปแล้ว</target>
155+
<target>ค่านี้ถูกใช้งานไปแล้ว</target>
156156
</trans-unit>
157157
<trans-unit id="42">
158158
<source>The size of the image could not be detected.</source>

0 commit comments

Comments
 (0)