Merge remote-tracking branch 'origin/master' into merge-upstream

 Conflicts:
	app/controllers/auth/confirmations_controller.rb

1 files changed, 6 insertions, 0 deletions

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b283f94f0..2691b9ed9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -265,12 +265,18 @@ en:
       unresolved: Unresolved
       view: View
     settings:
+      activity_api_enabled:
+        desc_html: Counts of locally posted statuses, active users, and new registrations in weekly buckets
+        title: Publish aggregate statistics about user activity
       bootstrap_timeline_accounts:
         desc_html: Separate multiple usernames by comma. Only local and unlocked accounts will work. Default when empty is all local admins.
         title: Default follows for new users
       contact_information:
         email: Business e-mail
         username: Contact username
+      peers_api_enabled:
+        desc_html: Domain names this instance has encountered in the fediverse
+        title: Publish list of discovered instances
       registrations:
         closed_message:
           desc_html: Displayed on frontpage when registrations are closed. You can use HTML tags