summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Grekas <nicolas.grekas@gmail.com>2016-02-22 17:41:31 +0100
committerNicolas Grekas <nicolas.grekas@gmail.com>2016-02-22 17:41:31 +0100
commit0f9144cb6478e9311506f9dec04070e942862042 (patch)
tree8e2fda52e66639db4db32f2823169a8f46a156b0
parentfc9162da12f3c7b79bec4925787fafa660ba13f2 (diff)
downloadsymfony-security-0f9144cb6478e9311506f9dec04070e942862042.zip
symfony-security-0f9144cb6478e9311506f9dec04070e942862042.tar.gz
symfony-security-0f9144cb6478e9311506f9dec04070e942862042.tar.bz2
Fix merge
-rw-r--r--Core/Resources/translations/security.no.xlf4
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>