Add ability to disable login and mark accounts as memorial (#5615)

Fix #5597
This commit is contained in:
Eugen Rochko
2017-11-07 19:06:44 +01:00
committed by GitHub
parent cbbeec05be
commit 1032f3994f
17 changed files with 168 additions and 39 deletions

View File

@ -62,11 +62,15 @@ en:
by_domain: Domain
confirm: Confirm
confirmed: Confirmed
disable: Disable
disable_two_factor_authentication: Disable 2FA
disabled: Disabled
display_name: Display name
domain: Domain
edit: Edit
email: E-mail
enable: Enable
enabled: Enabled
feed_url: Feed URL
followers: Followers
followers_url: Followers URL
@ -78,7 +82,9 @@ en:
local: Local
remote: Remote
title: Location
login_status: Login status
media_attachments: Media attachments
memorialize: Turn into memoriam
moderation:
all: All
silenced: Silenced
@ -379,6 +385,7 @@ en:
following: Following list
muting: Muting list
upload: Upload
in_memoriam_html: In Memoriam.
landing_strip_html: "<strong>%{name}</strong> is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse."
landing_strip_signup_html: If you don't, you can <a href="%{sign_up_path}">sign up here</a>.
media_attachments: