diff options
author | Tobias Schultze <webmaster@tubo-world.de> | 2015-09-29 14:06:14 +0200 |
---|---|---|
committer | Tobias Schultze <webmaster@tubo-world.de> | 2015-09-29 14:06:14 +0200 |
commit | d666540ae19bf54addb355f7ff325a6016608a33 (patch) | |
tree | b2c7d1e334a651a9ae1b4be4d52e2f2502fdba9d | |
parent | fea9945e332971bcd832c10d3cbcf2e7b2689b31 (diff) | |
parent | fb61b3ac9393e62f64d261e560267004b39f32da (diff) | |
download | symfony-security-d666540ae19bf54addb355f7ff325a6016608a33.zip symfony-security-d666540ae19bf54addb355f7ff325a6016608a33.tar.gz symfony-security-d666540ae19bf54addb355f7ff325a6016608a33.tar.bz2 |
Merge branch '2.3' into 2.7
Conflicts:
src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
src/Symfony/Component/ClassLoader/DebugClassLoader.php
src/Symfony/Component/ClassLoader/UniversalClassLoader.php
src/Symfony/Component/Console/Command/Command.php
src/Symfony/Component/DependencyInjection/Definition.php
src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
src/Symfony/Component/EventDispatcher/Event.php
src/Symfony/Component/Filesystem/Exception/IOException.php
src/Symfony/Component/HttpFoundation/File/File.php
src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
src/Symfony/Component/HttpFoundation/StreamedResponse.php
src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
src/Symfony/Component/HttpKernel/HttpKernel.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/HttpKernel/KernelInterface.php
src/Symfony/Component/HttpKernel/Log/LoggerInterface.php
src/Symfony/Component/HttpKernel/Log/NullLogger.php
src/Symfony/Component/Process/Process.php
src/Symfony/Component/Routing/RequestContext.php
src/Symfony/Component/Routing/Route.php
src/Symfony/Component/Templating/EngineInterface.php
src/Symfony/Component/Templating/PhpEngine.php
src/Symfony/Component/Templating/TemplateNameParser.php
src/Symfony/Component/Templating/TemplateReference.php
src/Symfony/Component/Templating/TemplateReferenceInterface.php
src/Symfony/Component/Translation/IdentityTranslator.php
src/Symfony/Component/Translation/Translator.php
src/Symfony/Component/Validator/ConstraintViolationInterface.php
src/Symfony/Component/Validator/Constraints/False.php
src/Symfony/Component/Validator/Constraints/FalseValidator.php
src/Symfony/Component/Validator/Constraints/GroupSequence.php
src/Symfony/Component/Validator/Constraints/Image.php
src/Symfony/Component/Validator/Constraints/Null.php
src/Symfony/Component/Validator/Constraints/NullValidator.php
src/Symfony/Component/Validator/Constraints/True.php
src/Symfony/Component/Validator/Constraints/TrueValidator.php
src/Symfony/Component/Validator/ExecutionContextInterface.php
src/Symfony/Component/Validator/ValidatorInterface.php
-rw-r--r-- | Resources/translations/security.tr.xlf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Resources/translations/security.tr.xlf b/Resources/translations/security.tr.xlf index fbf9b26..68c4421 100644 --- a/Resources/translations/security.tr.xlf +++ b/Resources/translations/security.tr.xlf @@ -8,7 +8,7 @@ </trans-unit> <trans-unit id="2"> <source>Authentication credentials could not be found.</source> - <target>Yetkilendirme girdileri bulunamadı.</target> + <target>Kimlik bilgileri bulunamadı.</target> </trans-unit> <trans-unit id="3"> <source>Authentication request could not be processed due to a system problem.</source> @@ -16,7 +16,7 @@ </trans-unit> <trans-unit id="4"> <source>Invalid credentials.</source> - <target>Geçersiz girdiler.</target> + <target>Geçersiz kimlik bilgileri.</target> </trans-unit> <trans-unit id="5"> <source>Cookie has already been used by someone else.</source> @@ -32,7 +32,7 @@ </trans-unit> <trans-unit id="8"> <source>Digest nonce has expired.</source> - <target>Derleme zaman aşımı gerçekleşti.</target> + <target>Derleme zaman aşımına uğradı.</target> </trans-unit> <trans-unit id="9"> <source>No authentication provider found to support the authentication token.</source> @@ -44,7 +44,7 @@ </trans-unit> <trans-unit id="11"> <source>No token could be found.</source> - <target>Bilet bulunamadı.</target> + <target>Fiş bulunamadı.</target> </trans-unit> <trans-unit id="12"> <source>Username could not be found.</source> @@ -56,11 +56,11 @@ </trans-unit> <trans-unit id="14"> <source>Credentials have expired.</source> - <target>Girdiler zaman aşımına uğradı.</target> + <target>Kimlik bilgileri zaman aşımına uğradı.</target> </trans-unit> <trans-unit id="15"> <source>Account is disabled.</source> - <target>Hesap devre dışı bırakılmış.</target> + <target>Hesap engellenmiş.</target> </trans-unit> <trans-unit id="16"> <source>Account is locked.</source> |