Merge branch '2.4'

fabpot · fabpot · commit 488409f4397b · 2013-12-12T17:07:18.000+01:00
* 2.4:
  [Debug] fixed tests
  ErrorHandlerTest: restore_error_handler() on assertion failure
  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"
  bumped Symfony version to 2.4.1
  updated VERSION for 2.4.0
  updated CHANGELOG for 2.4.0
  fixed typos in several translations
  [HttpKernel] use static late binding when dumping out container

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
diff --git a/Resources/translations/validators.de.xlf b/Resources/translations/validators.de.xlf
@@ -12,8 +12,8 @@
             </trans-unit>
             <trans-unit id="30">
                 <source>The CSRF token is invalid. Please try to resubmit the form.</source>
-                <target>Das CSRF-Token ist ungültig. Versuchen Sie bitte das Formular erneut zu senden.</target>
+                <target>Der CSRF-Token ist ungültig. Versuchen Sie bitte das Formular erneut zu senden.</target>
             </trans-unit>
         </body>
     </file>
-</xliff>
+</xliff>
diff --git a/Resources/translations/validators.es.xlf b/Resources/translations/validators.es.xlf
@@ -12,7 +12,7 @@
             </trans-unit>
             <trans-unit id="30">
                 <source>The CSRF token is invalid. Please try to resubmit the form.</source>
-                <target>El token CSRF no es válido. Por favor, pruebe de enviar nuevamente el formulario</target>
+                <target>El token CSRF no es válido. Por favor, pruebe de enviar nuevamente el formulario.</target>
             </trans-unit>
         </body>
     </file>
diff --git a/Resources/translations/validators.gl.xlf b/Resources/translations/validators.gl.xlf
@@ -12,7 +12,7 @@
             </trans-unit>
             <trans-unit id="30">
                 <source>The CSRF token is invalid. Please try to resubmit the form.</source>
-                <target>O token CSRF non é válido. Por favor, probe a enviar novamente o formulario</target>
+                <target>O token CSRF non é válido. Por favor, probe a enviar novamente o formulario.</target>
             </trans-unit>
         </body>
     </file>
diff --git a/Resources/translations/validators.ja.xlf b/Resources/translations/validators.ja.xlf
@@ -4,15 +4,15 @@
         <body>
             <trans-unit id="28">
                 <source>This form should not contain extra fields.</source>
-                <target>フィールドグループに追加のフィールドを含んではなりません.</target>
+                <target>フィールドグループに追加のフィールドを含んではなりません。</target>
             </trans-unit>
             <trans-unit id="29">
                 <source>The uploaded file was too large. Please try to upload a smaller file.</source>
-                <target>アップロードされたファイルが大きすぎます。小さなファイルで再度アップロードしてください.</target>
+                <target>アップロードされたファイルが大きすぎます。小さなファイルで再度アップロードしてください。</target>
             </trans-unit>
             <trans-unit id="30">
                 <source>The CSRF token is invalid.</source>
-                <target>CSRFトークンが無効です.</target>
+                <target>CSRFトークンが無効です。</target>
             </trans-unit>
         </body>
     </file>
