diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-02-22 17:12:29 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-02-22 17:12:29 +0100 |
| commit | fc9162da12f3c7b79bec4925787fafa660ba13f2 (patch) | |
| tree | 330dd01bb4cd0b11b4bc0d41be888c176c1c41a6 | |
| parent | ef02544c8cd8f7c2dfc7d463a4469e86e1c99064 (diff) | |
| parent | 119c9bc1d03fb91b774f7ee279d628bdb6301bdc (diff) | |
| download | symfony-security-fc9162da12f3c7b79bec4925787fafa660ba13f2.zip symfony-security-fc9162da12f3c7b79bec4925787fafa660ba13f2.tar.gz symfony-security-fc9162da12f3c7b79bec4925787fafa660ba13f2.tar.bz2 | |
Merge branch '2.3' into 2.7
* 2.3:
PhpUnitNoDedicateAssertFixer results
Improve Norwegian translations
Simplify markdown for PR template
Conflicts:
src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php
src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php
| -rw-r--r-- | Resources/translations/security.no.xlf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Resources/translations/security.no.xlf b/Resources/translations/security.no.xlf index 3369d43..3635916 100644 --- a/Resources/translations/security.no.xlf +++ b/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> |