Revert "Add reject pattern to Admin setting"

This reverts commit 0cd5faaa9d.

config/locales/en.yml

@@ -744,10 +744,6 @@ en:
         all: To everyone
         disabled: To no one
         users: To logged-in local users
-      others:
-        activitypub: ActivityPub
-        preamble: Other settings, including customizing behavior
-        title: Other settings
       registrations:
         preamble: Control who can create an account on your server.
         title: Registrations
@@ -756,15 +752,7 @@ en:
           approved: Approval required for sign up
           none: Nobody can sign up
           open: Anyone can sign up
-      reject_pattern:
-        desc_html: Set a regular expression pattern to inspect Create Activity content, and refuse Activity if you match
-        title: Reject Pattern
-      security:
-        authorized_fetch: Require authentication from federated servers
-        authorized_fetch_hint: Requiring authentication from federated servers enables stricter enforcement of both user-level and server-level blocks. However, this comes at the cost of a performance penalty, reduces the reach of your replies, and may introduce compatibility issues with some federated services. In addition, this will not prevent dedicated actors from fetching your public posts and accounts.
-        authorized_fetch_overridden_hint: You are currently unable to change this setting because it is overridden by an environment variable.
-        federation_authentication: Federation authentication enforcement
-      title: Server settings
+      title: Server Settings
     site_uploads:
       delete: Delete uploaded file
       destroyed_msg: Site upload successfully deleted!
@@ -976,11 +964,6 @@ en:
   applications:
     created: Application successfully created
     destroyed: Application successfully deleted
-<<<<<<< HEAD
-=======
-    invalid_regexp: "The provided Regexp is invalid: %{message}"
-    logout: Logout
->>>>>>> b663df641... Add reject pattern to Admin setting
     regenerate_token: Regenerate access token
     token_regenerated: Access token successfully regenerated
     warning: Be very careful with this data. Never share it with anyone!