Merge branch '2.3' into 2.7

* 2.3:
  Fixed the wrong source name and the ja translation
  [SecurityBundle] disable the init:acl command if ACL is not used
  [DI] remove useless condition around unset

Author: fabpot

src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php

@@ -23,6 +23,18 @@
  */
 class InitAclCommand extends ContainerAwareCommand
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function isEnabled()
+    {
+        if (!$this->getContainer()->has('security.acl.dbal.connection')) {
+            return false;
+        }
+
+        return parent::isEnabled();
+    }
+
     /**
      * {@inheritdoc}
      */

src/Symfony/Component/DependencyInjection/Container.php

@@ -305,10 +305,7 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
                 $service = $this->$method();
             } catch (\Exception $e) {
                 unset($this->loading[$id]);
-
-                if (array_key_exists($id, $this->services)) {
-                    unset($this->services[$id]);
-                }
+                unset($this->services[$id]);
 
                 if ($e instanceof InactiveScopeException && self::EXCEPTION_ON_INVALID_REFERENCE !== $invalidBehavior) {
                     return;

src/Symfony/Component/DependencyInjection/Definition.php

@@ -495,9 +495,7 @@ public function hasTag($name)
      */
     public function clearTag($name)
     {
-        if (isset($this->tags[$name])) {
-            unset($this->tags[$name]);
-        }
+        unset($this->tags[$name]);
 
         return $this;
     }

src/Symfony/Component/Form/Resources/translations/validators.ja.xlf

@@ -11,8 +11,8 @@
                 <target>アップロードされたファイルが大きすぎます。小さなファイルで再度アップロードしてください。</target>
             </trans-unit>
             <trans-unit id="30">
-                <source>The CSRF token is invalid.</source>
-                <target>CSRFトークンが無効です。</target>
+                <source>The CSRF token is invalid. Please try to resubmit the form.</source>
+                <target>CSRFトークンが無効です、再送信してください。</target>
             </trans-unit>
         </body>
     </file>