Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code

app/helpers/admin/filter_helper.rb

@@ -5,7 +5,7 @@ module Admin::FilterHelper
   REPORT_FILTERS       = %i(resolved account_id target_account_id).freeze
   INVITE_FILTER        = %i(available expired).freeze
   CUSTOM_EMOJI_FILTERS = %i(local remote by_domain shortcode).freeze
-  TAGS_FILTERS         = %i(context review).freeze
+  TAGS_FILTERS         = %i(directory reviewed unreviewed pending_review popular active name).freeze
   INSTANCES_FILTERS    = %i(limited by_domain).freeze
   FOLLOWERS_FILTERS    = %i(relationship status by_domain activity order).freeze
 

app/helpers/settings_helper.rb

@@ -42,7 +42,8 @@ module SettingsHelper
     no: 'Norsk',
     oc: 'Occitan',
     pl: 'Polski',
-    pt: 'Português (Portugal)',
+    pt: 'Português',
+    'pt-PT': 'Português (Portugal)',
     'pt-BR': 'Português (Brasil)',
     ro: 'Română',
     ru: 'Русский',