diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-02-22 17:41:45 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-02-22 17:41:45 +0100 |
| commit | 96e1a603a6975d6da576931209a5b7e8f71a7312 (patch) | |
| tree | 92d10972f167b0cc765bbda5f71b1d1e05b0272a | |
| parent | 8eb036311a76e19d379accf4e13883061b1fea46 (diff) | |
| parent | 0f9144cb6478e9311506f9dec04070e942862042 (diff) | |
| download | symfony-security-96e1a603a6975d6da576931209a5b7e8f71a7312.zip symfony-security-96e1a603a6975d6da576931209a5b7e8f71a7312.tar.gz symfony-security-96e1a603a6975d6da576931209a5b7e8f71a7312.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
Fix merge
| -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> |