From 004086437a30d7b3ca554aafceb01e6bc1b9f29d Mon Sep 17 00:00:00 2001 From: Valentin Jonovs Date: Fri, 19 Feb 2016 20:56:38 +0100 Subject: Improve Norwegian translations --- Resources/translations/security.no.xlf | 4 ++-- 1 file 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 @@ An authentication exception occurred. - En autentiserings feil har skjedd. + En autentiseringsfeil har skjedd. Authentication credentials could not be found. @@ -24,7 +24,7 @@ Not privileged to request the resource. - Ingen tilgang til å be om gitt kilde. + Ingen tilgang til å be om gitt ressurs. Invalid CSRF token. -- cgit v1.1 From 119c9bc1d03fb91b774f7ee279d628bdb6301bdc Mon Sep 17 00:00:00 2001 From: SpacePossum Date: Sun, 21 Feb 2016 12:34:19 +0100 Subject: PhpUnitNoDedicateAssertFixer results --- Tests/Core/SecurityContextTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Core/SecurityContextTest.php b/Tests/Core/SecurityContextTest.php index 6695889..3fba8d9 100644 --- a/Tests/Core/SecurityContextTest.php +++ b/Tests/Core/SecurityContextTest.php @@ -92,6 +92,6 @@ class SecurityContextTest extends \PHPUnit_Framework_TestCase public function testTranslationsAreNotInCore() { - $this->assertFalse(file_exists(__DIR__.'/../../Core/Resources/translations/')); + $this->assertFileNotExists(__DIR__.'/../../Core/Resources/translations/'); } } -- cgit v1.1 From 0f9144cb6478e9311506f9dec04070e942862042 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 22 Feb 2016 17:41:31 +0100 Subject: Fix merge --- Core/Resources/translations/security.no.xlf | 4 ++-- 1 file 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 @@ An authentication exception occurred. - En autentiserings feil har skjedd. + En autentiseringsfeil har skjedd. Authentication credentials could not be found. @@ -24,7 +24,7 @@ Not privileged to request the resource. - Ingen tilgang til å be om gitt kilde. + Ingen tilgang til å be om gitt ressurs. Invalid CSRF token. -- cgit v1.1