diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2015-12-10 00:50:07 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2015-12-10 00:50:07 +0300 |
commit | ebced800c0184f5ce93663afab6b0337c3755cbb (patch) | |
tree | fb26c2506d37586ff0d38fb902d63d17701bd883 /plugins/Login | |
parent | 3d26af780d8fe0e4f7c5824a88b95c4a0d0d25d7 (diff) | |
parent | db36ca384809ea36457a465a3b6d1ecf951b0e26 (diff) |
Merge master into "3.0"
Conflicts:
.travis.yml
CHANGELOG.md
core/Plugin/ControllerAdmin.php
core/Version.php
core/testMinimumPhpVersion.php
plugins/API/API.php
plugins/Actions/Reports/GetPageUrls.php
plugins/AnonymousPiwikUsageMeasurement
plugins/CoreHome/CoreHome.php
plugins/CoreHome/templates/_menu.twig
plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js
plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
plugins/Goals/Controller.php
tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
tests/PHPUnit/Integration/Plugin/ManagerTest.php
tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
tests/UI/expected-ui-screenshots
tests/UI/specs/Overlay_spec.js
tests/UI/specs/UIIntegration_spec.js
Diffstat (limited to 'plugins/Login')
-rw-r--r-- | plugins/Login/lang/cs.json | 10 | ||||
-rw-r--r-- | plugins/Login/lang/ko.json | 4 | ||||
-rw-r--r-- | plugins/Login/lang/sl.json | 6 | ||||
-rw-r--r-- | plugins/Login/lang/tr.json | 7 | ||||
-rw-r--r-- | plugins/Login/templates/login.twig | 8 |
5 files changed, 24 insertions, 11 deletions
diff --git a/plugins/Login/lang/cs.json b/plugins/Login/lang/cs.json index 311341374e..8dc2f4f2f0 100644 --- a/plugins/Login/lang/cs.json +++ b/plugins/Login/lang/cs.json @@ -1,15 +1,15 @@ { "Login": { - "ConfirmationLinkSent": "Do vaší e-mailové schránky byl odeslán potvrzovací e-mail. Pro potvrzení požadavku na změnu hesla navštivte odkaz v e-mailu uvedený.", - "ContactAdmin": "Možná příčina: Váš hosting zakázal funkci mail().. <br \/>Prosím kontaktujte vašeho administrátora Piwiku.", + "ConfirmationLinkSent": "Do vaší schránky byl odeslán potvrzovací email. Pro potvrzení požadavku na změnu hesla navštivte odkaz uvedený v emailu.", + "ContactAdmin": "Možná příčina: Váš hosting zakázal funkci mail().. <br \/>Prosím kontaktujte svého administrátora Piwiku.", "ExceptionInvalidSuperUserAccessAuthenticationMethod": "Uživatel se Super uživatelským přístupem nemůže být autentizován mechanismem %s.", "ExceptionPasswordMD5HashExpected": "Parametr hesla je očekáván jako MD5 hash hesla", "InvalidNonceOrHeadersOrReferrer": "Zabezpečení formuláře selhalo. Prosím obnovte formulář a zkontrolujte, že máte povolené cookies. Pokud používáte proxy server, %smusíte nakonfigurovat Piwik aby přijímal proxy hlavičku%s, která přeposílá hlavičku hosta. Zkontrolujte také, že je správně posílána hlavička referrer.", "InvalidOrExpiredToken": "Klíč je neplatný, nebo vypršel", - "InvalidUsernameEmail": "Neplatné uživatelské jméno a\/nebo e-mailová adresa", + "InvalidUsernameEmail": "Neplatné uživatelské jméno a\/nebo emailová adresa", "LogIn": "Přihlásit", - "LoginOrEmail": "Uživatelské jméno nebo E-mail", - "LoginPasswordNotCorrect": "Uživatelské jméno & heslo nejsou správné", + "LoginOrEmail": "Uživatelské jméno nebo Email", + "LoginPasswordNotCorrect": "Chybná kombinace uživatelského jména a hesla.", "LostYourPassword": "Zapomněli jste vaše heslo?", "MailPasswordChangeBody": "Ahoj %1$s,\n\nZ %2$s byl zaslán požadavek o změnu hesla. Pro potvrzení nových přihlašovacích údajů navštivte následující odkaz:\n\n%3$s\n\nPoznámka: Tento token je platný 24 hodin.\n\nA díky za používání Piwiku!", "MailTopicPasswordChange": "Potvrďte změnu hesla", diff --git a/plugins/Login/lang/ko.json b/plugins/Login/lang/ko.json index bdc9d72937..e924445eda 100644 --- a/plugins/Login/lang/ko.json +++ b/plugins/Login/lang/ko.json @@ -2,6 +2,7 @@ "Login": { "ConfirmationLinkSent": "확인 링크가 당신의 받은 편지함으로 전송되었습니다. 이메일을 확인하고 비밀번호 변경요청을 승인하려면 이 링크를 방문하세요.", "ContactAdmin": "가능한 이유: 호스트가 메일 기능을 비활성화했을 수 있습니다. <br \/>당신의 Piwik 관리자에게 연락해보세요.", + "ExceptionInvalidSuperUserAccessAuthenticationMethod": "슈퍼 유저 접근의 '%s' 방법으로는 인증되지 않습니다.", "ExceptionPasswordMD5HashExpected": "비밀번호 매개변수는 MD5해시 값이 사용되고 있습니다.", "InvalidNonceOrHeadersOrReferrer": "양식 보안 실패, 양식을 새로고침하여 쿠키가 활성화되어 있는지 확인하세요. 프록시 서버를 사용하는 경우라면, 호스트 헤더에 %sPiwik configure에서 프록시 헤더를 수락%s하고 전달해야합니다. 또한 리퍼러 헤더가 올바르게 전송되는지 확인합니다.", "InvalidOrExpiredToken": "토큰이 잘못되었거나 만료되었습니다.", @@ -15,7 +16,8 @@ "PasswordChanged": "비밀번호가 변경되었습니다.", "PasswordRepeat": "비빌번호 (재입력)", "PasswordsDoNotMatch": "비밀번호가 일치하지 않습니다.", - "RememberMe": "저를 기억해 주세요", + "PluginDescription": "아이디와 비밀번호를 통해 사용자 인증뿐만 아니라 비밀번호 재설정 기능까지 제공합니다. 마켓에서 구할 수 있는 LoginLdap와 같은 또 다른 로그인 플러그인을 사용하여 인증 방법을 변경할 수 있습니다.", + "RememberMe": "계정 기억하기", "ResetPasswordInstructions": "계정에 사용할 새로운 비밀번호를 입력하세요." } }
\ No newline at end of file diff --git a/plugins/Login/lang/sl.json b/plugins/Login/lang/sl.json index e14d69523b..7c83e0c2b4 100644 --- a/plugins/Login/lang/sl.json +++ b/plugins/Login/lang/sl.json @@ -1,11 +1,17 @@ { "Login": { + "ConfirmationLinkSent": "Potrditveno sporočilo je bilo poslano na vaš elektronski naslov. Poglejte elektronsko pošto in sledite povezavi v njem, da potrdite zahtevo za spremembo vašega gesla.", + "ContactAdmin": "Možen razlog: na strežniku je onemogočena mail() funkcija. <br \/>Prosimo, obrnite se na vašega Piwik administratorja.", + "ExceptionInvalidSuperUserAccessAuthenticationMethod": "Uporabnik z vlogo \"Super User\" se ne more prijaviti z uporabo mehanizma '%s'.", "InvalidOrExpiredToken": "Žeton je neveljaven ali pa je potekel.", "InvalidUsernameEmail": "Napačno uporabniško ime ali e-mail naslov.", "LogIn": "Vpis", "LoginOrEmail": "Uporabniško ime ali E-mail", "LoginPasswordNotCorrect": "Napačna kombinacija uporabniškega imena in gesla.", "LostYourPassword": "Ste pozabili geslo?", + "MailPasswordChangeBody": "Pozdravljen\/-a %1$s,\n\ns strani %2$s je bil prejet zahtevek za zamenjavo gesla. Za potrditev verodostojnosti te zahteve, prosimo sledite povezavi:\n\n%3$s\n\nOpozorilo: ta žeton bo potekel po 24-ih urah.\n\nHvala, ker uporabljate Piwik!", + "MailTopicPasswordChange": "Potrdite spremembo gesla", + "PasswordChanged": "Vaše geslo je bilo spremenjeno.", "PasswordRepeat": "Geslo (ponovno)", "PasswordsDoNotMatch": "Gesli se ne ujemata.", "RememberMe": "Zapomni si me" diff --git a/plugins/Login/lang/tr.json b/plugins/Login/lang/tr.json index d9c1c638ec..981d278bf0 100644 --- a/plugins/Login/lang/tr.json +++ b/plugins/Login/lang/tr.json @@ -1,13 +1,18 @@ { "Login": { + "ConfirmationLinkSent": "Onaylama bağlantısı gelen kutunuza gönderildi. Şifre değişikliğinı onaylamak için e-posta hesabınızı kontrol edin ve bağlantıyı ziyaret edin.", + "ContactAdmin": "Olası nedeni: Sunucunuzda mail() fonksiyonunu devre dışı bırakmış olabilir. <br \/>Lütfen Piwik yöneticinizle iletişime geçiniz.", "InvalidOrExpiredToken": "Güvenlik kodu yanlış yada süresi dolmuş.", "InvalidUsernameEmail": "Geçersiz kullanıcı adı ve\/veya e-posta adresi", "LogIn": "Oturum aç", "LoginOrEmail": "Giriş veya E-posta", "LoginPasswordNotCorrect": "Kullanıcı adı & Şifre yanlış", "LostYourPassword": "Şifrenizi mi unuttunuz?", + "MailTopicPasswordChange": "Parola Değişikliğini Onayla", + "PasswordChanged": "Parolanız değiştirildi.", "PasswordRepeat": "Şifre (Tekrar)", "PasswordsDoNotMatch": "Şifre eşleşmedi", - "RememberMe": "Beni Hatırla" + "RememberMe": "Beni Hatırla", + "ResetPasswordInstructions": "Hesabınız için yeni parolanızı giriniz." } }
\ No newline at end of file diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig index 4bcef0d799..0140418af4 100644 --- a/plugins/Login/templates/login.twig +++ b/plugins/Login/templates/login.twig @@ -1,12 +1,12 @@ {% extends '@Morpheus/layout.twig' %} +{% block meta %} + <meta name="robots" content="index,follow"> +{% endblock %} + {% block head %} {{ parent() }} - {% block meta %} - <meta name="robots" content="index,follow"> - {% endblock %} - <script type="text/javascript" src="libs/bower_components/jquery-placeholder/jquery.placeholder.js"></script> <!--[if lt IE 9]> <script src="libs/bower_components/html5shiv/dist/html5shiv.min.js"></script> |