diff options
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 6 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 684c86f4a..4cf958517 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -40,6 +40,10 @@ en: x_minutes: "%{count}m" x_months: "%{count}mo" x_seconds: "%{count}s" + follow_requests: + authorize: Authorize + reject: Reject + title: Follow requests generic: changes_saved_msg: Changes successfully saved! powered_by: powered by %{link} @@ -70,8 +74,8 @@ en: click_to_show: Click to show favourited: favourited a post by is_now_following: is now following - sensitive_content: Sensitive content reblogged: boosted + sensitive_content: Sensitive content time: formats: default: "%b %d, %Y, %H:%M" diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 50c0f99fd..12b717877 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -1,6 +1,9 @@ --- en: simple_form: + hints: + defaults: + locked: Requires you to manually approve followers and defaults post privacy to followers-only labels: defaults: avatar: Avatar @@ -11,11 +14,11 @@ en: email: E-mail address header: Header locale: Language + locked: Make account private new_password: New password note: Bio password: Password username: Username - locked: Make account private interactions: must_be_follower: Block notifications from non-followers must_be_following: Block notifications from people you don't follow @@ -24,9 +27,6 @@ en: follow: Send e-mail when someone follows you mention: Send e-mail when someone mentions you reblog: Send e-mail when someone reblogs your status - hints: - defaults: - locked: Requires you to manually approve followers and defaults post privacy to followers-only 'no': 'No' required: mark: "*" |