Skip to content

Commit 04a1e1e

Browse files
committed
Merge branch '2.3' into 2.4
* 2.3: Fixed typo [validator] throw an exception if isn't an instance of ConstraintValidatorInterface. Reset the box model to content-box in the web debug toolbar [FrameworkBundle] Allowed "0" as a checkbox value in the php template. raising delta on stopwatch as travis really breaks with less than 35 Switched to correct gender of "Token" fixed typos in several translations [HttpKernel] use static late binding when dumping out container
2 parents 77f7604 + 762e3c6 commit 04a1e1e

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Resources/translations/validators.de.xlf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
</trans-unit>
1313
<trans-unit id="30">
1414
<source>The CSRF token is invalid. Please try to resubmit the form.</source>
15-
<target>Das CSRF-Token ist ungültig. Versuchen Sie bitte das Formular erneut zu senden.</target>
15+
<target>Der CSRF-Token ist ungültig. Versuchen Sie bitte das Formular erneut zu senden.</target>
1616
</trans-unit>
1717
</body>
1818
</file>
19-
</xliff>
19+
</xliff>

Resources/translations/validators.es.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</trans-unit>
1313
<trans-unit id="30">
1414
<source>The CSRF token is invalid. Please try to resubmit the form.</source>
15-
<target>El token CSRF no es válido. Por favor, pruebe de enviar nuevamente el formulario</target>
15+
<target>El token CSRF no es válido. Por favor, pruebe de enviar nuevamente el formulario.</target>
1616
</trans-unit>
1717
</body>
1818
</file>

Resources/translations/validators.gl.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</trans-unit>
1313
<trans-unit id="30">
1414
<source>The CSRF token is invalid. Please try to resubmit the form.</source>
15-
<target>O token CSRF non é válido. Por favor, probe a enviar novamente o formulario</target>
15+
<target>O token CSRF non é válido. Por favor, probe a enviar novamente o formulario.</target>
1616
</trans-unit>
1717
</body>
1818
</file>

Resources/translations/validators.ja.xlf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<body>
55
<trans-unit id="28">
66
<source>This form should not contain extra fields.</source>
7-
<target>フィールドグループに追加のフィールドを含んではなりません.</target>
7+
<target>フィールドグループに追加のフィールドを含んではなりません</target>
88
</trans-unit>
99
<trans-unit id="29">
1010
<source>The uploaded file was too large. Please try to upload a smaller file.</source>
11-
<target>アップロードされたファイルが大きすぎます。小さなファイルで再度アップロードしてください.</target>
11+
<target>アップロードされたファイルが大きすぎます。小さなファイルで再度アップロードしてください</target>
1212
</trans-unit>
1313
<trans-unit id="30">
1414
<source>The CSRF token is invalid.</source>
15-
<target>CSRFトークンが無効です.</target>
15+
<target>CSRFトークンが無効です</target>
1616
</trans-unit>
1717
</body>
1818
</file>

0 commit comments

Comments
 (0)