From 18d4e03e6b495c42b74a61a48cd5f0d3ba148b63 Mon Sep 17 00:00:00 2001 From: Sylvhem Date: Wed, 7 Mar 2018 01:39:40 +0100 Subject: [PATCH] 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. --- app/javascript/styles/mastodon/admin.scss | 10 ++++++++++ app/javascript/styles/mastodon/forms.scss | 10 ---------- app/views/auth/registrations/_sessions.html.haml | 2 +- app/views/auth/registrations/edit.html.haml | 8 +++----- config/locales/ar.yml | 2 +- config/locales/bg.yml | 2 +- config/locales/ca.yml | 2 +- config/locales/de.yml | 2 +- config/locales/en.yml | 3 ++- config/locales/eo.yml | 2 +- config/locales/es.yml | 2 +- config/locales/fa.yml | 2 +- config/locales/fi.yml | 2 +- config/locales/fr.yml | 2 +- config/locales/gl.yml | 2 +- config/locales/he.yml | 2 +- config/locales/hr.yml | 2 +- config/locales/hu.yml | 2 +- config/locales/id.yml | 2 +- config/locales/io.yml | 2 +- config/locales/it.yml | 2 +- config/locales/ja.yml | 2 +- config/locales/ko.yml | 2 +- config/locales/nl.yml | 2 +- config/locales/no.yml | 2 +- config/locales/oc.yml | 2 +- config/locales/pl.yml | 2 +- config/locales/pt-BR.yml | 2 +- config/locales/pt.yml | 2 +- config/locales/ru.yml | 2 +- config/locales/sk.yml | 2 +- config/locales/sr-Latn.yml | 2 +- config/locales/sr.yml | 2 +- config/locales/sv.yml | 2 +- config/locales/th.yml | 2 +- config/locales/tr.yml | 2 +- config/locales/uk.yml | 2 +- config/locales/zh-CN.yml | 2 +- config/locales/zh-HK.yml | 2 +- config/locales/zh-TW.yml | 2 +- config/navigation.rb | 2 +- 41 files changed, 52 insertions(+), 53 deletions(-) diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 0c343e1df1..e6bd0c717e 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/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; diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss index 2e38cda4ed..d74c5a4fd0 100644 --- a/app/javascript/styles/mastodon/forms.scss +++ b/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; diff --git a/app/views/auth/registrations/_sessions.html.haml b/app/views/auth/registrations/_sessions.html.haml index 8424a89012..8586c05495 100644 --- a/app/views/auth/registrations/_sessions.html.haml +++ b/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 diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml index fac702b38e..05fc7df313 100644 --- a/app/views/auth/registrations/edit.html.haml +++ b/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) diff --git a/config/locales/ar.yml b/config/locales/ar.yml index f641d3c2e0..bc71d9c87c 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -220,7 +220,6 @@ ar: regenerate_token: إعادة توليد رمز النفاذ your_token: رمز نفاذك auth: - change_password: الهوية confirm_email: تأكيد عنوان البريد الإلكتروني delete_account: حذف حساب delete_account_html: إن كنت ترغب في حذف حسابك يُمكنك المواصلة هنا. سوف يُطلَبُ منك التأكيد قبل الحذف. @@ -237,6 +236,7 @@ ar: register: إنشاء حساب resend_confirmation: إعادة إرسال تعليمات التأكيد reset_password: إعادة تعيين كلمة المرور + security: الهوية set_new_password: تعيين كلمة مرور جديدة authorize_follow: error: يا للأسف، وقع هناك خطأ إثر عملية البحث عن الحساب عن بعد diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 56a9048957..cb3ed22449 100644 --- a/config/locales/bg.yml +++ b/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: Възникна грешка в откриването на потребителя diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 5552202e51..c069adb4b7 100644 --- a/config/locales/ca.yml +++ b/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 els nostres termes del servei i la nostra política de privadesa. - change_password: Seguretat confirm_email: Confirmar correu electrònic delete_account: Suprimeix el compte delete_account_html: Si vols suprimir el compte pots fer-ho aquí. 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 diff --git a/config/locales/de.yml b/config/locales/de.yml index 8f17413e10..e55ad151ac 100644 --- a/config/locales/de.yml +++ b/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 auf dieser Instanz gelten und der Datenschutzerklärung einverstanden. - change_password: Sicherheit delete_account: Konto löschen delete_account_html: Falls du dein Konto löschen willst, kannst du hier damit fortfahren. 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 diff --git a/config/locales/en.yml b/config/locales/en.yml index 971a9976f7..176135657d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -359,7 +359,7 @@ en: your_token: Your access token auth: agreement_html: By signing up you agree to follow the rules of the instance and our terms of service. - 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 proceed here. 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 diff --git a/config/locales/eo.yml b/config/locales/eo.yml index dee6d4a187..6daa1caed5 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -358,7 +358,6 @@ eo: your_token: Via alira ĵetono auth: agreement_html: Per registriĝo, vi konsentas kun la reguloj de la nodo kaj niaj uzkondiĉoj. - change_password: Sekureco confirm_email: Konfirmi retadreson delete_account: Forigi konton delete_account_html: Se vi deziras forigi vian konton, vi povas fari tion ĉi tie. 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 diff --git a/config/locales/es.yml b/config/locales/es.yml index 9eb61aaac5..f55b8bb51a 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -353,7 +353,6 @@ es: your_token: Tu token de acceso auth: agreement_html: Al registrarte, acepta seguir las reglas de la instancia y nuestros términos de servicio. - change_password: Cambiar contraseña delete_account: Borrar cuenta delete_account_html: Si desea eliminar su cuenta, puede proceder aquí. 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 diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 395d226bd2..86756c01b8 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -344,7 +344,6 @@ fa: your_token: کد دسترسی شما auth: agreement_html: پیش از عضو شدن باید قوانین این سرور و شرایط استفادهٔ ما را بپذیرید. - change_password: امنیت delete_account: پاک‌کردن حساب delete_account_html: اگر می‌خواهید حساب خود را پاک کنید، از این‌جا پیش بروید. از شما درخواست تأیید خواهد شد. didnt_get_confirmation: راهنمایی برای تأیید را دریافت نکردید؟ @@ -357,6 +356,7 @@ fa: register: عضو شوید resend_confirmation: راهنمایی برای تأیید را دوباره بفرست reset_password: بازنشانی رمز + security: امنیت set_new_password: تعیین رمز تازه authorize_follow: error: متأسفانه حین یافتن آن حساب خطایی رخ داد diff --git a/config/locales/fi.yml b/config/locales/fi.yml index e9c7273ce6..71e019e549 100644 --- a/config/locales/fi.yml +++ b/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. diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 34910488f2..65effe7004 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -359,7 +359,6 @@ fr: your_token: Votre jeton d’accès auth: agreement_html: En vous inscrivant, vous souscrivez aux règles de l’instance et à nos conditions d’utilisation. - 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 cliquer ici. 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 diff --git a/config/locales/gl.yml b/config/locales/gl.yml index def9168cc8..ca02ea6939 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -359,7 +359,6 @@ gl: your_token: O seu testemuño de acceso auth: agreement_html: Rexistrándose acorda seguir as normas da instancia e os termos do servizo. - change_password: Seguridade confirm_email: Confirmar correo-e delete_account: Eliminar conta delete_account_html: Se desexa eliminar a súa conta, pode facelo aquí. 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 diff --git a/config/locales/he.yml b/config/locales/he.yml index c83f4ba10e..1a7c84d7cb 100644 --- a/config/locales/he.yml +++ b/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: למרבה הצער, היתה שגיאה בחיפוש החשבון המרוחק diff --git a/config/locales/hr.yml b/config/locales/hr.yml index a3c9aa4368..2d2eddc08c 100644 --- a/config/locales/hr.yml +++ b/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 diff --git a/config/locales/hu.yml b/config/locales/hu.yml index de35044d48..6be82c1de3 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -353,7 +353,6 @@ hu: your_token: Hozzáférési kulcsod auth: agreement_html: A feliratkozással elfogatod az instancia szabályzatát és a felhasználási feltételeket. - 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 kattints ide. 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 diff --git a/config/locales/id.yml b/config/locales/id.yml index 6e4d60fd88..0ef1d50404 100644 --- a/config/locales/id.yml +++ b/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 diff --git a/config/locales/io.yml b/config/locales/io.yml index db82147683..29ab4516b5 100644 --- a/config/locales/io.yml +++ b/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 diff --git a/config/locales/it.yml b/config/locales/it.yml index 6ab57d2fcc..7e5bfd20e2 100644 --- a/config/locales/it.yml +++ b/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 diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 1ff5085506..e44a093b51 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -359,7 +359,6 @@ ja: your_token: アクセストークン auth: agreement_html: 登録すると インスタンスのルール と 利用規約 に従うことに同意したことになります。 - change_password: セキュリティ confirm_email: メールアドレスの確認 delete_account: アカウントの削除 delete_account_html: アカウントを削除したい場合、こちら から手続きが行えます。削除する前に、確認画面があります。 @@ -378,6 +377,7 @@ ja: register: 登録する resend_confirmation: 確認メールを再送する reset_password: パスワードを再発行 + security: セキュリティ set_new_password: 新しいパスワード authorize_follow: error: 残念ながら、リモートアカウント情報の取得中にエラーが発生しました diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 4f26d87515..8a11b096ac 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -361,7 +361,6 @@ ko: your_token: 액세스 토큰 auth: agreement_html: 이 등록으로 이용규약 과 약관에 동의하는 것으로 간주됩니다. - change_password: 보안 confirm_email: 확인 메일 승인 delete_account: 계정 삭제 delete_account_html: 계정을 삭제하고 싶은 경우, 여기서 삭제할 수 있습니다. 삭제 전 확인 화면이 표시됩니다. @@ -377,6 +376,7 @@ ko: register: 등록하기 resend_confirmation: 확인 메일을 다시 보내기 reset_password: 비밀번호 재설정 + security: 보안 set_new_password: 새 비밀번호 authorize_follow: error: 리모트 계정을 확인하는 도중 오류가 발생했습니다 diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 876b91eafc..90139ca0e6 100644 --- a/config/locales/nl.yml +++ b/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 de regels van deze server en onze gebruikersvoorwaarden. - 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 hier doen. 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 diff --git a/config/locales/no.yml b/config/locales/no.yml index d198177cd1..3adf71bee3 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -353,7 +353,6 @@ your_token: Din tilgangsnøkkel auth: agreement_html: Ved å registrere deg godtar du å følge instansens regler og våre brukervilkår. - change_password: Sikkerhet delete_account: Slett konto delete_account_html: Hvis du ønsker å slette din konto kan du fortsette her. 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 diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 869118c086..160bbc3ed9 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -353,7 +353,6 @@ oc: your_token: Vòstre geton d’accès auth: agreement_html: En vos marcar acceptatz las règlas de l’instància e politica de confidencialitat. - change_password: Seguretat delete_account: Suprimir lo compte delete_account_html: Se volètz suprimir vòstre compte, podètz o far aquí. 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 diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 5fcc93f9d7..9a0c6ae155 100644 --- a/config/locales/pl.yml +++ b/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 informacjami o instancji i zasadami korzystania z usługi. - change_password: Bezpieczeństwo confirm_email: Potwierdź adres e-mail delete_account: Usunięcie konta delete_account_html: Jeżeli chcesz usunąć konto, przejdź tutaj. 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 diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index f781b704fc..04836c121b 100644 --- a/config/locales/pt-BR.yml +++ b/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 as regras da instância e os nossos termos de serviço. - 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 prosseguir para cá. 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 diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 455f278981..5012e176f2 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -353,7 +353,6 @@ pt: your_token: O teu token de acesso auth: agreement_html: Registando-te concordas em seguir as regras da instância e os nossos termos de serviço. - change_password: Alterar palavra-passe confirm_email: Confirmar e-mail delete_account: Eliminar conta delete_account_html: Se desejas eliminar a conta, podes continua aqui. 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 diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 467f24ca8d..a2cb1e793b 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -353,7 +353,6 @@ ru: your_token: Ваш токен доступа auth: agreement_html: Создавая аккаунт, вы соглашаетесь с правилами узла и нашими условиями обслуживания. - change_password: Изменить пароль delete_account: Удалить аккаунт delete_account_html: Если Вы хотите удалить свой аккаунт, вы можете перейти сюда. У Вас будет запрошено подтверждение. didnt_get_confirmation: Не получили инструкцию для подтверждения? @@ -366,6 +365,7 @@ ru: register: Зарегистрироваться resend_confirmation: Повторить отправку инструкции для подтверждения reset_password: Сбросить пароль + security: Изменить пароль set_new_password: Задать новый пароль authorize_follow: error: К сожалению, при поиске удаленного аккаунта возникла ошибка diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 9938c2bc4c..551fab3224 100644 --- a/config/locales/sk.yml +++ b/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ť 1 pravidlami tejto instancie 2 a taktiež 3 našími servisnými podmienkami 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 1 urobiť tu 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 diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 4eed44345b..2d984049aa 100644 --- a/config/locales/sr-Latn.yml +++ b/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 pravilima instance i uslovima korišćenja. - change_password: Bezbednost delete_account: Obriši nalog delete_account_html: Ako želite da obrišete Vaš nalog, možete nastaviti ovde. 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 diff --git a/config/locales/sr.yml b/config/locales/sr.yml index c564987656..2daf329155 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -346,7 +346,6 @@ sr: your_token: Ваш приступни токен auth: agreement_html: Приступањем инстанци се слажете са правилима инстанце и условима коришћења. - change_password: Безбедност delete_account: Обриши налог delete_account_html: Ако желите да обришете Ваш налог, можете наставити овде. Бићете упитани да потврдите. didnt_get_confirmation: Нисте добили поруку са упутствима за потврду налога? @@ -359,6 +358,7 @@ sr: register: Региструј се resend_confirmation: Пошаљи поруку са упутствима о потврди налога поново reset_password: Ресетуј лозинку + security: Безбедност set_new_password: Постави нову лозинку authorize_follow: error: Нажалост, десила се грешка при тражењу удаљеног налога diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 1e79b63e56..8d9c6d5dfa 100644 --- a/config/locales/sv.yml +++ b/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 instansens regler och våra användarvillkor. - 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 fortsätta här. 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 diff --git a/config/locales/th.yml b/config/locales/th.yml index 737b3aa959..45fe1e4752 100644 --- a/config/locales/th.yml +++ b/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 diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 23b4d7a244..ee0e330748 100644 --- a/config/locales/tr.yml +++ b/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. diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 0ddfa91906..4c1c66b318 100644 --- a/config/locales/uk.yml +++ b/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: На жаль, при пошуку віддаленого аккаунту виникла помилка diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 1bd2e5039a..1254651cd3 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -351,7 +351,6 @@ zh-CN: your_token: 你的访问令牌 auth: agreement_html: 注册即表示你同意遵守本实例的相关规定和我们的使用条款。 - change_password: 帐户安全 delete_account: 删除帐户 delete_account_html: 如果你想删除你的帐户，请点击这里继续。你需要确认你的操作。 didnt_get_confirmation: 没有收到确认邮件？ @@ -364,6 +363,7 @@ zh-CN: register: 注册 resend_confirmation: 重新发送确认邮件 reset_password: 重置密码 + security: 帐户安全 set_new_password: 设置新密码 authorize_follow: error: 对不起，寻找这个跨站用户时出错 diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index ed73b72442..e7ab347a1a 100644 --- a/config/locales/zh-HK.yml +++ b/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: 對不起，尋找這個跨站用戶的過程發生錯誤 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index bd9f858402..2fec09ed8e 100644 --- a/config/locales/zh-TW.yml +++ b/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: 對不起，搜尋遠端使用者出現錯誤 diff --git a/config/navigation.rb b/config/navigation.rb index 9c7a7d2ec6..2bee5a4f96 100644 --- a/config/navigation.rb +++ b/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