diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 4a6d02b374..14dc6f07a6 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -368,7 +368,7 @@ Form
```php
class MyTimezoneType extends TimezoneType
{
- public function loadChoices()
+ public function loadChoiceList()
{
// override the method
}
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php
index 39bcf4dada..d18d2a92f0 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php
@@ -119,7 +119,7 @@ class GuardAuthenticationFactory implements SecurityFactoryInterface
// we have multiple entry points - we must ask them to configure one
throw new \LogicException(sprintf(
- 'Because you have multiple guard configurators, you need to set the "guard.entry_point" key to one of you configurators (%s)',
+ 'Because you have multiple guard configurators, you need to set the "guard.entry_point" key to one of your configurators (%s)',
implode(', ', $authenticatorIds)
));
}
diff --git a/src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php b/src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php
index 9443f21664..9997a7b0ec 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php
@@ -158,7 +158,7 @@ abstract class AbstractEventDispatcherTest extends TestCase
// be executed
// Manually set priority to enforce $this->listener to be called first
$this->dispatcher->addListener('post.foo', array($this->listener, 'postFoo'), 10);
- $this->dispatcher->addListener('post.foo', array($otherListener, 'preFoo'));
+ $this->dispatcher->addListener('post.foo', array($otherListener, 'postFoo'));
$this->dispatcher->dispatch(self::postFoo);
$this->assertTrue($this->listener->postFooInvoked);
$this->assertFalse($otherListener->postFooInvoked);
diff --git a/src/Symfony/Component/Form/Resources/translations/validators.da.xlf b/src/Symfony/Component/Form/Resources/translations/validators.da.xlf
index c2dd4601f9..f52f4e0a30 100644
--- a/src/Symfony/Component/Form/Resources/translations/validators.da.xlf
+++ b/src/Symfony/Component/Form/Resources/translations/validators.da.xlf
@@ -8,11 +8,11 @@
- Den oploadede fil var for stor. Opload venligst en mindre fil.
+ Den uploadede fil var for stor. Upload venligst en mindre fil.
- CSRF nøglen er ugyldig.
+ CSRF-token er ugyldig.