diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-18 18:03:27 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-18 18:03:27 +0100 |
commit | 291012ec0c08f5323b2102eb4d2dc8714ddce4d9 (patch) | |
tree | 09e7a5fef106da1b6ebdc53ac0df62cafc159520 /config/locales/en.yml | |
parent | 6e3a4bcbc70bb33bfb0746cf3b2186ee9f4e6515 (diff) | |
parent | f85b66eb8cc9513822d0ece3928b12aa789bb410 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system.
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 8a17d88e0..81059b163 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -755,9 +755,11 @@ en: publishing: Publishing web: Web relationships: - abandoned: Abandoned - active: Active + activity: Account activity + dormant: Dormant + moved: Moved mutual: Mutual + primary: Primary relationship: Relationship remove_selected_domains: Remove all followers from the selected domains remove_selected_followers: Remove selected followers |