Browse Source

Add headings to the security settings page (#6661)

* Changes the headings' rank of the security settings section

This commit changes the existing headings' rank of the security settings section from level 6 to level 4.

* Renames the auth.change_password string into auth.security

The "Security" preferences' section used to be called "Change password". When it was renamed, the string name wasn't changed.
This commits changes auth.change_password to auth.security.

* Adds a heading to the password change form

There was previously no heading for the part of the "Security" page that contain the password change form.
This commit adds a rank 4 heading to this section and reintroduces an "auth.change_password" string to be used inside it.

* Removes useless HR elements

The various sections of the "Security" settings page were previously separated by HR elements.
Now that there is proper headings, they're not required anymore.

* Updates CSS

This commit updates CSS in such a way that the same style is applied to all the H4 elements of the settings.

* Correct a mistake

A character went missing on one of the previous commits, broking the CSS.
This new commit fixes it.
custom
Sylvhem 5 years ago
committed by Eugen Rochko
parent
commit
cb74c0cfe4
  1. 10
      app/javascript/styles/mastodon/admin.scss
  2. 10
      app/javascript/styles/mastodon/forms.scss
  3. 2
      app/views/auth/registrations/_sessions.html.haml
  4. 8
      app/views/auth/registrations/edit.html.haml
  5. 2
      config/locales/ar.yml
  6. 2
      config/locales/bg.yml
  7. 2
      config/locales/ca.yml
  8. 2
      config/locales/de.yml
  9. 3
      config/locales/en.yml
  10. 2
      config/locales/eo.yml
  11. 2
      config/locales/es.yml
  12. 2
      config/locales/fa.yml
  13. 2
      config/locales/fi.yml
  14. 2
      config/locales/fr.yml
  15. 2
      config/locales/gl.yml
  16. 2
      config/locales/he.yml
  17. 2
      config/locales/hr.yml
  18. 2
      config/locales/hu.yml
  19. 2
      config/locales/id.yml
  20. 2
      config/locales/io.yml
  21. 2
      config/locales/it.yml
  22. 2
      config/locales/ja.yml
  23. 2
      config/locales/ko.yml
  24. 2
      config/locales/nl.yml
  25. 2
      config/locales/no.yml
  26. 2
      config/locales/oc.yml
  27. 2
      config/locales/pl.yml
  28. 2
      config/locales/pt-BR.yml
  29. 2
      config/locales/pt.yml
  30. 2
      config/locales/ru.yml
  31. 2
      config/locales/sk.yml
  32. 2
      config/locales/sr-Latn.yml
  33. 2
      config/locales/sr.yml
  34. 2
      config/locales/sv.yml
  35. 2
      config/locales/th.yml
  36. 2
      config/locales/tr.yml
  37. 2
      config/locales/uk.yml
  38. 2
      config/locales/zh-CN.yml
  39. 2
      config/locales/zh-HK.yml
  40. 2
      config/locales/zh-TW.yml
  41. 2
      config/navigation.rb

10
app/javascript/styles/mastodon/admin.scss

@ -105,6 +105,16 @@
margin-bottom: 30px;
}
h4 {
text-transform: uppercase;
font-size: 13px;
font-weight: 500;
color: $ui-primary-color;
padding-bottom: 8px;
margin-bottom: 8px;
border-bottom: 1px solid lighten($ui-base-color, 8%);
}
h6 {
font-size: 16px;
color: $ui-secondary-color;

10
app/javascript/styles/mastodon/forms.scss

@ -22,16 +22,6 @@ code {
margin-top: 4px;
}
h4 {
text-transform: uppercase;
font-size: 13px;
font-weight: 500;
color: $ui-primary-color;
padding-bottom: 8px;
margin-bottom: 8px;
border-bottom: 1px solid lighten($ui-base-color, 8%);
}
p.hint {
margin-bottom: 15px;
color: $ui-primary-color;

2
app/views/auth/registrations/_sessions.html.haml

@ -1,4 +1,4 @@
%h6= t 'sessions.title'
%h4= t 'sessions.title'
%p.muted-hint= t 'sessions.explanation'
.table-wrapper

8
app/views/auth/registrations/edit.html.haml

@ -1,6 +1,7 @@
- content_for :page_title do
= t('auth.change_password')
= t('auth.security')
%h4= t('auth.change_password')
= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, class: 'auth_edit' }) do |f|
= render 'shared/error_messages', object: resource
@ -15,12 +16,9 @@
- else
%p.hint= t('users.seamless_external_login')
%hr/
= render 'sessions'
- if open_deletion?
%hr/
%h6= t('auth.delete_account')
%h4= t('auth.delete_account')
%p.muted-hint= t('auth.delete_account_html', path: settings_delete_path)

2
config/locales/ar.yml

@ -220,7 +220,6 @@ ar:
regenerate_token: إعادة توليد رمز النفاذ
your_token: رمز نفاذك
auth:
change_password: الهوية
confirm_email: تأكيد عنوان البريد الإلكتروني
delete_account: حذف حساب
delete_account_html: إن كنت ترغب في حذف حسابك يُمكنك <a href="%{path}">المواصلة هنا</a>. سوف يُطلَبُ منك التأكيد قبل الحذف.
@ -237,6 +236,7 @@ ar:
register: إنشاء حساب
resend_confirmation: إعادة إرسال تعليمات التأكيد
reset_password: إعادة تعيين كلمة المرور
security: الهوية
set_new_password: تعيين كلمة مرور جديدة
authorize_follow:
error: يا للأسف، وقع هناك خطأ إثر عملية البحث عن الحساب عن بعد

2
config/locales/bg.yml

@ -30,7 +30,6 @@ bg:
applications:
invalid_url: Предоставеният URL е невалиден
auth:
change_password: Идентификационни данни
didnt_get_confirmation: Не получих инструкции за потвърждение
forgot_password: Забравих си паролата
login: Влизане
@ -38,6 +37,7 @@ bg:
register: Регистрация
resend_confirmation: Изпрати отново инструкции за потвърждение
reset_password: Подновяване на паролата
security: Идентификационни данни
set_new_password: Задай нова парола
authorize_follow:
error: Възникна грешка в откриването на потребителя

2
config/locales/ca.yml

@ -359,7 +359,6 @@ ca:
your_token: El teu identificador d'accés
auth:
agreement_html: En inscriure't, acceptes seguir <a href="%{rules_path}">els nostres termes del servei</a> i <a href="%{terms_path}">la nostra política de privadesa</a>.
change_password: Seguretat
confirm_email: Confirmar correu electrònic
delete_account: Suprimeix el compte
delete_account_html: Si vols suprimir el compte pots <a href="%{path}">fer-ho aquí</a>. Se't demanarà confirmació.
@ -378,6 +377,7 @@ ca:
register: Registre
resend_confirmation: Torna a enviar el correu de confirmació
reset_password: Restableix la contrasenya
security: Seguretat
set_new_password: Estableix una contrasenya nova
authorize_follow:
error: Malauradament, ha ocorregut un error cercant el compte remot

2
config/locales/de.yml

@ -353,7 +353,6 @@ de:
your_token: Dein Zugangs-Token
auth:
agreement_html: Indem du dich registrierst, erklärst du dich mit den Regeln, die <a href="%{rules_path}">auf dieser Instanz gelten</a> und der <a href="%{terms_path}">Datenschutzerklärung</a> einverstanden.
change_password: Sicherheit
delete_account: Konto löschen
delete_account_html: Falls du dein Konto löschen willst, kannst du <a href="%{path}">hier damit fortfahren</a>. Du wirst um Bestätigung gebeten werden.
didnt_get_confirmation: Keine Bestätigungs-Mail erhalten?
@ -366,6 +365,7 @@ de:
register: Registrieren
resend_confirmation: Bestätigungs-Mail erneut versenden
reset_password: Passwort zurücksetzen
security: Sicherheit
set_new_password: Neues Passwort setzen
authorize_follow:
error: Das Profil konnte nicht geladen werden

3
config/locales/en.yml

@ -359,7 +359,7 @@ en:
your_token: Your access token
auth:
agreement_html: By signing up you agree to follow <a href="%{rules_path}">the rules of the instance</a> and <a href="%{terms_path}">our terms of service</a>.
change_password: Security
change_password: Password
confirm_email: Confirm email
delete_account: Delete account
delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation.
@ -378,6 +378,7 @@ en:
register: Sign up
resend_confirmation: Resend confirmation instructions
reset_password: Reset password
security: Security
set_new_password: Set new password
authorize_follow:
error: Unfortunately, there was an error looking up the remote account

2
config/locales/eo.yml

@ -358,7 +358,6 @@ eo:
your_token: Via alira ĵetono
auth:
agreement_html: Per registriĝo, vi konsentas kun <a href="%{rules_path}">la reguloj de la nodo</a> kaj <a href="%{terms_path}">niaj uzkondiĉoj</a>.
change_password: Sekureco
confirm_email: Konfirmi retadreson
delete_account: Forigi konton
delete_account_html: Se vi deziras forigi vian konton, vi povas <a href="%{path}">fari tion ĉi tie</a>. Vi bezonos konfirmi vian peton.
@ -376,6 +375,7 @@ eo:
register: Registriĝi
resend_confirmation: Resendi la instrukciojn por konfirmi
reset_password: Ŝanĝi pasvorton
security: Sekureco
set_new_password: Elekti novan pasvorton
authorize_follow:
error: Bedaŭrinde, estis eraro en la serĉado de la fora konto

2
config/locales/es.yml

@ -353,7 +353,6 @@ es:
your_token: Tu token de acceso
auth:
agreement_html: Al registrarte, acepta seguir <a href="%{rules_path}">las reglas de la instancia</a> y <a href="%{terms_path}">nuestros términos de servicio</a>.
change_password: Cambiar contraseña
delete_account: Borrar cuenta
delete_account_html: Si desea eliminar su cuenta, puede <a href="%{path}">proceder aquí</a>. Será pedido de una confirmación.
didnt_get_confirmation: "¿No recibió el correo de confirmación?"
@ -366,6 +365,7 @@ es:
register: Registrarse
resend_confirmation: Volver a enviar el correo de confirmación
reset_password: Restablecer contraseña
security: Cambiar contraseña
set_new_password: Establecer nueva contraseña
authorize_follow:
error: Desafortunadamente, ha ocurrido un error buscando la cuenta remota

2
config/locales/fa.yml

@ -344,7 +344,6 @@ fa:
your_token: کد دسترسی شما
auth:
agreement_html: پیش از عضو شدن باید <a href="%{rules_path}">قوانین این سرور</a> و <a href="%{terms_path}">شرایط استفادهٔ</a> ما را بپذیرید.
change_password: امنیت
delete_account: پاک‌کردن حساب
delete_account_html: اگر می‌خواهید حساب خود را پاک کنید، از <a href="%{path}">این‌جا</a> پیش بروید. از شما درخواست تأیید خواهد شد.
didnt_get_confirmation: راهنمایی برای تأیید را دریافت نکردید؟
@ -357,6 +356,7 @@ fa:
register: عضو شوید
resend_confirmation: راهنمایی برای تأیید را دوباره بفرست
reset_password: بازنشانی رمز
security: امنیت
set_new_password: تعیین رمز تازه
authorize_follow:
error: متأسفانه حین یافتن آن حساب خطایی رخ داد

2
config/locales/fi.yml

@ -67,7 +67,6 @@ fi:
applications:
invalid_url: Annettu URL on väärä
auth:
change_password: Tunnukset
didnt_get_confirmation: Etkö saanut varmennusohjeita?
forgot_password: Unohditko salasanasi?
login: Kirjaudu sisään
@ -75,6 +74,7 @@ fi:
register: Rekisteröidy
resend_confirmation: Lähetä varmennusohjeet uudestaan
reset_password: Palauta salasana
security: Tunnukset
set_new_password: Aseta uusi salasana
authorize_follow:
error: Valitettavasti tapahtui virhe etätilin haussa.

2
config/locales/fr.yml

@ -359,7 +359,6 @@ fr:
your_token: Votre jeton d’accès
auth:
agreement_html: En vous inscrivant, vous souscrivez <a href="%{rules_path}">aux règles de l’instance</a> et à <a href="%{terms_path}">nos conditions d’utilisation</a>.
change_password: Sécurité
confirm_email: Confirmer mon adresse mail
delete_account: Supprimer le compte
delete_account_html: Si vous désirez supprimer votre compte, vous pouvez <a href="%{path}">cliquer ici</a>. Il vous sera demandé de confirmer cette action.
@ -377,6 +376,7 @@ fr:
register: S’inscrire
resend_confirmation: Envoyer à nouveau les consignes de confirmation
reset_password: Réinitialiser le mot de passe
security: Sécurité
set_new_password: Définir le nouveau mot de passe
authorize_follow:
error: Malheureusement, il y a eu une erreur en cherchant les détails du compte distant

2
config/locales/gl.yml

@ -359,7 +359,6 @@ gl:
your_token: O seu testemuño de acceso
auth:
agreement_html: Rexistrándose acorda seguir <a href="%{rules_path}">as normas da instancia</a> e <a href="%{terms_path}">os termos do servizo</a>.
change_password: Seguridade
confirm_email: Confirmar correo-e
delete_account: Eliminar conta
delete_account_html: Se desexa eliminar a súa conta, pode <a href="%{path}">facelo aquí</a>. Pediráselle confirmación.
@ -378,6 +377,7 @@ gl:
register: Rexistro
resend_confirmation: Voltar a enviar intruccións de confirmación
reset_password: Restablecer contrasinal
security: Seguridade
set_new_password: Establecer novo contrasinal
authorize_follow:
error: Desgraciadamente, algo fallou ao buscar a conta remota

2
config/locales/he.yml

@ -232,7 +232,6 @@ he:
applications:
invalid_url: כתובת הקישורית אינה חוקית
auth:
change_password: החלפת סיסמא
didnt_get_confirmation: לא התקבלו הוראות אימות?
forgot_password: הנשתכחה סיסמתך?
login: כניסה
@ -240,6 +239,7 @@ he:
register: הרשמה
resend_confirmation: שלח הוראות אימות בשנית
reset_password: איפוס סיסמא
security: החלפת סיסמא
set_new_password: שינוי סיסמא
authorize_follow:
error: למרבה הצער, היתה שגיאה בחיפוש החשבון המרוחק

2
config/locales/hr.yml

@ -30,7 +30,6 @@ hr:
applications:
invalid_url: Uneseni link nije valjan
auth:
change_password: Vjerodajnica
didnt_get_confirmation: Niste primili instrukcije za potvrđivanje?
forgot_password: Zaboravljena lozinka?
login: Prijavi se
@ -38,6 +37,7 @@ hr:
register: Registriraj se
resend_confirmation: Ponovo pošalji instrukcije za potvrđivanje
reset_password: Resetiraj lozinku
security: Vjerodajnica
set_new_password: Postavi novu lozinku
authorize_follow:
error: Nažalost, došlo je do greške looking up the remote račun

2
config/locales/hu.yml

@ -353,7 +353,6 @@ hu:
your_token: Hozzáférési kulcsod
auth:
agreement_html: A feliratkozással elfogatod az <a href="%{rules_path}">instancia szabályzatát</a> és a <a href="%{terms_path}">felhasználási feltételeket</a>.
change_password: Biztonság
delete_account: Felhasználói fiók törlése
delete_account_html: Felhasználói fiókod törléséhez <a href="%{path}">kattints ide</a>. A rendszer újbóli megerősítést fog kérni.
didnt_get_confirmation: Nem kaptad meg a megerősítési lépéseket?
@ -366,6 +365,7 @@ hu:
register: Regisztráció
resend_confirmation: Megerősítési lépések újraküldése
reset_password: Jelszó visszaállítása
security: Biztonság
set_new_password: Új jelszó beállítása
authorize_follow:
error: Hiba történt a távoli felhasználó keresésekor

2
config/locales/id.yml

@ -155,7 +155,6 @@ id:
applications:
invalid_url: URL tidak sesuai
auth:
change_password: Identitas
didnt_get_confirmation: Tidak menerima petunjuk konfirmasi?
forgot_password: Lupa kata sandi?
login: Masuk
@ -163,6 +162,7 @@ id:
register: Daftar
resend_confirmation: Kirim ulang email konfirmasi
reset_password: Reset kata sandi
security: Identitas
set_new_password: Tentukan kata sandi baru
authorize_follow:
error: Sayangnya, ada error saat melihat akun remote

2
config/locales/io.yml

@ -153,7 +153,6 @@ io:
applications:
invalid_url: La URL donita ne esas valida
auth:
change_password: Chanjar pasvorto
didnt_get_confirmation: Ka tu ne recevis la instrucioni por konfirmar?
forgot_password: Pasvorto obliviita?
login: Enirar
@ -161,6 +160,7 @@ io:
register: Membreskar
resend_confirmation: Risendar la instrucioni por konfirmar
reset_password: Chanjar la pasvorto
security: Chanjar pasvorto
set_new_password: Selektar nova pasvorto
authorize_follow:
error: Regretinde, eventis eraro probante konsultar la fora konto

2
config/locales/it.yml

@ -30,7 +30,6 @@ it:
applications:
invalid_url: L'URL fornito non è valido
auth:
change_password: Credenziali
didnt_get_confirmation: Non hai ricevuto le istruzioni di conferma?
forgot_password: Hai dimenticato la tua password?
login: Entra
@ -38,6 +37,7 @@ it:
register: Iscriviti
resend_confirmation: Invia di nuovo le istruzioni di conferma
reset_password: Resetta la password
security: Credenziali
set_new_password: Imposta una nuova password
authorize_follow:
error: Sfortunatamente c'è stato un errore nel consultare l'account remoto

2
config/locales/ja.yml

@ -359,7 +359,6 @@ ja:
your_token: アクセストークン
auth:
agreement_html: 登録すると <a href="%{rules_path}">インスタンスのルール</a> と <a href="%{terms_path}">利用規約</a> に従うことに同意したことになります。
change_password: セキュリティ
confirm_email: メールアドレスの確認
delete_account: アカウントの削除
delete_account_html: アカウントを削除したい場合、<a href="%{path}">こちら</a> から手続きが行えます。削除する前に、確認画面があります。
@ -378,6 +377,7 @@ ja:
register: 登録する
resend_confirmation: 確認メールを再送する
reset_password: パスワードを再発行
security: セキュリティ
set_new_password: 新しいパスワード
authorize_follow:
error: 残念ながら、リモートアカウント情報の取得中にエラーが発生しました

2
config/locales/ko.yml

@ -361,7 +361,6 @@ ko:
your_token: 액세스 토큰
auth:
agreement_html: 이 등록으로 <a href="%{rules_path}">이용규약</a> 과 <a href="%{terms_path}">약관</a>에 동의하는 것으로 간주됩니다.
change_password: 보안
confirm_email: 확인 메일 승인
delete_account: 계정 삭제
delete_account_html: 계정을 삭제하고 싶은 경우, <a href="%{path}">여기서</a> 삭제할 수 있습니다. 삭제 전 확인 화면이 표시됩니다.
@ -377,6 +376,7 @@ ko:
register: 등록하기
resend_confirmation: 확인 메일을 다시 보내기
reset_password: 비밀번호 재설정
security: 보안
set_new_password: 새 비밀번호
authorize_follow:
error: 리모트 계정을 확인하는 도중 오류가 발생했습니다

2
config/locales/nl.yml

@ -359,7 +359,6 @@ nl:
your_token: Jouw toegangscode
auth:
agreement_html: Wanneer je op registreren klikt ga je akkoord met het opvolgen van <a href="%{rules_path}">de regels van deze server</a> en <a href="%{terms_path}">onze gebruikersvoorwaarden</a>.
change_password: Beveiliging
confirm_email: E-mail bevestigen
delete_account: Account verwijderen
delete_account_html: Wanneer je jouw account graag wilt verwijderen, kan je dat <a href="%{path}">hier doen</a>. We vragen jou daar om een bevestiging.
@ -378,6 +377,7 @@ nl:
register: Registreren
resend_confirmation: Verstuur de bevestigingsinstructies nogmaals
reset_password: Wachtwoord opnieuw instellen
security: Beveiliging
set_new_password: Nieuw wachtwoord instellen
authorize_follow:
error: Helaas, er is een fout opgetreden bij het opzoeken van de externe account

2
config/locales/no.yml

@ -353,7 +353,6 @@
your_token: Din tilgangsnøkkel
auth:
agreement_html: Ved å registrere deg godtar du å følge <a href="%{rules_path}">instansens regler</a> og <a href="%{terms_path}">våre brukervilkår</a>.
change_password: Sikkerhet
delete_account: Slett konto
delete_account_html: Hvis du ønsker å slette din konto kan du <a href="%{path}">fortsette her</a>. Du vil bli spurt om bekreftelse.
didnt_get_confirmation: Mottok du ikke instruksjoner om bekreftelse?
@ -366,6 +365,7 @@
register: Bli med
resend_confirmation: Send bekreftelsesinstruksjoner på nytt
reset_password: Nullstill passord
security: Sikkerhet
set_new_password: Sett nytt passord
authorize_follow:
error: Uheldigvis skjedde det en feil da vi prøvde å få tak i en bruker fra en annen instans

2
config/locales/oc.yml

@ -353,7 +353,6 @@ oc:
your_token: Vòstre geton d’accès
auth:
agreement_html: En vos marcar acceptatz <a href="%{rules_path}">las règlas de l’instància</a> e <a href="%{terms_path}">politica de confidencialitat</a>.
change_password: Seguretat
delete_account: Suprimir lo compte
delete_account_html: Se volètz suprimir vòstre compte, podètz <a href="%{path}">o far aquí</a>. Vos demandarem que confirmetz.
didnt_get_confirmation: Avètz pas recebut las instruccions de confirmacion ?
@ -369,6 +368,7 @@ oc:
register: Se marcar
resend_confirmation: Tornar mandar las instruccions de confirmacion
reset_password: Reïnicializar lo senhal
security: Seguretat
set_new_password: Picar un nòu senhal
authorize_follow:
error: O planhèm, i a agut una error al moment de cercar lo compte

2
config/locales/pl.yml

@ -360,7 +360,6 @@ pl:
your_token: Twój token dostępu
auth:
agreement_html: Rejestrując się, oświadczasz, że zapoznałeś się z <a href="%{rules_path}">informacjami o instancji</a> i <a href="%{terms_path}">zasadami korzystania z usługi</a>.
change_password: Bezpieczeństwo
confirm_email: Potwierdź adres e-mail
delete_account: Usunięcie konta
delete_account_html: Jeżeli chcesz usunąć konto, <a href="%{path}">przejdź tutaj</a>. Otrzymasz prośbę o potwierdzenie.
@ -379,6 +378,7 @@ pl:
register: Rejestracja
resend_confirmation: Ponownie prześlij instrukcje weryfikacji
reset_password: Zresetuj hasło
security: Bezpieczeństwo
set_new_password: Ustaw nowe hasło
authorize_follow:
error: Niestety, podczas sprawdzania zdalnego konta wystąpił błąd

2
config/locales/pt-BR.yml

@ -359,7 +359,6 @@ pt-BR:
your_token: Seu token de acesso
auth:
agreement_html: Ao se cadastrar você concorda em seguir <a href="%{rules_path}">as regras da instância</a> e <a href="%{terms_path}">os nossos termos de serviço</a>.
change_password: Segurança
confirm_email: Confirmar e-mail
delete_account: Excluir conta
delete_account_html: Se você deseja excluir a sua conta, você pode <a href="%{path}">prosseguir para cá</a>. Uma confirmação será requisitada.
@ -377,6 +376,7 @@ pt-BR:
register: Cadastrar-se
resend_confirmation: Reenviar instruções de confirmação
reset_password: Redefinir senha
security: Segurança
set_new_password: Definir uma nova senha
authorize_follow:
error: Infelizmente, ocorreu um erro ao buscar a conta remota

2
config/locales/pt.yml

@ -353,7 +353,6 @@ pt:
your_token: O teu token de acesso
auth:
agreement_html: Registando-te concordas em seguir <a href="%{rules_path}">as regras da instância</a> e <a href="%{terms_path}">os nossos termos de serviço</a>.
change_password: Alterar palavra-passe
confirm_email: Confirmar e-mail
delete_account: Eliminar conta
delete_account_html: Se desejas eliminar a conta, podes <a href="%{path}">continua aqui</a>. Uma confirmação será pedida.
@ -367,6 +366,7 @@ pt:
register: Registar
resend_confirmation: Reenviar instruções de confirmação
reset_password: Criar nova palavra-passe
security: Alterar palavra-passe
set_new_password: Editar palavra-passe
authorize_follow:
error: Infelizmente, ocorreu um erro ao buscar a conta remota

2
config/locales/ru.yml

@ -353,7 +353,6 @@ ru:
your_token: Ваш токен доступа
auth:
agreement_html: Создавая аккаунт, вы соглашаетесь с <a href="%{rules_path}">правилами узла</a> и <a href="%{terms_path}">нашими условиями обслуживания</a>.
change_password: Изменить пароль
delete_account: Удалить аккаунт
delete_account_html: Если Вы хотите удалить свой аккаунт, вы можете <a href="%{path}">перейти сюда</a>. У Вас будет запрошено подтверждение.
didnt_get_confirmation: Не получили инструкцию для подтверждения?
@ -366,6 +365,7 @@ ru:
register: Зарегистрироваться
resend_confirmation: Повторить отправку инструкции для подтверждения
reset_password: Сбросить пароль
security: Изменить пароль
set_new_password: Задать новый пароль
authorize_follow:
error: К сожалению, при поиске удаленного аккаунта возникла ошибка

2
config/locales/sk.yml

@ -359,7 +359,6 @@ sk:
your_token: Váš prístupový token
auth:
agreement_html: V rámci registrácie súhlasíte, že sa budete riadiť <a href="%{rules_path}"> 1 pravidlami tejto instancie</a> 2 a taktiež <a href="%{terms_path}"> 3 našími servisnými podmienkami </a> 4.
change_password: Zabezpečenie
confirm_email: Potvrdiť email
delete_account: Vymazať účet
delete_account_html: Pokiaľ si želáte vymazať svoj účet, môžete tak <a href="%{path}"> 1 urobiť tu</a> 2. Budete požiadaný/á o potvrdenie tohto kroku.
@ -378,6 +377,7 @@ sk:
register: Zaregistrovať sa
resend_confirmation: Poslať potvrdzujúce pokyny znovu
reset_password: Resetovať heslo
security: Zabezpečenie
set_new_password: Nastaviť nové heslo
authorize_follow:
error: Naneštastie nastala chyba pri hľadaní vzdialeného účtu

2
config/locales/sr-Latn.yml

@ -346,7 +346,6 @@ sr-Latn:
your_token: Vaš pristupni token
auth:
agreement_html: Pristupanjem instanci se slažete sa <a href="%{rules_path}">pravilima instance</a> i <a href="%{terms_path}">uslovima korišćenja</a>.
change_password: Bezbednost
delete_account: Obriši nalog
delete_account_html: Ako želite da obrišete Vaš nalog, možete <a href="%{path}">nastaviti ovde</a>. Bićete upitani da potvrdite.
didnt_get_confirmation: Niste dobili poruku sa uputstvima za potvrdu naloga?
@ -359,6 +358,7 @@ sr-Latn:
register: Registruj se
resend_confirmation: Pošalji poruku sa uputstvima o potvrdi naloga ponovo
reset_password: Resetuj lozinku
security: Bezbednost
set_new_password: Postavi novu lozinku
authorize_follow:
error: Nažalost, desila se greška pri traženju udaljenog naloga

2
config/locales/sr.yml

@ -346,7 +346,6 @@ sr:
your_token: Ваш приступни токен
auth:
agreement_html: Приступањем инстанци се слажете са <a href="%{rules_path}">правилима инстанце</a> и <a href="%{terms_path}">условима коришћења</a>.
change_password: Безбедност
delete_account: Обриши налог
delete_account_html: Ако желите да обришете Ваш налог, можете <a href="%{path}">наставити овде</a>. Бићете упитани да потврдите.
didnt_get_confirmation: Нисте добили поруку са упутствима за потврду налога?
@ -359,6 +358,7 @@ sr:
register: Региструј се
resend_confirmation: Пошаљи поруку са упутствима о потврди налога поново
reset_password: Ресетуј лозинку
security: Безбедност
set_new_password: Постави нову лозинку
authorize_follow:
error: Нажалост, десила се грешка при тражењу удаљеног налога

2
config/locales/sv.yml

@ -356,7 +356,6 @@ sv:
your_token: Din access token
auth:
agreement_html: Genom att registrera dig godkänner du att följa <a href="%{rules_path}">instansens regler</a> och <a href="%{terms_path}">våra användarvillkor</a>.
change_password: Säkerhet
confirm_email: Bekräfta e-postadress
delete_account: Ta bort konto
delete_account_html: Om du vill radera ditt konto kan du <a href="%{path}">fortsätta här</a>. Du kommer att bli ombedd att bekräfta.
@ -374,6 +373,7 @@ sv:
register: Registrera
resend_confirmation: Skicka instruktionerna om bekräftelse igen
reset_password: Återställ lösenord
security: Säkerhet
set_new_password: Skriv in nytt lösenord
authorize_follow:
error: Tyvärr inträffade ett fel när vi kontrollerade fjärrkontot

2
config/locales/th.yml

@ -157,7 +157,6 @@ th:
applications:
invalid_url: URL ที่ระบุไม่ถูกตั้ง
auth:
change_password: Credentials
didnt_get_confirmation: Didn't receive confirmation instructions?
forgot_password: คุณลืมพาสเวริ์ดใช่ัม้ย?
login: ล๊อคอิน
@ -165,6 +164,7 @@ th:
register: สมัคร
resend_confirmation: ส่งขั้นตอนวิธีการยืนยันใหม่อีกครั้ง
reset_password: เปลี่ยนรหัสผ่าน
security: Credentials
set_new_password: ตั้งรหัสผ่านใหม่
authorize_follow:
error: Unfortunately, there was an error looking up the remote account

2
config/locales/tr.yml

@ -156,7 +156,6 @@ tr:
applications:
invalid_url: Verilen URL geçerli değil
auth:
change_password: Kimlik bilgileri
didnt_get_confirmation: Hesap doğrulama mailini almadınız mı?
forgot_password: Parolanızı unuttunuz mu?
login: Giriş yap
@ -164,6 +163,7 @@ tr:
register: Üye ol
resend_confirmation: Doğrulama mailini tekrar gönder
reset_password: Parolayı değiştir
security: Kimlik bilgileri
set_new_password: Yeni parola oluştur
authorize_follow:
error: Uzak hesap aranırken bir hata oluştu.

2
config/locales/uk.yml

@ -147,7 +147,6 @@ uk:
applications:
invalid_url: Введена URL неправильна
auth:
change_password: Зміна паролю
didnt_get_confirmation: Ви не отримали інструкції з підтвердження?
forgot_password: Забули свій пароль?
login: Увійти
@ -155,6 +154,7 @@ uk:
register: Зареєструватися
resend_confirmation: Повторно відправити інструкції з підтвердження
reset_password: Скинути пароль
security: Зміна паролю
set_new_password: Встановити новий пароль
authorize_follow:
error: На жаль, при пошуку віддаленого аккаунту виникла помилка

2
config/locales/zh-CN.yml

@ -351,7 +351,6 @@ zh-CN:
your_token: 你的访问令牌
auth:
agreement_html: 注册即表示你同意遵守<a href="%{rules_path}">本实例的相关规定</a>和<a href="%{terms_path}">我们的使用条款</a>。
change_password: 帐户安全
delete_account: 删除帐户
delete_account_html: 如果你想删除你的帐户,请<a href="%{path}">点击这里继续</a>。你需要确认你的操作。
didnt_get_confirmation: 没有收到确认邮件?
@ -364,6 +363,7 @@ zh-CN:
register: 注册
resend_confirmation: 重新发送确认邮件
reset_password: 重置密码
security: 帐户安全
set_new_password: 设置新密码
authorize_follow:
error: 对不起,寻找这个跨站用户时出错

2
config/locales/zh-HK.yml

@ -156,7 +156,6 @@ zh-HK:
applications:
invalid_url: 所提供的網址不正確
auth:
change_password: 登入資訊
didnt_get_confirmation: 沒有收到確認指示電郵?
forgot_password: 忘記了密碼?
login: 登入
@ -164,6 +163,7 @@ zh-HK:
register: 登記
resend_confirmation: 重發確認指示電郵
reset_password: 重設密碼
security: 登入資訊
set_new_password: 設定新密碼
authorize_follow:
error: 對不起,尋找這個跨站用戶的過程發生錯誤

2
config/locales/zh-TW.yml

@ -127,7 +127,6 @@ zh-TW:
applications:
invalid_url: 網址不正確
auth:
change_password: 登入資訊
didnt_get_confirmation: 沒有收到驗證信?
forgot_password: 忘記密碼?
login: 登入
@ -137,6 +136,7 @@ zh-TW:
register: 註冊
resend_confirmation: 重寄驗證信
reset_password: 重設密碼
security: 登入資訊
set_new_password: 設定新密碼
authorize_follow:
error: 對不起,搜尋遠端使用者出現錯誤

2
config/navigation.rb

@ -8,7 +8,7 @@ SimpleNavigation::Configuration.run do |navigation|
settings.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_url, highlights_on: %r{/settings/profile|/settings/migration}
settings.item :preferences, safe_join([fa_icon('sliders fw'), t('settings.preferences')]), settings_preferences_url
settings.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_notifications_url
settings.item :password, safe_join([fa_icon('lock fw'), t('auth.change_password')]), edit_user_registration_url, highlights_on: %r{/auth/edit|/settings/delete}
settings.item :password, safe_join([fa_icon('lock fw'), t('auth.security')]), edit_user_registration_url, highlights_on: %r{/auth/edit|/settings/delete}
settings.item :two_factor_authentication, safe_join([fa_icon('mobile fw'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_url, highlights_on: %r{/settings/two_factor_authentication}
settings.item :import, safe_join([fa_icon('cloud-upload fw'), t('settings.import')]), settings_import_url
settings.item :export, safe_join([fa_icon('cloud-download fw'), t('settings.export')]), settings_export_url

Loading…
Cancel
Save