about summary refs log tree commit diff
path: root/config/locales/simple_form.en.yml
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-24 00:38:37 +0200
committerGitHub <noreply@github.com>2017-04-24 00:38:37 +0200
commit501514960a9de238e23cd607d2e8f4c1ff9f16c1 (patch)
treecf15e7726e7dfda032502c237af4e91cc92ed46a /config/locales/simple_form.en.yml
parentef5937da1ff2d6caca244439dd9b9b9ed85fb278 (diff)
Followers-only post federation (#2111)
* Make private toots get PuSHed to subscription URLs that belong to domains where you have approved followers

* Authorized followers controller, stub for bulk action

* Soft block in the background

* Add simple test for new controller

* Rename Settings::FollowersController to Settings::FollowerDomainsController, paginate results,
rename "private" post setting to "followers-only", fix pagination style, improve post privacy
preferences style, improve warning style

* Extract compose form warnings into own container, show warning when posting to followers-only with unlocked account
Diffstat (limited to 'config/locales/simple_form.en.yml')
-rw-r--r--config/locales/simple_form.en.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 790d56452..4aa3818fd 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -23,7 +23,7 @@ en:
         email: E-mail address
         header: Header
         locale: Language
-        locked: Make account private
+        locked: Lock account
         new_password: New password
         note: Bio
         otp_attempt: Two-factor code