diff options
| author | Tobias Schultze <webmaster@tubo-world.de> | 2015-09-29 14:32:55 +0200 |
|---|---|---|
| committer | Tobias Schultze <webmaster@tubo-world.de> | 2015-09-29 14:32:55 +0200 |
| commit | 889a989997c4b038fb4e354e57e35ede82370581 (patch) | |
| tree | da1c7b33fe0176e6154c8f1b481f7ee7794463e8 | |
| parent | fee26dfe9abc67703de600fa3354a3b275722784 (diff) | |
| parent | d666540ae19bf54addb355f7ff325a6016608a33 (diff) | |
| download | symfony-security-889a989997c4b038fb4e354e57e35ede82370581.zip symfony-security-889a989997c4b038fb4e354e57e35ede82370581.tar.gz symfony-security-889a989997c4b038fb4e354e57e35ede82370581.tar.bz2 | |
Merge branch '2.7' into 2.8
Conflicts:
src/Symfony/Component/Console/Application.php
src/Symfony/Component/Console/Command/Command.php
src/Symfony/Component/Console/Formatter/OutputFormatter.php
src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
src/Symfony/Component/Console/Input/Input.php
src/Symfony/Component/Console/Input/InputArgument.php
src/Symfony/Component/Console/Input/InputDefinition.php
src/Symfony/Component/Console/Input/InputOption.php
src/Symfony/Component/Console/Output/OutputInterface.php
src/Symfony/Component/Console/Output/StreamOutput.php
src/Symfony/Component/CssSelector/CssSelector.php
src/Symfony/Component/DependencyInjection/Container.php
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
src/Symfony/Component/DependencyInjection/ContainerInterface.php
src/Symfony/Component/DependencyInjection/Definition.php
src/Symfony/Component/DependencyInjection/Scope.php
src/Symfony/Component/DependencyInjection/ScopeInterface.php
src/Symfony/Component/Validator/Constraints/Currency.php
src/Symfony/Component/Validator/Constraints/CurrencyValidator.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> |