diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
index 3bf3d5ed41..64f178cc39 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
@@ -2413,11 +2413,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
[@name="name"]
[@class="my&class form-control"]
[not(@required)]
- [./optgroup
- [@label="Europe"]
- [./option[@value="Europe/Vienna"][@selected="selected"][.="Vienna"]]
- ]
- [count(./optgroup)>10]
+ [.//option[@value="Europe/Vienna"][@selected="selected"]]
[count(.//option)>200]
'
);
@@ -2434,7 +2430,6 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
'/select
[@class="my&class form-control"]
[./option[@value=""][not(@selected)][not(@disabled)][.="[trans]Select&Timezone[/trans]"]]
- [count(./optgroup)>10]
[count(.//option)>201]
'
);
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 2b15bba32a..cee4b1d288 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -193,6 +193,8 @@ class FrameworkExtension extends Extension
'vscode' => 'vscode://file/%%f:%%l',
];
$ide = $config['ide'];
+ // mark any env vars found in the ide setting as used
+ $container->resolveEnvPlaceholders($ide);
$container->setParameter('templating.helper.code.file_link_format', str_replace('%', '%%', ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format')) ?: (isset($links[$ide]) ? $links[$ide] : $ide));
}
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
index 207d4ba7ae..5a391a2e66 100644
--- a/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
+++ b/src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
@@ -330,6 +330,38 @@
This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.このSWIFTコードはIBANコード（{{ iban }}）に関連付けられていません。
+
+ This value should be valid JSON.
+ JSONでなければなりません。
+
+
+ This collection should contain only unique elements.
+ 要素は重複してはなりません。
+
+
+ This value should be positive.
+ 正の数でなければなりません。
+
+
+ This value should be either positive or zero.
+ 正の数、または0でなければなりません。
+
+
+ This value should be negative.
+ 負の数でなければなりません。
+
+
+ This value should be either negative or zero.
+ 負の数、または0でなければなりません。
+
+
+ This value is not a valid timezone.
+ 有効なタイムゾーンではありません。
+
+
+ This password has been leaked in a data breach, it must not be used. Please use another password.
+ このパスワードは漏洩している為使用できません。
+
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf
index d5b57031b9..63ce95ab1b 100644
--- a/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf
+++ b/src/Symfony/Component/Validator/Resources/translations/validators.th.xlf
@@ -152,7 +152,7 @@