diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
index 25004e90fd..f33e3fe9d8 100644
--- a/src/Symfony/Bridge/Twig/Extension/FormExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -67,7 +67,7 @@ class FormExtension extends \Twig_Extension
     public function getTokenParsers()
     {
         return array(
-            // {% form_theme form "SomeBungle::widgets.twig" %}
+            // {% form_theme form "SomeBundle::widgets.twig" %}
             new FormThemeTokenParser(),
         );
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sr.xlf b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sr.xlf
index 1731177900..02ff856b97 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sr.xlf
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sr.xlf
@@ -126,6 +126,46 @@
                 <source>The two values should be equal</source>
                 <target>Обе вредности треба да буду једнаке</target>
             </trans-unit>
+            <trans-unit id="32">
+                <source>The file is too large. Allowed maximum size is {{ limit }}</source>
+                <target>Датотека је превелика. Највећа дозвољена величина је {{ limit }}</target>
+            </trans-unit>
+            <trans-unit id="33">
+                <source>The file is too large</source>
+                <target>Датотека је превелика</target>
+            </trans-unit>
+            <trans-unit id="34">
+                <source>The file could not be uploaded</source>
+                <target>Датотека не може бити отпремљена</target>
+            </trans-unit>
+            <trans-unit id="35">
+                <source>This value should be a valid number</source>
+                <target>Вредност треба да буде валидан број</target>
+            </trans-unit>
+            <trans-unit id="36">
+                <source>This file is not a valid image</source>
+                <target>Ова датотека није валидна слика</target>
+            </trans-unit>
+            <trans-unit id="37">
+                <source>This is not a valid IP address</source>
+                <target>Ово није валидна ИП адреса</target>
+            </trans-unit>
+            <trans-unit id="38">
+                <source>This value is not a valid language</source>
+                <target>Вредност није валидан језик</target>
+            </trans-unit>
+            <trans-unit id="39">
+                <source>This value is not a valid locale</source>
+                <target>Вредност није валидан локал</target>
+            </trans-unit>
+            <trans-unit id="40">
+                <source>This value is not a valid country</source>
+                <target>Вредност није валидна земља</target>
+            </trans-unit>
+            <trans-unit id="41">
+                <source>This value is already used</source>
+                <target>Вредност је већ искоришћена</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
\ No newline at end of file
diff --git a/tests/Symfony/Tests/Component/Locale/LocaleTest.php b/tests/Symfony/Tests/Component/Locale/LocaleTest.php
index a6ab32af0f..0155a521ca 100644
--- a/tests/Symfony/Tests/Component/Locale/LocaleTest.php
+++ b/tests/Symfony/Tests/Component/Locale/LocaleTest.php
@@ -11,12 +11,16 @@
 
 namespace Symfony\Tests\Component\Locale;
 
-use Symfony\Component\Locale\Locale;
+require_once __DIR__.'/TestCase.php';
 
-class LocaleTest extends \PHPUnit_Framework_TestCase
+use Symfony\Component\Locale\Locale;
+use Symfony\Tests\Component\Locale\TestCase as LocaleTestCase;
+
+class LocaleTest extends LocaleTestCase
 {
     public function testGetDisplayCountriesReturnsFullListForSubLocale()
     {
+        $this->skipIfIntlExtensionIsNotLoaded();
         $countriesDe = Locale::getDisplayCountries('de');
         $countriesDeCh = Locale::getDisplayCountries('de_CH');
 
@@ -27,6 +31,7 @@ class LocaleTest extends \PHPUnit_Framework_TestCase
 
     public function testGetDisplayLanguagesReturnsFullListForSubLocale()
     {
+        $this->skipIfIntlExtensionIsNotLoaded();
         $languagesDe = Locale::getDisplayLanguages('de');
         $languagesDeCh = Locale::getDisplayLanguages('de_CH');
 
@@ -37,6 +42,7 @@ class LocaleTest extends \PHPUnit_Framework_TestCase
 
     public function testGetDisplayLocalesReturnsFullListForSubLocale()
     {
+        $this->skipIfIntlExtensionIsNotLoaded();
         $localesDe = Locale::getDisplayLocales('de');
         $localesDeCh = Locale::getDisplayLocales('de_CH');