From c0dc03b3e4793cf507791e904facef839a08e3cf Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 20 Jul 2020 15:23:38 -0500 Subject: [PATCH] Deactivate --> Delete --- app/soapbox/actions/auth.js | 18 +++++----- app/soapbox/features/security/index.js | 26 +++++++------- app/soapbox/locales/ar.json | 10 +++--- app/soapbox/locales/ast.json | 10 +++--- app/soapbox/locales/bg.json | 10 +++--- app/soapbox/locales/bn.json | 10 +++--- app/soapbox/locales/br.json | 10 +++--- app/soapbox/locales/ca.json | 10 +++--- app/soapbox/locales/co.json | 10 +++--- app/soapbox/locales/cs.json | 10 +++--- app/soapbox/locales/cy.json | 10 +++--- app/soapbox/locales/da.json | 10 +++--- app/soapbox/locales/de.json | 10 +++--- app/soapbox/locales/defaultMessages.json | 43 +++++++++++++----------- app/soapbox/locales/el.json | 10 +++--- app/soapbox/locales/en.json | 10 +++--- app/soapbox/locales/eo.json | 10 +++--- app/soapbox/locales/es-AR.json | 10 +++--- app/soapbox/locales/es.json | 10 +++--- app/soapbox/locales/et.json | 10 +++--- app/soapbox/locales/eu.json | 10 +++--- app/soapbox/locales/fa.json | 10 +++--- app/soapbox/locales/fi.json | 10 +++--- app/soapbox/locales/fr.json | 10 +++--- app/soapbox/locales/ga.json | 10 +++--- app/soapbox/locales/gl.json | 10 +++--- app/soapbox/locales/he.json | 10 +++--- app/soapbox/locales/hi.json | 10 +++--- app/soapbox/locales/hr.json | 10 +++--- app/soapbox/locales/hu.json | 10 +++--- app/soapbox/locales/hy.json | 10 +++--- app/soapbox/locales/id.json | 10 +++--- app/soapbox/locales/io.json | 10 +++--- app/soapbox/locales/it.json | 10 +++--- app/soapbox/locales/ja.json | 10 +++--- app/soapbox/locales/ka.json | 10 +++--- app/soapbox/locales/kk.json | 10 +++--- app/soapbox/locales/ko.json | 10 +++--- app/soapbox/locales/lt.json | 10 +++--- app/soapbox/locales/lv.json | 10 +++--- app/soapbox/locales/mk.json | 10 +++--- app/soapbox/locales/ms.json | 10 +++--- app/soapbox/locales/nl.json | 10 +++--- app/soapbox/locales/nn.json | 10 +++--- app/soapbox/locales/no.json | 10 +++--- app/soapbox/locales/oc.json | 10 +++--- app/soapbox/locales/pl.json | 10 +++--- app/soapbox/locales/pt-BR.json | 10 +++--- app/soapbox/locales/pt.json | 10 +++--- app/soapbox/locales/ro.json | 10 +++--- app/soapbox/locales/ru.json | 10 +++--- app/soapbox/locales/sk.json | 10 +++--- app/soapbox/locales/sl.json | 10 +++--- app/soapbox/locales/sq.json | 10 +++--- app/soapbox/locales/sr-Latn.json | 10 +++--- app/soapbox/locales/sr.json | 10 +++--- app/soapbox/locales/sv.json | 10 +++--- app/soapbox/locales/ta.json | 10 +++--- app/soapbox/locales/te.json | 10 +++--- app/soapbox/locales/th.json | 10 +++--- app/soapbox/locales/tr.json | 10 +++--- app/soapbox/locales/uk.json | 10 +++--- app/soapbox/locales/zh-CN.json | 10 +++--- app/soapbox/locales/zh-HK.json | 10 +++--- app/soapbox/locales/zh-TW.json | 10 +++--- 65 files changed, 355 insertions(+), 352 deletions(-) diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js index 412ea0d82..c241b801f 100644 --- a/app/soapbox/actions/auth.js +++ b/app/soapbox/actions/auth.js @@ -19,9 +19,9 @@ export const CHANGE_EMAIL_REQUEST = 'CHANGE_EMAIL_REQUEST'; export const CHANGE_EMAIL_SUCCESS = 'CHANGE_EMAIL_SUCCESS'; export const CHANGE_EMAIL_FAIL = 'CHANGE_EMAIL_FAIL'; -export const DEACTIVATE_ACCOUNT_REQUEST = 'DEACTIVATE_ACCOUNT_REQUEST'; -export const DEACTIVATE_ACCOUNT_SUCCESS = 'DEACTIVATE_ACCOUNT_SUCCESS'; -export const DEACTIVATE_ACCOUNT_FAIL = 'DEACTIVATE_ACCOUNT_FAIL'; +export const DELETE_ACCOUNT_REQUEST = 'DELETE_ACCOUNT_REQUEST'; +export const DELETE_ACCOUNT_SUCCESS = 'DELETE_ACCOUNT_SUCCESS'; +export const DELETE_ACCOUNT_FAIL = 'DELETE_ACCOUNT_FAIL'; export const CHANGE_PASSWORD_REQUEST = 'CHANGE_PASSWORD_REQUEST'; export const CHANGE_PASSWORD_SUCCESS = 'CHANGE_PASSWORD_SUCCESS'; @@ -187,18 +187,18 @@ export function changeEmail(email, password) { }; } -export function deactivateAccount(password) { +export function deleteAccount(password) { return (dispatch, getState) => { - dispatch({ type: DEACTIVATE_ACCOUNT_REQUEST }); - return api(getState).post('/api/pleroma/disable_account', { + dispatch({ type: DELETE_ACCOUNT_REQUEST }); + return api(getState).post('/api/pleroma/delete_account', { password, }).then(response => { if (response.data.error) throw response.data.error; // This endpoint returns HTTP 200 even on failure - dispatch({ type: DEACTIVATE_ACCOUNT_SUCCESS, response }); + dispatch({ type: DELETE_ACCOUNT_SUCCESS, response }); dispatch({ type: AUTH_LOGGED_OUT }); - dispatch(showAlert('Successfully logged out.', '')); + dispatch(showAlert('Successfully logged out.', '')); }).catch(error => { - dispatch({ type: DEACTIVATE_ACCOUNT_FAIL, error, skipAlert: true }); + dispatch({ type: DELETE_ACCOUNT_FAIL, error, skipAlert: true }); throw error; }); }; diff --git a/app/soapbox/features/security/index.js b/app/soapbox/features/security/index.js index df8e75f4e..f69c31f6d 100644 --- a/app/soapbox/features/security/index.js +++ b/app/soapbox/features/security/index.js @@ -16,7 +16,7 @@ import { changePassword, fetchOAuthTokens, revokeOAuthToken, - deactivateAccount, + deleteAccount, } from 'soapbox/actions/auth'; import { showAlert } from 'soapbox/actions/alerts'; @@ -46,13 +46,11 @@ const messages = defineMessages({ emailHeader: { id: 'security.headers.update_email', defaultMessage: 'Change Email' }, passwordHeader: { id: 'security.headers.update_password', defaultMessage: 'Change Password' }, tokenHeader: { id: 'security.headers.tokens', defaultMessage: 'Sessions' }, - deactivateHeader: { id: 'security.headers.deactivate', defaultMessage: 'Deactivate Account' }, - deactivateText: { id: 'security.text.deactivate', defaultMessage: 'To deactivate your account, you must first enter your account password, then click Deactivate Account. \ - \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \ - \n In addition, any of your data that was previously distributed to other servers will remain on those servers.' }, - deactivateSubmit: { id: 'security.submit.deactivate', defaultMessage: 'Deactivate Account' }, - deactivateAccountSuccess: { id: 'security.deactivate_account.success', defaultMessage: 'Account successfully deactivated.' }, - deactivateAccountFail: { id: 'security.deactivate_account.fail', defaultMessage: 'Account deactivation failed.' }, + deleteHeader: { id: 'security.headers.delete', defaultMessage: 'Delete Account' }, + deleteText: { id: 'security.text.delete', defaultMessage: 'To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It\'s not guaranteed that all servers will purge your account.' }, + deleteSubmit: { id: 'security.submit.delete', defaultMessage: 'Delete Account' }, + deleteAccountSuccess: { id: 'security.delete_account.success', defaultMessage: 'Account successfully deleted.' }, + deleteAccountFail: { id: 'security.delete_account.fail', defaultMessage: 'Account deletion failed.' }, }); export default @injectIntl @@ -310,12 +308,12 @@ class DeactivateAccount extends ImmutablePureComponent { const { password } = this.state; const { dispatch, intl } = this.props; this.setState({ isLoading: true }); - return dispatch(deactivateAccount(password)).then(() => { + return dispatch(deleteAccount(password)).then(() => { //this.setState({ email: '', password: '' }); // TODO: Maybe redirect user - dispatch(showAlert('', intl.formatMessage(messages.deactivateAccountSuccess))); + dispatch(showAlert('', intl.formatMessage(messages.deleteAccountSuccess))); }).catch(error => { this.setState({ password: '' }); - dispatch(showAlert('', intl.formatMessage(messages.deactivateAccountFail))); + dispatch(showAlert('', intl.formatMessage(messages.deleteAccountFail))); }).then(() => { this.setState({ isLoading: false }); }); @@ -326,9 +324,9 @@ class DeactivateAccount extends ImmutablePureComponent { return ( -

{intl.formatMessage(messages.deactivateHeader)}

+

{intl.formatMessage(messages.deleteHeader)}

- {intl.formatMessage(messages.deactivateText)} + {intl.formatMessage(messages.deleteText)}

@@ -341,7 +339,7 @@ class DeactivateAccount extends ImmutablePureComponent { />
diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json index 02b5d9949..1029d3b53 100644 --- a/app/soapbox/locales/ar.json +++ b/app/soapbox/locales/ar.json @@ -379,20 +379,20 @@ "search_results.statuses": "التبويقات", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} و {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/ast.json b/app/soapbox/locales/ast.json index 2529c8313..09031554f 100644 --- a/app/soapbox/locales/ast.json +++ b/app/soapbox/locales/ast.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/bg.json b/app/soapbox/locales/bg.json index 89b0a7791..53d78b17f 100644 --- a/app/soapbox/locales/bg.json +++ b/app/soapbox/locales/bg.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/bn.json b/app/soapbox/locales/bn.json index 8e3fb04bd..3b460f31a 100644 --- a/app/soapbox/locales/bn.json +++ b/app/soapbox/locales/bn.json @@ -379,20 +379,20 @@ "search_results.statuses": "টুট", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {ফলাফল} other {ফলাফল}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/br.json b/app/soapbox/locales/br.json index 4f58f5c24..9ebe52096 100644 --- a/app/soapbox/locales/br.json +++ b/app/soapbox/locales/br.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/ca.json b/app/soapbox/locales/ca.json index 179952f3b..45cd44fad 100644 --- a/app/soapbox/locales/ca.json +++ b/app/soapbox/locales/ca.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/co.json b/app/soapbox/locales/co.json index 54cffa825..06b856af9 100644 --- a/app/soapbox/locales/co.json +++ b/app/soapbox/locales/co.json @@ -379,20 +379,20 @@ "search_results.statuses": "Statuti", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {risultatu} other {risultati}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/cs.json b/app/soapbox/locales/cs.json index 63734dbb6..263487fb9 100644 --- a/app/soapbox/locales/cs.json +++ b/app/soapbox/locales/cs.json @@ -379,20 +379,20 @@ "search_results.statuses": "Příspěvky", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {výsledek} few {výsledky} many {výsledku} other {výsledků}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Emailová addresa", "security.fields.new_password.label": "Nové heslo", "security.fields.old_password.label": "Současné heslo", "security.fields.password.label": "Heslo", "security.fields.password_confirmation.label": "Nové heslo (znova)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Změnit email", "security.headers.update_password": "Změnit heslo", "security.submit": "Uložit změny", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Změna emailu se nezdařila.", "security.update_email.success": "Email úspěšně změněn.", diff --git a/app/soapbox/locales/cy.json b/app/soapbox/locales/cy.json index ae192c96d..4296abf9d 100644 --- a/app/soapbox/locales/cy.json +++ b/app/soapbox/locales/cy.json @@ -379,20 +379,20 @@ "search_results.statuses": "Tŵtiau", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/da.json b/app/soapbox/locales/da.json index d8269a901..abf2ca76b 100644 --- a/app/soapbox/locales/da.json +++ b/app/soapbox/locales/da.json @@ -379,20 +379,20 @@ "search_results.statuses": "Trut", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {resultat} other {resultater}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json index d88c8add5..36a224446 100644 --- a/app/soapbox/locales/de.json +++ b/app/soapbox/locales/de.json @@ -379,20 +379,20 @@ "search_results.statuses": "Beiträge", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {Ergebnis} other {Ergebnisse}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Emailaddresse", "security.fields.new_password.label": "Neues Passwort", "security.fields.old_password.label": "Bisheriges Passwort", "security.fields.password.label": "Passwort", "security.fields.password_confirmation.label": "Neues Passwort (wiederholen)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Email ändern", "security.headers.update_password": "Passwort ändern", "security.submit": "Änderungen speichern", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Widerrufen", "security.update_email.fail": "Änderung der Emailadresse fehlgeschlagen.", "security.update_email.success": "Die neue Emailadresse wurde gespeichert.", diff --git a/app/soapbox/locales/defaultMessages.json b/app/soapbox/locales/defaultMessages.json index 2b0924d12..f26413b9e 100644 --- a/app/soapbox/locales/defaultMessages.json +++ b/app/soapbox/locales/defaultMessages.json @@ -1271,7 +1271,7 @@ { "descriptors": [ { - "defaultMessage": "Add media attachment", + "defaultMessage": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)", "id": "upload_button.label" } ], @@ -2402,24 +2402,24 @@ "id": "security.headers.tokens" }, { - "defaultMessage": "Deactivate Account", - "id": "security.headers.deactivate" + "defaultMessage": "Delete Account", + "id": "security.headers.delete" }, { - "defaultMessage": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", - "id": "security.text.deactivate" + "defaultMessage": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", + "id": "security.text.delete" }, { - "defaultMessage": "Deactivate Account", - "id": "security.submit.deactivate" + "defaultMessage": "Delete Account", + "id": "security.submit.delete" }, { - "defaultMessage": "Account successfully deactivated.", - "id": "security.deactivate_account.success" + "defaultMessage": "Account successfully deleted.", + "id": "security.delete_account.success" }, { - "defaultMessage": "Account deactivation failed.", - "id": "security.deactivate_account.fail" + "defaultMessage": "Account deletion failed.", + "id": "security.delete_account.fail" } ], "path": "app/soapbox/features/security/index.json" @@ -2941,14 +2941,6 @@ "defaultMessage": "Post", "id": "tabs_bar.post" }, - { - "defaultMessage": "Switch to light theme", - "id": "tabs_bar.theme_toggle_light" - }, - { - "defaultMessage": "Switch to dark theme", - "id": "tabs_bar.theme_toggle_dark" - }, { "defaultMessage": "Home", "id": "tabs_bar.home" @@ -2972,6 +2964,19 @@ ], "path": "app/soapbox/features/ui/components/tabs_bar.json" }, + { + "descriptors": [ + { + "defaultMessage": "Switch to light theme", + "id": "tabs_bar.theme_toggle_light" + }, + { + "defaultMessage": "Switch to dark theme", + "id": "tabs_bar.theme_toggle_dark" + } + ], + "path": "app/soapbox/features/ui/components/theme_toggle.json" + }, { "descriptors": [ { diff --git a/app/soapbox/locales/el.json b/app/soapbox/locales/el.json index 5fa005a9f..cd214a75a 100644 --- a/app/soapbox/locales/el.json +++ b/app/soapbox/locales/el.json @@ -379,20 +379,20 @@ "search_results.statuses": "Τουτ", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, zero {αποτελέσματα} one {αποτέλεσμα} other {αποτελέσματα}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json index 1b5b71ed0..8d958e687 100644 --- a/app/soapbox/locales/en.json +++ b/app/soapbox/locales/en.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/eo.json b/app/soapbox/locales/eo.json index e23e2ba27..f0de3c639 100644 --- a/app/soapbox/locales/eo.json +++ b/app/soapbox/locales/eo.json @@ -379,20 +379,20 @@ "search_results.statuses": "Mesaĝoj", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {rezulto} other {rezultoj}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/es-AR.json b/app/soapbox/locales/es-AR.json index bc7e5076e..0209e8c72 100644 --- a/app/soapbox/locales/es-AR.json +++ b/app/soapbox/locales/es-AR.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json index 2f2896c93..806de6154 100644 --- a/app/soapbox/locales/es.json +++ b/app/soapbox/locales/es.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/et.json b/app/soapbox/locales/et.json index b6f6bc704..f2c6d0804 100644 --- a/app/soapbox/locales/et.json +++ b/app/soapbox/locales/et.json @@ -379,20 +379,20 @@ "search_results.statuses": "Tuudid", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {tulemus} other {tulemust}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/eu.json b/app/soapbox/locales/eu.json index fe529fab7..d2d53623f 100644 --- a/app/soapbox/locales/eu.json +++ b/app/soapbox/locales/eu.json @@ -379,20 +379,20 @@ "search_results.statuses": "Toot-ak", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {emaitza} other {emaitzak}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/fa.json b/app/soapbox/locales/fa.json index 5b4beda28..353b9645b 100644 --- a/app/soapbox/locales/fa.json +++ b/app/soapbox/locales/fa.json @@ -379,20 +379,20 @@ "search_results.statuses": "بوق‌ها", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {نتیجه} other {نتیجه}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/fi.json b/app/soapbox/locales/fi.json index dbd96f05c..e7488b710 100644 --- a/app/soapbox/locales/fi.json +++ b/app/soapbox/locales/fi.json @@ -379,20 +379,20 @@ "search_results.statuses": "Tuuttaukset", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {tulos} other {tulosta}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json index 295295561..9e9733da2 100644 --- a/app/soapbox/locales/fr.json +++ b/app/soapbox/locales/fr.json @@ -379,20 +379,20 @@ "search_results.statuses": "Pouets", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json index f130fb667..d499674c5 100644 --- a/app/soapbox/locales/ga.json +++ b/app/soapbox/locales/ga.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/gl.json b/app/soapbox/locales/gl.json index fa03e6447..e6facd425 100644 --- a/app/soapbox/locales/gl.json +++ b/app/soapbox/locales/gl.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count,plural,one {result} outros {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/he.json b/app/soapbox/locales/he.json index 939d3ddd6..440a6350c 100644 --- a/app/soapbox/locales/he.json +++ b/app/soapbox/locales/he.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {תוצאה} other {תוצאות}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json index 18d946f52..f2d98d34a 100644 --- a/app/soapbox/locales/hi.json +++ b/app/soapbox/locales/hi.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json index cc2f3585b..60e5114b0 100644 --- a/app/soapbox/locales/hr.json +++ b/app/soapbox/locales/hr.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/hu.json b/app/soapbox/locales/hu.json index 7120a5e8d..d1b96be89 100644 --- a/app/soapbox/locales/hu.json +++ b/app/soapbox/locales/hu.json @@ -379,20 +379,20 @@ "search_results.statuses": "Tülkök", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {találat} other {találat}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/hy.json b/app/soapbox/locales/hy.json index a96d1fa77..195932e29 100644 --- a/app/soapbox/locales/hy.json +++ b/app/soapbox/locales/hy.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {արդյունք} other {արդյունք}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/id.json b/app/soapbox/locales/id.json index 0acb7c70e..e701eb4d7 100644 --- a/app/soapbox/locales/id.json +++ b/app/soapbox/locales/id.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {hasil} other {hasil}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json index 7ed9b564a..25a1fcd27 100644 --- a/app/soapbox/locales/io.json +++ b/app/soapbox/locales/io.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {rezulto} other {rezulti}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json index 532ed4012..7e4d70354 100644 --- a/app/soapbox/locales/it.json +++ b/app/soapbox/locales/it.json @@ -379,20 +379,20 @@ "search_results.statuses": "Toot", "search_results.top": "Top", "search_results.total": "{count} {count, plural, one {risultato} other {risultati}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/ja.json b/app/soapbox/locales/ja.json index 8d9ad01ba..abfdadc24 100644 --- a/app/soapbox/locales/ja.json +++ b/app/soapbox/locales/ja.json @@ -379,20 +379,20 @@ "search_results.statuses": "トゥート", "search_results.top": "Top", "search_results.total": "{count, number}件の結果", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json index 8950b5f8e..eacf39646 100644 --- a/app/soapbox/locales/ka.json +++ b/app/soapbox/locales/ka.json @@ -379,20 +379,20 @@ "search_results.statuses": "ტუტები", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/kk.json b/app/soapbox/locales/kk.json index 3f9d87a18..8369a8e3f 100644 --- a/app/soapbox/locales/kk.json +++ b/app/soapbox/locales/kk.json @@ -379,20 +379,20 @@ "search_results.statuses": "Жазбалар", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json index 82e53c134..4f8172afc 100644 --- a/app/soapbox/locales/ko.json +++ b/app/soapbox/locales/ko.json @@ -379,20 +379,20 @@ "search_results.statuses": "툿", "search_results.top": "Top", "search_results.total": "{count, number}건의 결과", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json index 0392a90af..a006305b0 100644 --- a/app/soapbox/locales/lt.json +++ b/app/soapbox/locales/lt.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json index 449ab4bfd..ff733946a 100644 --- a/app/soapbox/locales/lv.json +++ b/app/soapbox/locales/lv.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json index 4a3392d2e..b5bcd4b14 100644 --- a/app/soapbox/locales/mk.json +++ b/app/soapbox/locales/mk.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json index 5d3215b1e..91bad4375 100644 --- a/app/soapbox/locales/ms.json +++ b/app/soapbox/locales/ms.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/nl.json b/app/soapbox/locales/nl.json index fa647223a..37ec6e6d2 100644 --- a/app/soapbox/locales/nl.json +++ b/app/soapbox/locales/nl.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/nn.json b/app/soapbox/locales/nn.json index e7487c198..6a8aceac7 100644 --- a/app/soapbox/locales/nn.json +++ b/app/soapbox/locales/nn.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json index 15889c02a..f64edfb0d 100644 --- a/app/soapbox/locales/no.json +++ b/app/soapbox/locales/no.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {resultat} other {resultater}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/oc.json b/app/soapbox/locales/oc.json index 9ef5c8b63..7f7f48215 100644 --- a/app/soapbox/locales/oc.json +++ b/app/soapbox/locales/oc.json @@ -379,20 +379,20 @@ "search_results.statuses": "Tuts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json index 589d7406f..fc29622ea 100644 --- a/app/soapbox/locales/pl.json +++ b/app/soapbox/locales/pl.json @@ -379,20 +379,20 @@ "search_results.statuses": "Wpisy", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {wynik} few {wyniki} many {wyników} more {wyników}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json index 6dabb6eea..8fbcaffe7 100644 --- a/app/soapbox/locales/pt-BR.json +++ b/app/soapbox/locales/pt-BR.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/pt.json b/app/soapbox/locales/pt.json index 8678cc082..74351dfce 100644 --- a/app/soapbox/locales/pt.json +++ b/app/soapbox/locales/pt.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json index 444d4e35d..2d070e549 100644 --- a/app/soapbox/locales/ro.json +++ b/app/soapbox/locales/ro.json @@ -379,20 +379,20 @@ "search_results.statuses": "Postări", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json index c9c6a6ed2..3346cd062 100644 --- a/app/soapbox/locales/ru.json +++ b/app/soapbox/locales/ru.json @@ -379,20 +379,20 @@ "search_results.statuses": "Посты", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {результат} few {результата} many {результатов} other {результатов}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/sk.json b/app/soapbox/locales/sk.json index b17718ad6..faec1cb8a 100644 --- a/app/soapbox/locales/sk.json +++ b/app/soapbox/locales/sk.json @@ -379,20 +379,20 @@ "search_results.statuses": "Príspevky", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {výsledok} many {výsledkov} other {výsledky}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/sl.json b/app/soapbox/locales/sl.json index 97e143660..dbfbd9f6a 100644 --- a/app/soapbox/locales/sl.json +++ b/app/soapbox/locales/sl.json @@ -379,20 +379,20 @@ "search_results.statuses": "Tuti", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {rezultat} other {rezultatov}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/sq.json b/app/soapbox/locales/sq.json index 8c45a2e74..0d297feb1 100644 --- a/app/soapbox/locales/sq.json +++ b/app/soapbox/locales/sq.json @@ -379,20 +379,20 @@ "search_results.statuses": "Mesazhe", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {rezultat} other {rezultate}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json index 0dea46c72..ebcbe0129 100644 --- a/app/soapbox/locales/sr-Latn.json +++ b/app/soapbox/locales/sr-Latn.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {rezultat} few {rezultata} other {rezultata}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json index 5f620c0b0..64971a485 100644 --- a/app/soapbox/locales/sr.json +++ b/app/soapbox/locales/sr.json @@ -379,20 +379,20 @@ "search_results.statuses": "Трубе", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {резултат} few {резултата} other {резултата}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/sv.json b/app/soapbox/locales/sv.json index cc0721453..b070ce903 100644 --- a/app/soapbox/locales/sv.json +++ b/app/soapbox/locales/sv.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, ett {result} andra {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/ta.json b/app/soapbox/locales/ta.json index 8897b7ebd..90ab46ec8 100644 --- a/app/soapbox/locales/ta.json +++ b/app/soapbox/locales/ta.json @@ -379,20 +379,20 @@ "search_results.statuses": "Posts", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} மற்ற {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/te.json b/app/soapbox/locales/te.json index be51f87fd..d783b2963 100644 --- a/app/soapbox/locales/te.json +++ b/app/soapbox/locales/te.json @@ -379,20 +379,20 @@ "search_results.statuses": "టూట్లు", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {result} other {results}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/th.json b/app/soapbox/locales/th.json index 6a144d71f..3d69d4ef7 100644 --- a/app/soapbox/locales/th.json +++ b/app/soapbox/locales/th.json @@ -379,20 +379,20 @@ "search_results.statuses": "โพสต์", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, other {ผลลัพธ์}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json index 4d5560f87..697a2cb99 100644 --- a/app/soapbox/locales/tr.json +++ b/app/soapbox/locales/tr.json @@ -379,20 +379,20 @@ "search_results.statuses": "Gönderiler", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {sonuç} other {sonuçlar}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json index cf724f21f..31805ad90 100644 --- a/app/soapbox/locales/uk.json +++ b/app/soapbox/locales/uk.json @@ -379,20 +379,20 @@ "search_results.statuses": "Дмухів", "search_results.top": "Top", "search_results.total": "{count, number} {count, plural, one {результат} few {результати} many {результатів} other {результатів}}", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json index 6687ff686..836c7ccd2 100644 --- a/app/soapbox/locales/zh-CN.json +++ b/app/soapbox/locales/zh-CN.json @@ -379,20 +379,20 @@ "search_results.statuses": "嘟文", "search_results.top": "Top", "search_results.total": "共 {count, number} 个结果", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json index 7f21366bd..c79aa4256 100644 --- a/app/soapbox/locales/zh-HK.json +++ b/app/soapbox/locales/zh-HK.json @@ -379,20 +379,20 @@ "search_results.statuses": "文章", "search_results.top": "Top", "search_results.total": "{count, number} 項結果", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.", diff --git a/app/soapbox/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json index 501069107..8a930f6cc 100644 --- a/app/soapbox/locales/zh-TW.json +++ b/app/soapbox/locales/zh-TW.json @@ -379,20 +379,20 @@ "search_results.statuses": "嘟文", "search_results.top": "Top", "search_results.total": "{count, number} 項結果", - "security.deactivate_account.fail": "Account deactivation failed.", - "security.deactivate_account.success": "Account successfully deactivated.", + "security.delete_account.fail": "Account deletion failed.", + "security.delete_account.success": "Account successfully deleted.", "security.fields.email.label": "Email address", "security.fields.new_password.label": "New password", "security.fields.old_password.label": "Current password", "security.fields.password.label": "Password", "security.fields.password_confirmation.label": "New password (again)", - "security.headers.deactivate": "Deactivate Account", + "security.headers.delete": "Delete Account", "security.headers.tokens": "Sessions", "security.headers.update_email": "Change Email", "security.headers.update_password": "Change Password", "security.submit": "Save changes", - "security.submit.deactivate": "Deactivate Account", - "security.text.deactivate": "To deactivate your account, you must first enter your account password, then click Deactivate Account. \n Account deactivation will hide your profile and your posts on this server. \n However, your account will not be deleted and your data will not be purged. \n In addition, any of your data that was previously distributed to other servers will remain on those servers.", + "security.submit.delete": "Delete Account", + "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.", "security.tokens.revoke": "Revoke", "security.update_email.fail": "Update email failed.", "security.update_email.success": "Email successfully updated.",