about summary refs log tree commit diff
path: root/config/locales
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-05-07 09:31:07 +0200
committerGitHub <noreply@github.com>2018-05-07 09:31:07 +0200
commit42cd363542abf0a12a4e877b3ad26024f24577ef (patch)
treeb9539c370516cf0dcf1cc64b4975a1b6e84b9e56 /config/locales
parent0f0cc3f2eba9c8a701d735cd54206629eeea4ddb (diff)
Bot nameplates (#7391)
* Store actor type in database

* Add bot nameplate to web UI, add setting to preferences, API, AP
Fix #7365

* Fix code style issues
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml1
-rw-r--r--config/locales/simple_form.en.yml2
2 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e18354eac..5369311ac 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -49,6 +49,7 @@ en:
     reserved_username: The username is reserved
     roles:
       admin: Admin
+      bot: Bot
       moderator: Mod
     unfollow: Unfollow
   admin:
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 7ba32906d..495c6166b 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -4,6 +4,7 @@ en:
     hints:
       defaults:
         avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px
+        bot: Warns people that the account does not represent a person
         digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
         display_name:
           one: <span class="name-counter">1</span> character left
@@ -29,6 +30,7 @@ en:
           value: Content
       defaults:
         avatar: Avatar
+        bot: This is a bot account
         confirm_new_password: Confirm new password
         confirm_password: Confirm password
         current_password: Current password