diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2016-02-23 16:16:06 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2016-02-23 16:16:06 +0100 |
| commit | 521dcda8d6dfcf98fe3634febfac34913c1e1d33 (patch) | |
| tree | 7e70459cd5870ec632aebca724f9cdad8ea1bc37 | |
| parent | c94edb64c5ca7cf92f0dfc3ebd4d60bf7ebbacb7 (diff) | |
| parent | 96e1a603a6975d6da576931209a5b7e8f71a7312 (diff) | |
| download | symfony-security-521dcda8d6dfcf98fe3634febfac34913c1e1d33.zip symfony-security-521dcda8d6dfcf98fe3634febfac34913c1e1d33.tar.gz symfony-security-521dcda8d6dfcf98fe3634febfac34913c1e1d33.tar.bz2 | |
Merge branch '2.8' into 3.0
* 2.8:
fixed typo
fixed typo
Fixed a minor XML issue in a translation file
Fix merge
Fix merge
Fix merge
Fix merge
Update twig.html.twig
PhpUnitNoDedicateAssertFixer results
Improve Norwegian translations
[2.7] [FrameworkBundle] minor fix tests added by #17569
Fixed the antialiasing of the toolbar text
Simplify markdown for PR template
fixed CS
fixed CS
documented the $url parameter better
[Form] add test for ArrayChoiceList handling null
[Form] fix edge cases with choice placeholder
register commands from kernel when accessing list
Update FileSystem
| -rw-r--r-- | Core/Resources/translations/security.no.xlf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Core/Resources/translations/security.no.xlf b/Core/Resources/translations/security.no.xlf index 3369d43..3635916 100644 --- a/Core/Resources/translations/security.no.xlf +++ b/Core/Resources/translations/security.no.xlf @@ -4,7 +4,7 @@ <body> <trans-unit id="1"> <source>An authentication exception occurred.</source> - <target>En autentiserings feil har skjedd.</target> + <target>En autentiseringsfeil har skjedd.</target> </trans-unit> <trans-unit id="2"> <source>Authentication credentials could not be found.</source> @@ -24,7 +24,7 @@ </trans-unit> <trans-unit id="6"> <source>Not privileged to request the resource.</source> - <target>Ingen tilgang til å be om gitt kilde.</target> + <target>Ingen tilgang til å be om gitt ressurs.</target> </trans-unit> <trans-unit id="7"> <source>Invalid CSRF token.</source> |