From ea1863ac3a5d3051e07815d07df0d3f2abd9166f Mon Sep 17 00:00:00 2001
From: TheCatLady <52870424+TheCatLady@users.noreply.github.com>
Date: Wed, 17 Mar 2021 22:28:44 -0400
Subject: [PATCH] fix(lang): UI string edits, round 2 (#1202)

---
 src/components/CollectionDetails/index.tsx    |   2 +-
 .../Layout/LanguagePicker/index.tsx           |   5 +-
 src/components/Layout/Sidebar/index.tsx       |  13 +-
 src/components/Layout/index.tsx               |   7 +-
 src/components/Login/index.tsx                |   6 +-
 .../MovieDetails/MovieRecommendations.tsx     |  16 +-
 src/components/MovieDetails/MovieSimilar.tsx  |  16 +-
 src/components/MovieDetails/index.tsx         |  20 ++-
 .../RequestModal/MovieRequestModal.tsx        |   5 +-
 .../RequestModal/SearchByNameModal/index.tsx  |   3 +-
 .../RequestModal/TvRequestModal.tsx           |   3 +-
 .../ResetPassword/RequestResetLink.tsx        |  17 +--
 src/components/ResetPassword/index.tsx        |  16 +-
 .../Notifications/NotificationsEmail.tsx      |  10 +-
 src/components/Settings/RadarrModal/index.tsx |  14 +-
 .../Settings/SettingsAbout/Releases/index.tsx |   8 +-
 .../Settings/SettingsAbout/index.tsx          |  24 ++-
 .../Settings/SettingsJobsCache/index.tsx      |   9 ++
 src/components/Settings/SettingsLayout.tsx    |   6 +-
 .../Settings/SettingsLogs/index.tsx           |   8 +
 src/components/Settings/SettingsMain.tsx      |  24 +--
 .../Settings/SettingsNotifications.tsx        |   9 ++
 src/components/Settings/SettingsPlex.tsx      |  95 ++++++------
 src/components/Settings/SettingsServices.tsx  |   9 ++
 .../Settings/SettingsUsers/index.tsx          |  13 +-
 src/components/Settings/SonarrModal/index.tsx |  14 +-
 src/components/Setup/LoginWithPlex.tsx        |   7 +-
 src/components/Setup/index.tsx                |  18 +--
 src/components/Slider/index.tsx               |  11 +-
 src/components/StatusChacker/index.tsx        |   6 +-
 .../TvDetails/TvRecommendations.tsx           |  16 +-
 src/components/TvDetails/TvSimilar.tsx        |  16 +-
 src/components/UserList/BulkEditModal.tsx     |   4 +-
 .../UserGeneralSettings/index.tsx             |  17 ++-
 .../UserNotificationSettings/index.tsx        |  11 +-
 .../UserSettings/UserPasswordChange/index.tsx |  50 +++++--
 .../UserSettings/UserPermissions/index.tsx    |  11 +-
 .../UserProfile/UserSettings/index.tsx        |  18 ++-
 src/i18n/globalMessages.ts                    |   2 +
 src/i18n/locale/en.json                       | 138 +++++++++---------
 src/pages/404.tsx                             |  15 +-
 src/pages/_error.tsx                          |  36 +++--
 42 files changed, 435 insertions(+), 313 deletions(-)

diff --git a/src/components/CollectionDetails/index.tsx b/src/components/CollectionDetails/index.tsx
index 5953df1e..5f7cbcee 100644
--- a/src/components/CollectionDetails/index.tsx
+++ b/src/components/CollectionDetails/index.tsx
@@ -36,7 +36,7 @@ const messages = defineMessages({
   requestcollection4k: 'Request Collection in 4K',
   requestswillbecreated4k:
     'The following titles will have 4K requests created for them:',
-  requestSuccess: '<strong>{title}</strong> successfully requested!',
+  requestSuccess: '<strong>{title}</strong> requested successfully!',
 });
 
 interface CollectionDetailsProps {
diff --git a/src/components/Layout/LanguagePicker/index.tsx b/src/components/Layout/LanguagePicker/index.tsx
index 77377ff9..e1aa8bc8 100644
--- a/src/components/Layout/LanguagePicker/index.tsx
+++ b/src/components/Layout/LanguagePicker/index.tsx
@@ -5,7 +5,7 @@ import {
   LanguageContext,
   AvailableLocales,
 } from '../../../context/LanguageContext';
-import { FormattedMessage, defineMessages } from 'react-intl';
+import { useIntl, defineMessages } from 'react-intl';
 
 const messages = defineMessages({
   changelanguage: 'Change Language',
@@ -80,6 +80,7 @@ const availableLanguages: AvailableLanguageObject = {
 };
 
 const LanguagePicker: React.FC = () => {
+  const intl = useIntl();
   const dropdownRef = useRef<HTMLDivElement>(null);
   const { locale, setLocale } = useContext(LanguageContext);
   const [isDropdownOpen, setDropdownOpen] = useState(false);
@@ -128,7 +129,7 @@ const LanguagePicker: React.FC = () => {
                 htmlFor="language"
                 className="block pb-2 text-sm font-medium leading-5 text-gray-300"
               >
-                <FormattedMessage {...messages.changelanguage} />
+                {intl.formatMessage(messages.changelanguage)}
               </label>
               <select
                 id="language"
diff --git a/src/components/Layout/Sidebar/index.tsx b/src/components/Layout/Sidebar/index.tsx
index 662d3950..36231058 100644
--- a/src/components/Layout/Sidebar/index.tsx
+++ b/src/components/Layout/Sidebar/index.tsx
@@ -2,7 +2,7 @@ import React, { ReactNode, useRef } from 'react';
 import Transition from '../../Transition';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
-import { defineMessages, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 import { useUser, Permission } from '../../../hooks/useUser';
 import useClickOutside from '../../../hooks/useClickOutside';
 
@@ -119,6 +119,7 @@ const SidebarLinks: SidebarLinkProps[] = [
 const Sidebar: React.FC<SidebarProps> = ({ open, setClosed }) => {
   const navRef = useRef<HTMLDivElement>(null);
   const router = useRouter();
+  const intl = useIntl();
   const { hasPermission } = useUser();
   useClickOutside(navRef, () => setClosed());
   return (
@@ -212,9 +213,9 @@ const Sidebar: React.FC<SidebarProps> = ({ open, setClosed }) => {
                               `}
                             >
                               {sidebarLink.svgIcon}
-                              <FormattedMessage
-                                {...messages[sidebarLink.messagesKey]}
-                              />
+                              {intl.formatMessage(
+                                messages[sidebarLink.messagesKey]
+                              )}
                             </a>
                           </Link>
                         );
@@ -266,9 +267,7 @@ const Sidebar: React.FC<SidebarProps> = ({ open, setClosed }) => {
                               `}
                       >
                         {sidebarLink.svgIcon}
-                        <FormattedMessage
-                          {...messages[sidebarLink.messagesKey]}
-                        />
+                        {intl.formatMessage(messages[sidebarLink.messagesKey])}
                       </a>
                     </Link>
                   );
diff --git a/src/components/Layout/index.tsx b/src/components/Layout/index.tsx
index d4d161d2..5cbe11a3 100644
--- a/src/components/Layout/index.tsx
+++ b/src/components/Layout/index.tsx
@@ -4,12 +4,12 @@ import UserDropdown from './UserDropdown';
 import Sidebar from './Sidebar';
 import LanguagePicker from './LanguagePicker';
 import { useRouter } from 'next/router';
-import { defineMessages, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 import { Permission, useUser } from '../../hooks/useUser';
 
 const messages = defineMessages({
   alphawarning:
-    'This is ALPHA software. Features may be broken and/or unstable. Please report issues on GitHub!',
+    'This is ALPHA software. Features may be broken and/or unstable. Please report any issues on GitHub!',
 });
 
 const Layout: React.FC = ({ children }) => {
@@ -17,6 +17,7 @@ const Layout: React.FC = ({ children }) => {
   const [isScrolled, setIsScrolled] = useState(false);
   const { hasPermission } = useUser();
   const router = useRouter();
+  const intl = useIntl();
 
   useEffect(() => {
     const updateScrolled = () => {
@@ -101,7 +102,7 @@ const Layout: React.FC = ({ children }) => {
                     </div>
                     <div className="flex-1 ml-3 md:flex md:justify-between">
                       <p className="text-sm leading-5 text-white">
-                        <FormattedMessage {...messages.alphawarning} />
+                        {intl.formatMessage(messages.alphawarning)}
                       </p>
                       <p className="mt-3 text-sm leading-5 md:mt-0 md:ml-6">
                         <a
diff --git a/src/components/Login/index.tsx b/src/components/Login/index.tsx
index 6649ac81..22362497 100644
--- a/src/components/Login/index.tsx
+++ b/src/components/Login/index.tsx
@@ -4,7 +4,7 @@ import { useUser } from '../../hooks/useUser';
 import axios from 'axios';
 import { useRouter } from 'next/dist/client/router';
 import ImageFader from '../Common/ImageFader';
-import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 import Transition from '../Transition';
 import LanguagePicker from '../Layout/LanguagePicker';
 import LocalLogin from './LocalLogin';
@@ -77,9 +77,9 @@ const Login: React.FC = () => {
         <LanguagePicker />
       </div>
       <div className="relative z-40 px-4 sm:mx-auto sm:w-full sm:max-w-md">
-        <img src="/logo.png" className="w-auto mx-auto max-h-32" alt="Logo" />
+        <img src="/logo.png" className="max-w-full" alt="Logo" />
         <h2 className="mt-2 text-3xl font-extrabold leading-9 text-center text-gray-100">
-          <FormattedMessage {...messages.signinheader} />
+          {intl.formatMessage(messages.signinheader)}
         </h2>
       </div>
       <div className="relative z-50 mt-8 sm:mx-auto sm:w-full sm:max-w-md">
diff --git a/src/components/MovieDetails/MovieRecommendations.tsx b/src/components/MovieDetails/MovieRecommendations.tsx
index 6934743a..b603e7b5 100644
--- a/src/components/MovieDetails/MovieRecommendations.tsx
+++ b/src/components/MovieDetails/MovieRecommendations.tsx
@@ -6,21 +6,21 @@ import { useRouter } from 'next/router';
 import Header from '../Common/Header';
 import type { MovieDetails } from '../../../server/models/Movie';
 import { LanguageContext } from '../../context/LanguageContext';
-import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 import PageTitle from '../Common/PageTitle';
 import useDiscover from '../../hooks/useDiscover';
 import Error from '../../pages/_error';
+import Link from 'next/link';
 
 const messages = defineMessages({
   recommendations: 'Recommendations',
-  recommendationssubtext: 'If you liked {title}, you might also like…',
 });
 
 const MovieRecommendations: React.FC = () => {
   const intl = useIntl();
   const router = useRouter();
   const { locale } = useContext(LanguageContext);
-  const { data: movieData, error: movieError } = useSWR<MovieDetails>(
+  const { data: movieData } = useSWR<MovieDetails>(
     `/api/v1/movie/${router.query.movieId}?language=${locale}`
   );
   const {
@@ -47,14 +47,12 @@ const MovieRecommendations: React.FC = () => {
       <div className="mt-1 mb-5">
         <Header
           subtext={
-            movieData && !movieError
-              ? intl.formatMessage(messages.recommendationssubtext, {
-                  title: movieData.title,
-                })
-              : ''
+            <Link href={`/movie/${movieData?.id}`}>
+              <a className="hover:underline">{movieData?.title}</a>
+            </Link>
           }
         >
-          <FormattedMessage {...messages.recommendations} />
+          {intl.formatMessage(messages.recommendations)}
         </Header>
       </div>
       <ListView
diff --git a/src/components/MovieDetails/MovieSimilar.tsx b/src/components/MovieDetails/MovieSimilar.tsx
index ecf5eba5..93bacc36 100644
--- a/src/components/MovieDetails/MovieSimilar.tsx
+++ b/src/components/MovieDetails/MovieSimilar.tsx
@@ -6,21 +6,21 @@ import { useRouter } from 'next/router';
 import Header from '../Common/Header';
 import { LanguageContext } from '../../context/LanguageContext';
 import type { MovieDetails } from '../../../server/models/Movie';
-import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 import PageTitle from '../Common/PageTitle';
 import useDiscover from '../../hooks/useDiscover';
 import Error from '../../pages/_error';
+import Link from 'next/link';
 
 const messages = defineMessages({
   similar: 'Similar Titles',
-  similarsubtext: 'Other movies similar to {title}',
 });
 
 const MovieSimilar: React.FC = () => {
   const router = useRouter();
   const intl = useIntl();
   const { locale } = useContext(LanguageContext);
-  const { data: movieData, error: movieError } = useSWR<MovieDetails>(
+  const { data: movieData } = useSWR<MovieDetails>(
     `/api/v1/movie/${router.query.movieId}?language=${locale}`
   );
   const {
@@ -45,14 +45,12 @@ const MovieSimilar: React.FC = () => {
       <div className="mt-1 mb-5">
         <Header
           subtext={
-            movieData && !movieError
-              ? intl.formatMessage(messages.similarsubtext, {
-                  title: movieData.title,
-                })
-              : undefined
+            <Link href={`/movie/${movieData?.id}`}>
+              <a className="hover:underline">{movieData?.title}</a>
+            </Link>
           }
         >
-          <FormattedMessage {...messages.similar} />
+          {intl.formatMessage(messages.similar)}
         </Header>
       </div>
       <ListView
diff --git a/src/components/MovieDetails/index.tsx b/src/components/MovieDetails/index.tsx
index 2c5779a2..d5461462 100644
--- a/src/components/MovieDetails/index.tsx
+++ b/src/components/MovieDetails/index.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useContext, useMemo } from 'react';
-import { defineMessages, FormattedNumber, useIntl } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 import type { MovieDetails as MovieDetailsType } from '../../../server/models/Movie';
 import useSWR from 'swr';
 import { useRouter } from 'next/router';
@@ -595,11 +595,10 @@ const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
               <div className="media-fact">
                 <span>{intl.formatMessage(messages.revenue)}</span>
                 <span className="media-fact-value">
-                  <FormattedNumber
-                    currency="USD"
-                    style="currency"
-                    value={data.revenue}
-                  />
+                  {intl.formatNumber(data.revenue, {
+                    currency: 'USD',
+                    style: 'currency',
+                  })}
                 </span>
               </div>
             )}
@@ -607,11 +606,10 @@ const MovieDetails: React.FC<MovieDetailsProps> = ({ movie }) => {
               <div className="media-fact">
                 <span>{intl.formatMessage(messages.budget)}</span>
                 <span className="media-fact-value">
-                  <FormattedNumber
-                    currency="USD"
-                    style="currency"
-                    value={data.budget}
-                  />
+                  {intl.formatNumber(data.budget, {
+                    currency: 'USD',
+                    style: 'currency',
+                  })}
                 </span>
               </div>
             )}
diff --git a/src/components/RequestModal/MovieRequestModal.tsx b/src/components/RequestModal/MovieRequestModal.tsx
index 3d0bb671..6ec1f2b8 100644
--- a/src/components/RequestModal/MovieRequestModal.tsx
+++ b/src/components/RequestModal/MovieRequestModal.tsx
@@ -18,11 +18,10 @@ import AdvancedRequester, { RequestOverrides } from './AdvancedRequester';
 import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
-  requestadmin:
-    'Your request will be immediately approved. Do you wish to continue?',
+  requestadmin: 'Your request will be immediately approved.',
   cancelrequest:
     'This will remove your request. Are you sure you want to continue?',
-  requestSuccess: '<strong>{title}</strong> successfully requested!',
+  requestSuccess: '<strong>{title}</strong> requested successfully!',
   requestCancel: 'Request for <strong>{title}</strong> canceled',
   requesttitle: 'Request {title}',
   request4ktitle: 'Request {title} in 4K',
diff --git a/src/components/RequestModal/SearchByNameModal/index.tsx b/src/components/RequestModal/SearchByNameModal/index.tsx
index 8356d5fe..e0f13808 100644
--- a/src/components/RequestModal/SearchByNameModal/index.tsx
+++ b/src/components/RequestModal/SearchByNameModal/index.tsx
@@ -10,7 +10,8 @@ const messages = defineMessages({
   next: 'Next',
   notvdbid: 'Manual Match Required',
   notvdbiddescription:
-    "We couldn't automatically match your request. Please select the correct match from the list below:",
+    "We couldn't automatically match your request.\
+    Please select the correct match from the list below.",
   nosummary: 'No summary for this title was found.',
 });
 
diff --git a/src/components/RequestModal/TvRequestModal.tsx b/src/components/RequestModal/TvRequestModal.tsx
index 8aa03165..305c95fc 100644
--- a/src/components/RequestModal/TvRequestModal.tsx
+++ b/src/components/RequestModal/TvRequestModal.tsx
@@ -25,7 +25,7 @@ const messages = defineMessages({
   requestadmin: 'Your request will be immediately approved.',
   cancelrequest:
     'This will remove your request. Are you sure you want to continue?',
-  requestSuccess: '<strong>{title}</strong> successfully requested!',
+  requestSuccess: '<strong>{title}</strong> requested successfully!',
   requesttitle: 'Request {title}',
   request4ktitle: 'Request {title} in 4K',
   requesting: 'Requesting…',
@@ -45,7 +45,6 @@ const messages = defineMessages({
   requestcancelled: 'Request canceled.',
   autoapproval: 'Automatic Approval',
   requesterror: 'Something went wrong while submitting the request.',
-  next: 'Next',
   backbutton: 'Back',
 });
 
diff --git a/src/components/ResetPassword/RequestResetLink.tsx b/src/components/ResetPassword/RequestResetLink.tsx
index 0b68acc7..02cd4b8d 100644
--- a/src/components/ResetPassword/RequestResetLink.tsx
+++ b/src/components/ResetPassword/RequestResetLink.tsx
@@ -7,13 +7,15 @@ import { Field, Form, Formik } from 'formik';
 import * as Yup from 'yup';
 import axios from 'axios';
 import Link from 'next/link';
+import PageTitle from '../Common/PageTitle';
 
 const messages = defineMessages({
-  forgotpassword: 'Forgot Your Password?',
-  emailresetlink: 'Email Me a Recovery Link',
+  passwordreset: 'Password Reset',
+  resetpassword: 'Reset your password',
+  emailresetlink: 'Email a Recovery Link',
   email: 'Email',
   validationemailrequired: 'You must provide a valid email address',
-  gobacklogin: 'Go Back to Sign-In Page',
+  gobacklogin: 'Return to Sign-In Page',
   requestresetlinksuccessmessage:
     'A password reset link will be sent to the provided email address if it is associated with a valid user.',
 });
@@ -30,6 +32,7 @@ const ResetPassword: React.FC = () => {
 
   return (
     <div className="relative flex flex-col min-h-screen bg-gray-900 py-14">
+      <PageTitle title={intl.formatMessage(messages.passwordreset)} />
       <ImageFader
         backgroundImages={[
           '/images/rotate1.jpg',
@@ -44,13 +47,9 @@ const ResetPassword: React.FC = () => {
         <LanguagePicker />
       </div>
       <div className="relative z-40 px-4 sm:mx-auto sm:w-full sm:max-w-md">
-        <img
-          src="/logo.png"
-          className="w-auto mx-auto max-h-32"
-          alt="Overseerr Logo"
-        />
+        <img src="/logo.png" className="max-w-full" alt="Logo" />
         <h2 className="mt-2 text-3xl font-extrabold leading-9 text-center text-gray-100">
-          {intl.formatMessage(messages.forgotpassword)}
+          {intl.formatMessage(messages.resetpassword)}
         </h2>
       </div>
       <div className="relative z-50 mt-8 sm:mx-auto sm:w-full sm:max-w-md">
diff --git a/src/components/ResetPassword/index.tsx b/src/components/ResetPassword/index.tsx
index 8f903d92..4a2925cd 100644
--- a/src/components/ResetPassword/index.tsx
+++ b/src/components/ResetPassword/index.tsx
@@ -10,16 +10,16 @@ import { useRouter } from 'next/router';
 import Link from 'next/link';
 
 const messages = defineMessages({
-  resetpassword: 'Reset Password',
+  passwordreset: 'Password Reset',
+  resetpassword: 'Reset your password',
   password: 'Password',
   confirmpassword: 'Confirm Password',
   validationpasswordrequired: 'You must provide a password',
-  validationpasswordmatch: 'Password must match',
+  validationpasswordmatch: 'Passwords must match',
   validationpasswordminchars:
     'Password is too short; should be a minimum of 8 characters',
-  gobacklogin: 'Go Back to Sign-In Page',
-  resetpasswordsuccessmessage:
-    'If the link is valid and is connected to a user then the password has been reset.',
+  gobacklogin: 'Return to Sign-In Page',
+  resetpasswordsuccessmessage: 'Password reset successfully!',
 });
 
 const ResetPassword: React.FC = () => {
@@ -60,11 +60,7 @@ const ResetPassword: React.FC = () => {
         <LanguagePicker />
       </div>
       <div className="relative z-40 px-4 sm:mx-auto sm:w-full sm:max-w-md">
-        <img
-          src="/logo.png"
-          className="w-auto mx-auto max-h-32"
-          alt="Overseerr Logo"
-        />
+        <img src="/logo.png" className="max-w-full" alt="Logo" />
         <h2 className="mt-2 text-3xl font-extrabold leading-9 text-center text-gray-100">
           {intl.formatMessage(messages.resetpassword)}
         </h2>
diff --git a/src/components/Settings/Notifications/NotificationsEmail.tsx b/src/components/Settings/Notifications/NotificationsEmail.tsx
index 7da5c79e..9a925d84 100644
--- a/src/components/Settings/Notifications/NotificationsEmail.tsx
+++ b/src/components/Settings/Notifications/NotificationsEmail.tsx
@@ -15,8 +15,8 @@ import globalMessages from '../../../i18n/globalMessages';
 const messages = defineMessages({
   save: 'Save Changes',
   saving: 'Saving…',
-  validationSmtpHostRequired: 'You must provide an SMTP host',
-  validationSmtpPortRequired: 'You must provide an SMTP port',
+  validationSmtpHostRequired: 'You must provide a hostname or IP address',
+  validationSmtpPortRequired: 'You must provide a valid port number',
   agentenabled: 'Enable Agent',
   emailsender: 'Sender Address',
   smtpHost: 'SMTP Host',
@@ -80,9 +80,9 @@ const NotificationsEmail: React.FC = () => {
         /^(([a-z]|\d|_|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*)?([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])$/i,
         intl.formatMessage(messages.validationSmtpHostRequired)
       ),
-    smtpPort: Yup.number().required(
-      intl.formatMessage(messages.validationSmtpPortRequired)
-    ),
+    smtpPort: Yup.number()
+      .typeError(intl.formatMessage(messages.validationSmtpPortRequired))
+      .required(intl.formatMessage(messages.validationSmtpPortRequired)),
   });
 
   if (!data && !error) {
diff --git a/src/components/Settings/RadarrModal/index.tsx b/src/components/Settings/RadarrModal/index.tsx
index 7bc0e161..660f8f2c 100644
--- a/src/components/Settings/RadarrModal/index.tsx
+++ b/src/components/Settings/RadarrModal/index.tsx
@@ -12,13 +12,13 @@ const messages = defineMessages({
   createradarr: 'Add New Radarr Server',
   editradarr: 'Edit Radarr Server',
   validationNameRequired: 'You must provide a server name',
-  validationHostnameRequired: 'You must provide a hostname/IP',
-  validationPortRequired: 'You must provide a port',
+  validationHostnameRequired: 'You must provide a hostname or IP address',
+  validationPortRequired: 'You must provide a valid port number',
   validationApiKeyRequired: 'You must provide an API key',
   validationRootFolderRequired: 'You must select a root folder',
   validationProfileRequired: 'You must select a profile',
   validationMinimumAvailabilityRequired: 'You must select minimum availability',
-  toastRadarrTestSuccess: 'Radarr connection established!',
+  toastRadarrTestSuccess: 'Radarr connection established successfully!',
   toastRadarrTestFailure: 'Failed to connect to Radarr.',
   saving: 'Saving…',
   save: 'Save Changes',
@@ -28,7 +28,7 @@ const messages = defineMessages({
   defaultserver: 'Default Server',
   servername: 'Server Name',
   servernamePlaceholder: 'A Radarr Server',
-  hostname: 'Hostname',
+  hostname: 'Hostname or IP Address',
   port: 'Port',
   ssl: 'SSL',
   apiKey: 'API Key',
@@ -98,9 +98,9 @@ const RadarrModal: React.FC<RadarrModalProps> = ({
         /^(([a-z]|\d|_|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*)?([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])$/i,
         intl.formatMessage(messages.validationHostnameRequired)
       ),
-    port: Yup.number().required(
-      intl.formatMessage(messages.validationPortRequired)
-    ),
+    port: Yup.number()
+      .typeError(intl.formatMessage(messages.validationPortRequired))
+      .required(intl.formatMessage(messages.validationPortRequired)),
     apiKey: Yup.string().required(
       intl.formatMessage(messages.validationApiKeyRequired)
     ),
diff --git a/src/components/Settings/SettingsAbout/Releases/index.tsx b/src/components/Settings/SettingsAbout/Releases/index.tsx
index f234c301..7844a0c8 100644
--- a/src/components/Settings/SettingsAbout/Releases/index.tsx
+++ b/src/components/Settings/SettingsAbout/Releases/index.tsx
@@ -18,9 +18,10 @@ const messages = defineMessages({
   latestversion: 'Latest',
   currentversion: 'Current Version',
   viewchangelog: 'View Changelog',
-  runningDevelop: 'You are running a develop version of Overseerr!',
+  runningDevelop: 'Development Version',
   runningDevelopMessage:
-    'The changes in your version will not be available below. Please see the <GithubLink>GitHub repository</GithubLink> for latest updates.',
+    'The latest changes to the <code>develop</code> branch of Overseerr are not shown below.\
+    Please see the commit history for this branch on <GithubLink>GitHub</GithubLink> for details.',
 });
 
 const REPO_RELEASE_API =
@@ -161,6 +162,9 @@ const Releases: React.FC<ReleasesProps> = ({ currentVersion }) => {
         {currentVersion.startsWith('develop-') && (
           <Alert title={intl.formatMessage(messages.runningDevelop)}>
             {intl.formatMessage(messages.runningDevelopMessage, {
+              code: function code(msg) {
+                return <code className="bg-opacity-50">{msg}</code>;
+              },
               GithubLink: function GithubLink(msg) {
                 return (
                   <a
diff --git a/src/components/Settings/SettingsAbout/index.tsx b/src/components/Settings/SettingsAbout/index.tsx
index f3525de9..26e66a95 100644
--- a/src/components/Settings/SettingsAbout/index.tsx
+++ b/src/components/Settings/SettingsAbout/index.tsx
@@ -4,19 +4,21 @@ import Error from '../../../pages/_error';
 import List from '../../Common/List';
 import LoadingSpinner from '../../Common/LoadingSpinner';
 import { SettingsAboutResponse } from '../../../../server/interfaces/api/settingsInterfaces';
-import { defineMessages, FormattedNumber, useIntl } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 import Releases from './Releases';
 import Badge from '../../Common/Badge';
+import PageTitle from '../../Common/PageTitle';
+import globalMessages from '../../../i18n/globalMessages';
 
 const messages = defineMessages({
+  about: 'About',
   overseerrinformation: 'Overseerr Information',
   version: 'Version',
   totalmedia: 'Total Media',
   totalrequests: 'Total Requests',
   gettingsupport: 'Getting Support',
   githubdiscussions: 'GitHub Discussions',
-  clickheretojoindiscord: 'Click here to join our Discord server.',
-  timezone: 'Timezone',
+  timezone: 'Time Zone',
   supportoverseerr: 'Support Overseerr',
   helppaycoffee: 'Help Pay for Coffee',
   documentation: 'Documentation',
@@ -39,20 +41,26 @@ const SettingsAbout: React.FC = () => {
 
   return (
     <>
+      <PageTitle
+        title={[
+          intl.formatMessage(messages.about),
+          intl.formatMessage(globalMessages.settings),
+        ]}
+      />
       <div className="section">
         <List title={intl.formatMessage(messages.overseerrinformation)}>
           <List.Item title={intl.formatMessage(messages.version)}>
-            {data.version}
+            <code>{data.version}</code>
           </List.Item>
           <List.Item title={intl.formatMessage(messages.totalmedia)}>
-            <FormattedNumber value={data.totalMediaItems} />
+            {intl.formatNumber(data.totalMediaItems)}
           </List.Item>
           <List.Item title={intl.formatMessage(messages.totalrequests)}>
-            <FormattedNumber value={data.totalRequests} />
+            {intl.formatNumber(data.totalRequests)}
           </List.Item>
           {data.tz && (
             <List.Item title={intl.formatMessage(messages.timezone)}>
-              {data.tz}
+              <code>{data.tz}</code>
             </List.Item>
           )}
         </List>
@@ -86,7 +94,7 @@ const SettingsAbout: React.FC = () => {
               rel="noreferrer"
               className="text-indigo-500 hover:underline"
             >
-              {intl.formatMessage(messages.clickheretojoindiscord)}
+              https://discord.gg/PkCWJSeCk7
             </a>
           </List.Item>
         </List>
diff --git a/src/components/Settings/SettingsJobsCache/index.tsx b/src/components/Settings/SettingsJobsCache/index.tsx
index b327a187..350cb94a 100644
--- a/src/components/Settings/SettingsJobsCache/index.tsx
+++ b/src/components/Settings/SettingsJobsCache/index.tsx
@@ -15,8 +15,11 @@ import { useToasts } from 'react-toast-notifications';
 import Badge from '../../Common/Badge';
 import { CacheItem } from '../../../../server/interfaces/api/settingsInterfaces';
 import { formatBytes } from '../../../utils/numberHelpers';
+import PageTitle from '../../Common/PageTitle';
+import globalMessages from '../../../i18n/globalMessages';
 
 const messages: { [messageName: string]: MessageDescriptor } = defineMessages({
+  jobsandcache: 'Jobs & Cache',
   jobs: 'Jobs',
   jobsDescription:
     'Overseerr performs certain maintenance tasks as regularly-scheduled jobs,\
@@ -118,6 +121,12 @@ const SettingsJobs: React.FC = () => {
 
   return (
     <>
+      <PageTitle
+        title={[
+          intl.formatMessage(messages.jobsandcache),
+          intl.formatMessage(globalMessages.settings),
+        ]}
+      />
       <div className="mb-6">
         <h3 className="heading">{intl.formatMessage(messages.jobs)}</h3>
         <p className="description">
diff --git a/src/components/Settings/SettingsLayout.tsx b/src/components/Settings/SettingsLayout.tsx
index 6ed4886f..dd13cfe4 100644
--- a/src/components/Settings/SettingsLayout.tsx
+++ b/src/components/Settings/SettingsLayout.tsx
@@ -3,10 +3,10 @@ import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { defineMessages, useIntl } from 'react-intl';
 import PageTitle from '../Common/PageTitle';
+import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
-  settings: 'Settings',
-  menuGeneralSettings: 'General Settings',
+  menuGeneralSettings: 'General',
   menuUsers: 'Users',
   menuPlexSettings: 'Plex',
   menuServices: 'Services',
@@ -99,7 +99,7 @@ const SettingsLayout: React.FC = ({ children }) => {
   };
   return (
     <>
-      <PageTitle title={intl.formatMessage(messages.settings)} />
+      <PageTitle title={intl.formatMessage(globalMessages.settings)} />
       <div className="mt-6">
         <div className="sm:hidden">
           <select
diff --git a/src/components/Settings/SettingsLogs/index.tsx b/src/components/Settings/SettingsLogs/index.tsx
index 8e0212f7..a5c670f2 100644
--- a/src/components/Settings/SettingsLogs/index.tsx
+++ b/src/components/Settings/SettingsLogs/index.tsx
@@ -9,7 +9,9 @@ import Error from '../../../pages/_error';
 import Badge from '../../Common/Badge';
 import Button from '../../Common/Button';
 import LoadingSpinner from '../../Common/LoadingSpinner';
+import PageTitle from '../../Common/PageTitle';
 import Table from '../../Common/Table';
+import globalMessages from '../../../i18n/globalMessages';
 
 const messages = defineMessages({
   logs: 'Logs',
@@ -93,6 +95,12 @@ const SettingsLogs: React.FC = () => {
 
   return (
     <>
+      <PageTitle
+        title={[
+          intl.formatMessage(messages.logs),
+          intl.formatMessage(globalMessages.settings),
+        ]}
+      />
       <div className="mb-2">
         <h3 className="heading">{intl.formatMessage(messages.logs)}</h3>
         <p className="description">
diff --git a/src/components/Settings/SettingsMain.tsx b/src/components/Settings/SettingsMain.tsx
index 06c80092..db6d753a 100644
--- a/src/components/Settings/SettingsMain.tsx
+++ b/src/components/Settings/SettingsMain.tsx
@@ -13,8 +13,10 @@ import Badge from '../Common/Badge';
 import globalMessages from '../../i18n/globalMessages';
 import * as Yup from 'yup';
 import RegionSelector from '../RegionSelector';
+import PageTitle from '../Common/PageTitle';
 
 const messages = defineMessages({
+  general: 'General',
   generalsettings: 'General Settings',
   generalsettingsDescription:
     'Configure global and default settings for Overseerr.',
@@ -24,21 +26,19 @@ const messages = defineMessages({
   applicationTitle: 'Application Title',
   applicationurl: 'Application URL',
   region: 'Discover Region',
-  regionTip:
-    'Filter content by region (only applies to the "Popular" and "Upcoming" categories)',
+  regionTip: 'Filter content by regional availability',
   originallanguage: 'Discover Language',
-  originallanguageTip:
-    'Filter content by original language (only applies to the "Popular" and "Upcoming" categories)',
-  toastApiKeySuccess: 'New API key generated!',
+  originallanguageTip: 'Filter content by original language',
+  toastApiKeySuccess: 'New API key generated successfully!',
   toastApiKeyFailure: 'Something went wrong while generating a new API key.',
-  toastSettingsSuccess: 'Settings successfully saved!',
+  toastSettingsSuccess: 'Settings saved successfully!',
   toastSettingsFailure: 'Something went wrong while saving settings.',
   hideAvailable: 'Hide Available Media',
   csrfProtection: 'Enable CSRF Protection',
   csrfProtectionTip:
-    'Sets external API access to read-only (requires HTTPS and Overseerr must be reloaded for changes to take effect)',
+    'Sets external API access to read-only (requires HTTPS, and Overseerr must be reloaded for changes to take effect)',
   csrfProtectionHoverTip:
-    'Do NOT enable this unless you understand what you are doing!',
+    'Do NOT enable this setting unless you understand what you are doing!',
   trustProxy: 'Enable Proxy Support',
   trustProxyTip:
     'Allows Overseerr to correctly register client IP addresses behind a proxy (Overseerr must be reloaded for changes to take effect)',
@@ -46,7 +46,7 @@ const messages = defineMessages({
   validationApplicationUrl: 'You must provide a valid URL',
   validationApplicationUrlTrailingSlash: 'URL must not end in a trailing slash',
   originalLanguageDefault: 'All Languages',
-  partialRequestsEnabled: 'Enable Partial Series Requests',
+  partialRequestsEnabled: 'Allow Partial Series Requests',
 });
 
 const SettingsMain: React.FC = () => {
@@ -119,6 +119,12 @@ const SettingsMain: React.FC = () => {
 
   return (
     <>
+      <PageTitle
+        title={[
+          intl.formatMessage(messages.general),
+          intl.formatMessage(globalMessages.settings),
+        ]}
+      />
       <div className="mb-6">
         <h3 className="heading">
           {intl.formatMessage(messages.generalsettings)}
diff --git a/src/components/Settings/SettingsNotifications.tsx b/src/components/Settings/SettingsNotifications.tsx
index 64b9ba2f..ac2416b3 100644
--- a/src/components/Settings/SettingsNotifications.tsx
+++ b/src/components/Settings/SettingsNotifications.tsx
@@ -15,8 +15,11 @@ import LoadingSpinner from '../Common/LoadingSpinner';
 import axios from 'axios';
 import { useToasts } from 'react-toast-notifications';
 import Button from '../Common/Button';
+import PageTitle from '../Common/PageTitle';
+import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
+  notifications: 'Notifications',
   save: 'Save Changes',
   saving: 'Saving…',
   notificationsettings: 'Notification Settings',
@@ -174,6 +177,12 @@ const SettingsNotifications: React.FC = ({ children }) => {
 
   return (
     <>
+      <PageTitle
+        title={[
+          intl.formatMessage(messages.notifications),
+          intl.formatMessage(globalMessages.settings),
+        ]}
+      />
       <div className="mb-6">
         <h3 className="heading">
           {intl.formatMessage(messages.notificationsettings)}
diff --git a/src/components/Settings/SettingsPlex.tsx b/src/components/Settings/SettingsPlex.tsx
index be0eb40e..3161e3c9 100644
--- a/src/components/Settings/SettingsPlex.tsx
+++ b/src/components/Settings/SettingsPlex.tsx
@@ -9,12 +9,15 @@ import Button from '../Common/Button';
 import axios from 'axios';
 import LibraryItem from './LibraryItem';
 import Badge from '../Common/Badge';
-import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 import * as Yup from 'yup';
 import Alert from '../Common/Alert';
 import Spinner from '../../assets/spinner.svg';
+import PageTitle from '../Common/PageTitle';
+import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
+  plex: 'Plex',
   plexsettings: 'Plex Settings',
   plexsettingsDescription:
     'Configure the settings for your Plex server. Overseerr scans your Plex libraries to see what content is available.',
@@ -30,17 +33,17 @@ const messages = defineMessages({
   serverpresetRefreshing: 'Retrieving servers…',
   serverpresetLoad: 'Press the button to load available servers',
   toastPlexRefresh: 'Retrieving server list from Plex',
-  toastPlexRefreshSuccess: 'Retrieved server list from Plex',
-  toastPlexRefreshFailure: 'Unable to retrieve server list from Plex',
-  toastPlexConnecting: 'Attempting to connect to Plex server',
-  toastPlexConnectingSuccess: 'Connected to Plex server',
-  toastPlexConnectingFailure: 'Unable to connect to Plex server',
+  toastPlexRefreshSuccess: 'Plex server list retrieved successfully!',
+  toastPlexRefreshFailure: 'Failed to retrieve Plex server list.',
+  toastPlexConnecting: 'Attempting to connect to Plex…',
+  toastPlexConnectingSuccess: 'Plex connection established successfully!',
+  toastPlexConnectingFailure: 'Failed to connect to Plex.',
   settingUpPlex: 'Setting Up Plex',
   settingUpPlexDescription:
     'To set up Plex, you can either enter your details manually \
     or select a server retrieved from <RegisterPlexTVLink>plex.tv</RegisterPlexTVLink>.\
     Press the button to the right of the dropdown to check connectivity and retrieve available servers.',
-  hostname: 'Hostname/IP',
+  hostname: 'Hostname or IP Address',
   port: 'Port',
   ssl: 'SSL',
   timeout: 'Timeout',
@@ -59,8 +62,8 @@ const messages = defineMessages({
   librariesRemaining: 'Libraries Remaining: {count}',
   startscan: 'Start Scan',
   cancelscan: 'Cancel Scan',
-  validationHostnameRequired: 'You must provide a hostname/IP',
-  validationPortRequired: 'You must provide a port',
+  validationHostnameRequired: 'You must provide a hostname or IP address',
+  validationPortRequired: 'You must provide a valid port number',
 });
 
 interface Library {
@@ -120,9 +123,9 @@ const SettingsPlex: React.FC<SettingsPlexProps> = ({ onComplete }) => {
         /^(([a-z]|\d|_|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*)?([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])$/i,
         intl.formatMessage(messages.validationHostnameRequired)
       ),
-    port: Yup.number().required(
-      intl.formatMessage(messages.validationPortRequired)
-    ),
+    port: Yup.number()
+      .typeError(intl.formatMessage(messages.validationPortRequired))
+      .required(intl.formatMessage(messages.validationPortRequired)),
   });
 
   const activeLibraries =
@@ -259,12 +262,16 @@ const SettingsPlex: React.FC<SettingsPlexProps> = ({ onComplete }) => {
   }
   return (
     <>
+      <PageTitle
+        title={[
+          intl.formatMessage(messages.plex),
+          intl.formatMessage(globalMessages.settings),
+        ]}
+      />
       <div className="mb-6">
-        <h3 className="heading">
-          <FormattedMessage {...messages.plexsettings} />
-        </h3>
+        <h3 className="heading">{intl.formatMessage(messages.plexsettings)}</h3>
         <p className="description">
-          <FormattedMessage {...messages.plexsettingsDescription} />
+          {intl.formatMessage(messages.plexsettingsDescription)}
         </p>
         <div className="section">
           <Alert title={intl.formatMessage(messages.settingUpPlex)} type="info">
@@ -350,11 +357,9 @@ const SettingsPlex: React.FC<SettingsPlexProps> = ({ onComplete }) => {
               <div className="form-row">
                 <label htmlFor="name" className="text-label">
                   <div className="flex flex-col">
-                    <span>
-                      <FormattedMessage {...messages.servername} />
-                    </span>
+                    <span>{intl.formatMessage(messages.servername)}</span>
                     <span className="text-gray-500">
-                      <FormattedMessage {...messages.servernameTip} />
+                      {intl.formatMessage(messages.servernameTip)}
                     </span>
                   </div>
                 </label>
@@ -376,7 +381,7 @@ const SettingsPlex: React.FC<SettingsPlexProps> = ({ onComplete }) => {
               </div>
               <div className="form-row">
                 <label htmlFor="preset" className="text-label">
-                  <FormattedMessage {...messages.serverpreset} />
+                  {intl.formatMessage(messages.serverpreset)}
                 </label>
                 <div className="form-input">
                   <div className="form-input-field input-group">
@@ -460,7 +465,7 @@ const SettingsPlex: React.FC<SettingsPlexProps> = ({ onComplete }) => {
               </div>
               <div className="form-row">
                 <label htmlFor="hostname" className="text-label">
-                  <FormattedMessage {...messages.hostname} />
+                  {intl.formatMessage(messages.hostname)}
                 </label>
                 <div className="form-input">
                   <div className="form-input-field">
@@ -482,7 +487,7 @@ const SettingsPlex: React.FC<SettingsPlexProps> = ({ onComplete }) => {
               </div>
               <div className="form-row">
                 <label htmlFor="port" className="text-label">
-                  <FormattedMessage {...messages.port} />
+                  {intl.formatMessage(messages.port)}
                 </label>
                 <div className="form-input">
                   <Field
@@ -545,10 +550,10 @@ const SettingsPlex: React.FC<SettingsPlexProps> = ({ onComplete }) => {
       </Formik>
       <div className="mt-10 mb-6">
         <h3 className="heading">
-          <FormattedMessage {...messages.plexlibraries} />
+          {intl.formatMessage(messages.plexlibraries)}
         </h3>
         <p className="description">
-          <FormattedMessage {...messages.plexlibrariesDescription} />
+          {intl.formatMessage(messages.plexlibrariesDescription)}
         </p>
       </div>
       <div className="section">
@@ -581,11 +586,9 @@ const SettingsPlex: React.FC<SettingsPlexProps> = ({ onComplete }) => {
         </ul>
       </div>
       <div className="mt-10 mb-6">
-        <h3 className="heading">
-          <FormattedMessage {...messages.manualscan} />
-        </h3>
+        <h3 className="heading">{intl.formatMessage(messages.manualscan)}</h3>
         <p className="description">
-          <FormattedMessage {...messages.manualscanDescription} />
+          {intl.formatMessage(messages.manualscanDescription)}
         </p>
       </div>
       <div className="section">
@@ -615,28 +618,24 @@ const SettingsPlex: React.FC<SettingsPlexProps> = ({ onComplete }) => {
                 {dataSync.currentLibrary && (
                   <div className="flex items-center mb-2 mr-0 sm:mb-0 sm:mr-2">
                     <Badge>
-                      <FormattedMessage
-                        {...messages.currentlibrary}
-                        values={{ name: dataSync.currentLibrary.name }}
-                      />
+                      {intl.formatMessage(messages.currentlibrary, {
+                        name: dataSync.currentLibrary.name,
+                      })}
                     </Badge>
                   </div>
                 )}
                 <div className="flex items-center">
                   <Badge badgeType="warning">
-                    <FormattedMessage
-                      {...messages.librariesRemaining}
-                      values={{
-                        count: dataSync.currentLibrary
-                          ? dataSync.libraries.slice(
-                              dataSync.libraries.findIndex(
-                                (library) =>
-                                  library.id === dataSync.currentLibrary?.id
-                              ) + 1
-                            ).length
-                          : 0,
-                      }}
-                    />
+                    {intl.formatMessage(messages.librariesRemaining, {
+                      count: dataSync.currentLibrary
+                        ? dataSync.libraries.slice(
+                            dataSync.libraries.findIndex(
+                              (library) =>
+                                library.id === dataSync.currentLibrary?.id
+                            ) + 1
+                          ).length
+                        : 0,
+                    })}
                   </Badge>
                 </div>
               </>
@@ -658,7 +657,7 @@ const SettingsPlex: React.FC<SettingsPlexProps> = ({ onComplete }) => {
                       d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"
                     />
                   </svg>
-                  <FormattedMessage {...messages.startscan} />
+                  {intl.formatMessage(messages.startscan)}
                 </Button>
               )}
 
@@ -678,7 +677,7 @@ const SettingsPlex: React.FC<SettingsPlexProps> = ({ onComplete }) => {
                       d="M6 18L18 6M6 6l12 12"
                     />
                   </svg>
-                  <FormattedMessage {...messages.cancelscan} />
+                  {intl.formatMessage(messages.cancelscan)}
                 </Button>
               )}
             </div>
diff --git a/src/components/Settings/SettingsServices.tsx b/src/components/Settings/SettingsServices.tsx
index bcccf8a5..faac3268 100644
--- a/src/components/Settings/SettingsServices.tsx
+++ b/src/components/Settings/SettingsServices.tsx
@@ -14,8 +14,11 @@ import Transition from '../Transition';
 import axios from 'axios';
 import SonarrModal from './SonarrModal';
 import Alert from '../Common/Alert';
+import PageTitle from '../Common/PageTitle';
+import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
+  services: 'Services',
   radarrsettings: 'Radarr Settings',
   radarrSettingsDescription:
     'Configure your Radarr connection below. You can have multiple Radarr configurations, but only two can be active as defaults at any time (one for standard HD and one for 4K). Administrators can override the server which is used for new requests.',
@@ -214,6 +217,12 @@ const SettingsServices: React.FC = () => {
 
   return (
     <>
+      <PageTitle
+        title={[
+          intl.formatMessage(messages.services),
+          intl.formatMessage(globalMessages.settings),
+        ]}
+      />
       <div className="mb-6">
         <h3 className="heading">
           {intl.formatMessage(messages.radarrsettings)}
diff --git a/src/components/Settings/SettingsUsers/index.tsx b/src/components/Settings/SettingsUsers/index.tsx
index 35dfeea8..7986b700 100644
--- a/src/components/Settings/SettingsUsers/index.tsx
+++ b/src/components/Settings/SettingsUsers/index.tsx
@@ -8,13 +8,16 @@ import Button from '../../Common/Button';
 import { defineMessages, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import PermissionEdit from '../../PermissionEdit';
+import PageTitle from '../../Common/PageTitle';
+import globalMessages from '../../../i18n/globalMessages';
 
 const messages = defineMessages({
-  userSettings: 'Users',
+  users: 'Users',
+  userSettings: 'User Settings',
   userSettingsDescription: 'Configure global and default user settings.',
   save: 'Save Changes',
   saving: 'Saving…',
-  toastSettingsSuccess: 'Settings successfully saved!',
+  toastSettingsSuccess: 'User settings saved successfully!',
   toastSettingsFailure: 'Something went wrong while saving settings.',
   localLogin: 'Enable Local User Sign-In',
   defaultPermissions: 'Default User Permissions',
@@ -33,6 +36,12 @@ const SettingsUsers: React.FC = () => {
 
   return (
     <>
+      <PageTitle
+        title={[
+          intl.formatMessage(messages.users),
+          intl.formatMessage(globalMessages.settings),
+        ]}
+      />
       <div className="mb-6">
         <h3 className="heading">{intl.formatMessage(messages.userSettings)}</h3>
         <p className="description">
diff --git a/src/components/Settings/SonarrModal/index.tsx b/src/components/Settings/SonarrModal/index.tsx
index a9411f5d..709dc01d 100644
--- a/src/components/Settings/SonarrModal/index.tsx
+++ b/src/components/Settings/SonarrModal/index.tsx
@@ -12,13 +12,13 @@ const messages = defineMessages({
   createsonarr: 'Add New Sonarr Server',
   editsonarr: 'Edit Sonarr Server',
   validationNameRequired: 'You must provide a server name',
-  validationHostnameRequired: 'You must provide a hostname/IP',
-  validationPortRequired: 'You must provide a port',
+  validationHostnameRequired: 'You must provide a hostname or IP address',
+  validationPortRequired: 'You must provide a valid port number',
   validationApiKeyRequired: 'You must provide an API key',
   validationRootFolderRequired: 'You must select a root folder',
   validationProfileRequired: 'You must select a quality profile',
   validationLanguageProfileRequired: 'You must select a language profile',
-  toastSonarrTestSuccess: 'Sonarr connection established!',
+  toastSonarrTestSuccess: 'Sonarr connection established successfully!',
   toastSonarrTestFailure: 'Failed to connect to Sonarr.',
   saving: 'Saving…',
   save: 'Save Changes',
@@ -28,7 +28,7 @@ const messages = defineMessages({
   defaultserver: 'Default Server',
   servername: 'Server Name',
   servernamePlaceholder: 'A Sonarr Server',
-  hostname: 'Hostname',
+  hostname: 'Hostname or IP Address',
   port: 'Port',
   ssl: 'SSL',
   apiKey: 'API Key',
@@ -109,9 +109,9 @@ const SonarrModal: React.FC<SonarrModalProps> = ({
         /^(([a-z]|\d|_|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*)?([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])$/i,
         intl.formatMessage(messages.validationHostnameRequired)
       ),
-    port: Yup.number().required(
-      intl.formatMessage(messages.validationPortRequired)
-    ),
+    port: Yup.number()
+      .typeError(intl.formatMessage(messages.validationPortRequired))
+      .required(intl.formatMessage(messages.validationPortRequired)),
     apiKey: Yup.string().required(
       intl.formatMessage(messages.validationApiKeyRequired)
     ),
diff --git a/src/components/Setup/LoginWithPlex.tsx b/src/components/Setup/LoginWithPlex.tsx
index d62db786..30a49a7a 100644
--- a/src/components/Setup/LoginWithPlex.tsx
+++ b/src/components/Setup/LoginWithPlex.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { useUser } from '../../hooks/useUser';
 import PlexLoginButton from '../PlexLoginButton';
 import axios from 'axios';
-import { defineMessages, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 
 const messages = defineMessages({
   welcome: 'Welcome to Overseerr',
@@ -14,6 +14,7 @@ interface LoginWithPlexProps {
 }
 
 const LoginWithPlex: React.FC<LoginWithPlexProps> = ({ onComplete }) => {
+  const intl = useIntl();
   const [authToken, setAuthToken] = useState<string | undefined>(undefined);
   const { user, revalidate } = useUser();
 
@@ -45,10 +46,10 @@ const LoginWithPlex: React.FC<LoginWithPlexProps> = ({ onComplete }) => {
   return (
     <form>
       <div className="flex justify-center mb-2 text-xl font-bold">
-        <FormattedMessage {...messages.welcome} />
+        {intl.formatMessage(messages.welcome)}
       </div>
       <div className="flex justify-center pb-6 mb-2 text-sm">
-        <FormattedMessage {...messages.signinMessage} />
+        {intl.formatMessage(messages.signinMessage)}
       </div>
       <div className="flex items-center justify-center">
         <PlexLoginButton onAuthToken={(authToken) => setAuthToken(authToken)} />
diff --git a/src/components/Setup/index.tsx b/src/components/Setup/index.tsx
index b174887f..9a4d363e 100644
--- a/src/components/Setup/index.tsx
+++ b/src/components/Setup/index.tsx
@@ -7,7 +7,7 @@ import SettingsServices from '../Settings/SettingsServices';
 import LoginWithPlex from './LoginWithPlex';
 import SetupSteps from './SetupSteps';
 import axios from 'axios';
-import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 import Badge from '../Common/Badge';
 import LanguagePicker from '../Layout/LanguagePicker';
 import PageTitle from '../Common/PageTitle';
@@ -63,11 +63,7 @@ const Setup: React.FC = () => {
         <LanguagePicker />
       </div>
       <div className="relative z-40 px-4 sm:mx-auto sm:w-full sm:max-w-4xl">
-        <img
-          src="/logo.png"
-          className="w-auto mx-auto mb-10 max-h-32"
-          alt="Logo"
-        />
+        <img src="/logo.png" className="max-w-full sm:max-w-md" alt="Logo" />
         <AppDataWarning />
         <nav className="relative z-50">
           <ul
@@ -115,7 +111,7 @@ const Setup: React.FC = () => {
                       disabled={!plexSettingsComplete}
                       onClick={() => setCurrentStep(3)}
                     >
-                      <FormattedMessage {...messages.continue} />
+                      {intl.formatMessage(messages.continue)}
                     </Button>
                   </span>
                 </div>
@@ -133,11 +129,9 @@ const Setup: React.FC = () => {
                       onClick={() => finishSetup()}
                       disabled={isUpdating}
                     >
-                      {isUpdating ? (
-                        <FormattedMessage {...messages.finishing} />
-                      ) : (
-                        <FormattedMessage {...messages.finish} />
-                      )}
+                      {isUpdating
+                        ? intl.formatMessage(messages.finishing)
+                        : intl.formatMessage(messages.finish)}
                     </Button>
                   </span>
                 </div>
diff --git a/src/components/Slider/index.tsx b/src/components/Slider/index.tsx
index d764d991..787c4ff4 100644
--- a/src/components/Slider/index.tsx
+++ b/src/components/Slider/index.tsx
@@ -8,7 +8,7 @@ import React, {
 } from 'react';
 import { useSpring } from 'react-spring';
 import TitleCard from '../TitleCard';
-import { defineMessages, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 
 const messages = defineMessages({
   noresults: 'No results.',
@@ -36,6 +36,7 @@ const Slider: React.FC<SliderProps> = ({
   emptyMessage,
   placeholder = <TitleCard.Placeholder />,
 }) => {
+  const intl = useIntl();
   const containerRef = useRef<HTMLDivElement>(null);
   const [scrollPos, setScrollPos] = useState({ isStart: true, isEnd: false });
 
@@ -230,11 +231,9 @@ const Slider: React.FC<SliderProps> = ({
           ))}
         {isEmpty && (
           <div className="mt-16 mb-16 text-center text-white">
-            {emptyMessage ? (
-              emptyMessage
-            ) : (
-              <FormattedMessage {...messages.noresults} />
-            )}
+            {emptyMessage
+              ? emptyMessage
+              : intl.formatMessage(messages.noresults)}
           </div>
         )}
       </div>
diff --git a/src/components/StatusChacker/index.tsx b/src/components/StatusChacker/index.tsx
index ce9b7341..e63fc98a 100644
--- a/src/components/StatusChacker/index.tsx
+++ b/src/components/StatusChacker/index.tsx
@@ -5,10 +5,10 @@ import Modal from '../Common/Modal';
 import Transition from '../Transition';
 
 const messages = defineMessages({
-  newversionavailable: 'New Version Available',
+  newversionavailable: 'Application Update',
   newversionDescription:
-    'An update is now available. Click the button below to reload the application.',
-  reloadOverseerr: 'Reload Overseerr',
+    'Overseerr has been updated! Please click the button below to reload the page.',
+  reloadOverseerr: 'Reload',
 });
 
 const StatusChecker: React.FC = () => {
diff --git a/src/components/TvDetails/TvRecommendations.tsx b/src/components/TvDetails/TvRecommendations.tsx
index cd6d4afa..c5aa7b04 100644
--- a/src/components/TvDetails/TvRecommendations.tsx
+++ b/src/components/TvDetails/TvRecommendations.tsx
@@ -5,22 +5,22 @@ import ListView from '../Common/ListView';
 import { useRouter } from 'next/router';
 import { LanguageContext } from '../../context/LanguageContext';
 import Header from '../Common/Header';
-import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 import { TvDetails } from '../../../server/models/Tv';
 import PageTitle from '../Common/PageTitle';
 import Error from '../../pages/_error';
 import useDiscover from '../../hooks/useDiscover';
+import Link from 'next/link';
 
 const messages = defineMessages({
   recommendations: 'Recommendations',
-  recommendationssubtext: 'If you liked {title}, you might also like…',
 });
 
 const TvRecommendations: React.FC = () => {
   const router = useRouter();
   const intl = useIntl();
   const { locale } = useContext(LanguageContext);
-  const { data: tvData, error: tvError } = useSWR<TvDetails>(
+  const { data: tvData } = useSWR<TvDetails>(
     `/api/v1/tv/${router.query.tvId}?language=${locale}`
   );
   const {
@@ -45,14 +45,12 @@ const TvRecommendations: React.FC = () => {
       <div className="mt-1 mb-5">
         <Header
           subtext={
-            tvData && !tvError
-              ? intl.formatMessage(messages.recommendationssubtext, {
-                  title: tvData.name,
-                })
-              : ''
+            <Link href={`/tv/${tvData?.id}`}>
+              <a className="hover:underline">{tvData?.name}</a>
+            </Link>
           }
         >
-          <FormattedMessage {...messages.recommendations} />
+          {intl.formatMessage(messages.recommendations)}
         </Header>
       </div>
       <ListView
diff --git a/src/components/TvDetails/TvSimilar.tsx b/src/components/TvDetails/TvSimilar.tsx
index e3731bd3..c09cca28 100644
--- a/src/components/TvDetails/TvSimilar.tsx
+++ b/src/components/TvDetails/TvSimilar.tsx
@@ -4,23 +4,23 @@ import type { TvResult } from '../../../server/models/Search';
 import ListView from '../Common/ListView';
 import { useRouter } from 'next/router';
 import { LanguageContext } from '../../context/LanguageContext';
-import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
+import { useIntl, defineMessages } from 'react-intl';
 import type { TvDetails } from '../../../server/models/Tv';
 import Header from '../Common/Header';
 import PageTitle from '../Common/PageTitle';
 import useDiscover from '../../hooks/useDiscover';
 import Error from '../../pages/_error';
+import Link from 'next/link';
 
 const messages = defineMessages({
   similar: 'Similar Series',
-  similarsubtext: 'Other series similar to {title}',
 });
 
 const TvSimilar: React.FC = () => {
   const router = useRouter();
   const intl = useIntl();
   const { locale } = useContext(LanguageContext);
-  const { data: tvData, error: tvError } = useSWR<TvDetails>(
+  const { data: tvData } = useSWR<TvDetails>(
     `/api/v1/tv/${router.query.tvId}?language=${locale}`
   );
   const {
@@ -43,14 +43,12 @@ const TvSimilar: React.FC = () => {
       <div className="mt-1 mb-5">
         <Header
           subtext={
-            tvData && !tvError
-              ? intl.formatMessage(messages.similarsubtext, {
-                  title: tvData.name,
-                })
-              : undefined
+            <Link href={`/tv/${tvData?.id}`}>
+              <a className="hover:underline">{tvData?.name}</a>
+            </Link>
           }
         >
-          <FormattedMessage {...messages.similar} />
+          {intl.formatMessage(messages.similar)}
         </Header>
       </div>
       <ListView
diff --git a/src/components/UserList/BulkEditModal.tsx b/src/components/UserList/BulkEditModal.tsx
index f1a47472..29866907 100644
--- a/src/components/UserList/BulkEditModal.tsx
+++ b/src/components/UserList/BulkEditModal.tsx
@@ -15,10 +15,10 @@ interface BulkEditProps {
 }
 
 const messages = defineMessages({
-  userssaved: 'Users saved',
+  userssaved: 'User permissions saved successfully!',
   save: 'Save Changes',
   saving: 'Saving…',
-  userfail: 'Something went wrong while saving the user.',
+  userfail: 'Something went wrong while saving user permissions.',
   edituser: 'Edit User Permissions',
 });
 
diff --git a/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx b/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
index 157424c7..a6c8d316 100644
--- a/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
+++ b/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
@@ -13,8 +13,11 @@ import Badge from '../../../Common/Badge';
 import Button from '../../../Common/Button';
 import LoadingSpinner from '../../../Common/LoadingSpinner';
 import RegionSelector from '../../../RegionSelector';
+import globalMessages from '../../../../i18n/globalMessages';
+import PageTitle from '../../../Common/PageTitle';
 
 const messages = defineMessages({
+  general: 'General',
   generalsettings: 'General Settings',
   displayName: 'Display Name',
   save: 'Save Changes',
@@ -26,14 +29,12 @@ const messages = defineMessages({
   owner: 'Owner',
   admin: 'Admin',
   user: 'User',
-  toastSettingsSuccess: 'Settings successfully saved!',
+  toastSettingsSuccess: 'Settings saved successfully!',
   toastSettingsFailure: 'Something went wrong while saving settings.',
   region: 'Discover Region',
-  regionTip:
-    'Filter content by region (only applies to the "Popular" and "Upcoming" categories)',
+  regionTip: 'Filter content by regional availability',
   originallanguage: 'Discover Language',
-  originallanguageTip:
-    'Filter content by original language (only applies to the "Popular" and "Upcoming" categories)',
+  originallanguageTip: 'Filter content by original language',
   originalLanguageDefault: 'All Languages',
   languageServerDefault: 'Default ({language})',
 });
@@ -94,6 +95,12 @@ const UserGeneralSettings: React.FC = () => {
 
   return (
     <>
+      <PageTitle
+        title={[
+          intl.formatMessage(messages.general),
+          intl.formatMessage(globalMessages.usersettings),
+        ]}
+      />
       <div className="mb-6">
         <h3 className="heading">
           {intl.formatMessage(messages.generalsettings)}
diff --git a/src/components/UserProfile/UserSettings/UserNotificationSettings/index.tsx b/src/components/UserProfile/UserSettings/UserNotificationSettings/index.tsx
index 677724b2..386e5e6d 100644
--- a/src/components/UserProfile/UserSettings/UserNotificationSettings/index.tsx
+++ b/src/components/UserProfile/UserSettings/UserNotificationSettings/index.tsx
@@ -14,8 +14,10 @@ import * as Yup from 'yup';
 import Badge from '../../../Common/Badge';
 import globalMessages from '../../../../i18n/globalMessages';
 import { PgpLink } from '../../../Settings/Notifications/NotificationsEmail';
+import PageTitle from '../../../Common/PageTitle';
 
 const messages = defineMessages({
+  notifications: 'Notifications',
   notificationsettings: 'Notification Settings',
   enableNotifications: 'Enable Notifications',
   discordId: 'Discord User ID',
@@ -33,7 +35,7 @@ const messages = defineMessages({
   saving: 'Saving…',
   plexuser: 'Plex User',
   localuser: 'Local User',
-  toastSettingsSuccess: 'Settings successfully saved!',
+  toastSettingsSuccess: 'Notification settings saved successfully!',
   toastSettingsFailure: 'Something went wrong while saving settings.',
   pgpKey: '<PgpLink>PGP</PgpLink> Public Key',
   pgpKeyTip: 'Encrypt email messages',
@@ -70,6 +72,13 @@ const UserNotificationSettings: React.FC = () => {
 
   return (
     <>
+      <PageTitle
+        title={[
+          intl.formatMessage(messages.notifications),
+          intl.formatMessage(globalMessages.usersettings),
+          user?.displayName,
+        ]}
+      />
       <div className="mb-6">
         <h3 className="heading">
           {intl.formatMessage(messages.notificationsettings)}
diff --git a/src/components/UserProfile/UserSettings/UserPasswordChange/index.tsx b/src/components/UserProfile/UserSettings/UserPasswordChange/index.tsx
index 860d1ca1..98913b20 100644
--- a/src/components/UserProfile/UserSettings/UserPasswordChange/index.tsx
+++ b/src/components/UserProfile/UserSettings/UserPasswordChange/index.tsx
@@ -12,6 +12,8 @@ import Button from '../../../Common/Button';
 import LoadingSpinner from '../../../Common/LoadingSpinner';
 import * as Yup from 'yup';
 import useSettings from '../../../../hooks/useSettings';
+import PageTitle from '../../../Common/PageTitle';
+import globalMessages from '../../../../i18n/globalMessages';
 
 const messages = defineMessages({
   password: 'Password',
@@ -20,19 +22,23 @@ const messages = defineMessages({
   confirmpassword: 'Confirm Password',
   save: 'Save Changes',
   saving: 'Saving…',
-  toastSettingsSuccess: 'Password changed!',
-  toastSettingsFailure:
-    'Something went wrong while changing the password. Is your current password correct?',
+  toastSettingsSuccess: 'Password saved successfully!',
+  toastSettingsFailure: 'Something went wrong while saving the password.',
+  toastSettingsFailureVerifyCurrent:
+    'Something went wrong while saving the password. Was your current password entered correctly?',
   validationCurrentPassword: 'You must provide your current password',
   validationNewPassword: 'You must provide a new password',
   validationNewPasswordLength:
     'Password is too short; should be a minimum of 8 characters',
-  validationConfirmPassword: 'You must confirm your new password',
-  validationConfirmPasswordSame: 'Password must match',
+  validationConfirmPassword: 'You must confirm the new password',
+  validationConfirmPasswordSame: 'Passwords must match',
   nopasswordset: 'No Password Set',
   nopasswordsetDescription:
     'This user account currently does not have a password specifically for {applicationTitle}.\
     Configure a password below to enable this account to sign in as a "local user."',
+  nopasswordsetDescriptionOwnAccount:
+    'Your account currently does not have a password specifically for {applicationTitle}.\
+    Configure a password below to enable sign in as a "local user" using your email address.',
   nopermission: 'Unauthorized',
   nopermissionDescription:
     "You do not have permission to modify this user's password.",
@@ -95,6 +101,13 @@ const UserPasswordChange: React.FC = () => {
 
   return (
     <>
+      <PageTitle
+        title={[
+          intl.formatMessage(messages.password),
+          intl.formatMessage(globalMessages.usersettings),
+          user?.displayName,
+        ]}
+      />
       <div className="mb-6">
         <h3 className="heading">{intl.formatMessage(messages.password)}</h3>
       </div>
@@ -119,10 +132,17 @@ const UserPasswordChange: React.FC = () => {
               appearance: 'success',
             });
           } catch (e) {
-            addToast(intl.formatMessage(messages.toastSettingsFailure), {
-              autoDismiss: true,
-              appearance: 'error',
-            });
+            addToast(
+              intl.formatMessage(
+                data.hasPassword && user?.id === currentUser?.id
+                  ? messages.toastSettingsFailureVerifyCurrent
+                  : messages.toastSettingsFailure
+              ),
+              {
+                autoDismiss: true,
+                appearance: 'error',
+              }
+            );
           } finally {
             revalidate();
             resetForm();
@@ -137,9 +157,15 @@ const UserPasswordChange: React.FC = () => {
                   type="warning"
                   title={intl.formatMessage(messages.nopasswordset)}
                 >
-                  {intl.formatMessage(messages.nopasswordsetDescription, {
-                    applicationTitle: settings.currentSettings.applicationTitle,
-                  })}
+                  {intl.formatMessage(
+                    user?.id === currentUser?.id
+                      ? messages.nopasswordsetDescriptionOwnAccount
+                      : messages.nopasswordsetDescription,
+                    {
+                      applicationTitle:
+                        settings.currentSettings.applicationTitle,
+                    }
+                  )}
                 </Alert>
               )}
               {data.hasPassword && user?.id === currentUser?.id && (
diff --git a/src/components/UserProfile/UserSettings/UserPermissions/index.tsx b/src/components/UserProfile/UserSettings/UserPermissions/index.tsx
index ce4d2dc8..d7dc2778 100644
--- a/src/components/UserProfile/UserSettings/UserPermissions/index.tsx
+++ b/src/components/UserProfile/UserSettings/UserPermissions/index.tsx
@@ -11,6 +11,8 @@ import Button from '../../../Common/Button';
 import LoadingSpinner from '../../../Common/LoadingSpinner';
 import PermissionEdit from '../../../PermissionEdit';
 import Alert from '../../../Common/Alert';
+import PageTitle from '../../../Common/PageTitle';
+import globalMessages from '../../../../i18n/globalMessages';
 
 const messages = defineMessages({
   displayName: 'Display Name',
@@ -18,7 +20,7 @@ const messages = defineMessages({
   saving: 'Saving…',
   plexuser: 'Plex User',
   localuser: 'Local User',
-  toastSettingsSuccess: 'Settings successfully saved!',
+  toastSettingsSuccess: 'Permissions saved successfully!',
   toastSettingsFailure: 'Something went wrong while saving settings.',
   permissions: 'Permissions',
   unauthorized: 'Unauthorized',
@@ -60,6 +62,13 @@ const UserPermissions: React.FC = () => {
 
   return (
     <>
+      <PageTitle
+        title={[
+          intl.formatMessage(messages.permissions),
+          intl.formatMessage(globalMessages.usersettings),
+          user?.displayName,
+        ]}
+      />
       <div className="mb-6">
         <h3 className="heading">{intl.formatMessage(messages.permissions)}</h3>
       </div>
diff --git a/src/components/UserProfile/UserSettings/index.tsx b/src/components/UserProfile/UserSettings/index.tsx
index 392029d2..0ef74908 100644
--- a/src/components/UserProfile/UserSettings/index.tsx
+++ b/src/components/UserProfile/UserSettings/index.tsx
@@ -10,10 +10,10 @@ import PageTitle from '../../Common/PageTitle';
 import ProfileHeader from '../ProfileHeader';
 import useSettings from '../../../hooks/useSettings';
 import Alert from '../../Common/Alert';
+import globalMessages from '../../../i18n/globalMessages';
 
 const messages = defineMessages({
-  settings: 'User Settings',
-  menuGeneralSettings: 'General Settings',
+  menuGeneralSettings: 'General',
   menuChangePass: 'Password',
   menuNotifications: 'Notifications',
   menuPermissions: 'Permissions',
@@ -115,7 +115,12 @@ const UserSettings: React.FC = ({ children }) => {
   if (currentUser?.id !== 1 && user.id === 1) {
     return (
       <>
-        <PageTitle title={intl.formatMessage(messages.settings)} />
+        <PageTitle
+          title={[
+            intl.formatMessage(globalMessages.usersettings),
+            user.displayName,
+          ]}
+        />
         <ProfileHeader user={user} isSettingsPage />
         <div className="mt-6">
           <Alert title={intl.formatMessage(messages.unauthorized)} type="error">
@@ -136,7 +141,12 @@ const UserSettings: React.FC = ({ children }) => {
 
   return (
     <>
-      <PageTitle title={intl.formatMessage(messages.settings)} />
+      <PageTitle
+        title={[
+          intl.formatMessage(globalMessages.usersettings),
+          user.displayName,
+        ]}
+      />
       <ProfileHeader user={user} isSettingsPage />
       <div className="mt-6">
         <div className="sm:hidden">
diff --git a/src/i18n/globalMessages.ts b/src/i18n/globalMessages.ts
index daaace5e..7322994e 100644
--- a/src/i18n/globalMessages.ts
+++ b/src/i18n/globalMessages.ts
@@ -24,6 +24,8 @@ const globalMessages = defineMessages({
   experimental: 'Experimental',
   advanced: 'Advanced',
   loading: 'Loading…',
+  settings: 'Settings',
+  usersettings: 'User Settings',
 });
 
 export default globalMessages;
diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json
index 335c5b77..eb22316a 100644
--- a/src/i18n/locale/en.json
+++ b/src/i18n/locale/en.json
@@ -7,7 +7,7 @@
   "components.CollectionDetails.overviewunavailable": "Overview unavailable.",
   "components.CollectionDetails.request": "Request",
   "components.CollectionDetails.request4k": "Request 4K",
-  "components.CollectionDetails.requestSuccess": "<strong>{title}</strong> successfully requested!",
+  "components.CollectionDetails.requestSuccess": "<strong>{title}</strong> requested successfully!",
   "components.CollectionDetails.requestcollection": "Request Collection",
   "components.CollectionDetails.requestcollection4k": "Request Collection in 4K",
   "components.CollectionDetails.requesting": "Requesting…",
@@ -47,7 +47,7 @@
   "components.Layout.UserDropdown.myprofile": "Profile",
   "components.Layout.UserDropdown.settings": "Settings",
   "components.Layout.UserDropdown.signout": "Sign Out",
-  "components.Layout.alphawarning": "This is ALPHA software. Features may be broken and/or unstable. Please report issues on GitHub!",
+  "components.Layout.alphawarning": "This is ALPHA software. Features may be broken and/or unstable. Please report any issues on GitHub!",
   "components.Login.email": "Email Address",
   "components.Login.forgotpassword": "Forgot Password?",
   "components.Login.loginerror": "Something went wrong while trying to sign in.",
@@ -86,12 +86,10 @@
   "components.MovieDetails.play4konplex": "Play 4K on Plex",
   "components.MovieDetails.playonplex": "Play on Plex",
   "components.MovieDetails.recommendations": "Recommendations",
-  "components.MovieDetails.recommendationssubtext": "If you liked {title}, you might also like…",
   "components.MovieDetails.releasedate": "Release Date",
   "components.MovieDetails.revenue": "Revenue",
   "components.MovieDetails.runtime": "{minutes} minutes",
   "components.MovieDetails.similar": "Similar Titles",
-  "components.MovieDetails.similarsubtext": "Other movies similar to {title}",
   "components.MovieDetails.status": "Status",
   "components.MovieDetails.studio": "{studioCount, plural, one {Studio} other {Studios}}",
   "components.MovieDetails.unavailable": "Unavailable",
@@ -212,7 +210,7 @@
   "components.RequestModal.SearchByNameModal.next": "Next",
   "components.RequestModal.SearchByNameModal.nosummary": "No summary for this title was found.",
   "components.RequestModal.SearchByNameModal.notvdbid": "Manual Match Required",
-  "components.RequestModal.SearchByNameModal.notvdbiddescription": "We couldn't automatically match your request. Please select the correct match from the list below:",
+  "components.RequestModal.SearchByNameModal.notvdbiddescription": "We couldn't automatically match your request. Please select the correct match from the list below.",
   "components.RequestModal.alreadyrequested": "Already Requested",
   "components.RequestModal.autoapproval": "Automatic Approval",
   "components.RequestModal.backbutton": "Back",
@@ -222,7 +220,6 @@
   "components.RequestModal.close": "Close",
   "components.RequestModal.errorediting": "Something went wrong while editing the request.",
   "components.RequestModal.extras": "Extras",
-  "components.RequestModal.next": "Next",
   "components.RequestModal.notrequested": "Not Requested",
   "components.RequestModal.numberofepisodes": "# of Episodes",
   "components.RequestModal.pending4krequest": "Pending Request for {title} in 4K",
@@ -238,7 +235,7 @@
   "components.RequestModal.requestcancelled": "Request canceled.",
   "components.RequestModal.requestedited": "Request edited.",
   "components.RequestModal.requesterror": "Something went wrong while submitting the request.",
-  "components.RequestModal.requestfrom": "There is currently a pending request from {username}",
+  "components.RequestModal.requestfrom": "There is currently a pending request from {username}.",
   "components.RequestModal.requesting": "Requesting…",
   "components.RequestModal.requestseasons": "Request {seasonCount} {seasonCount, plural, one {Season} other {Seasons}}",
   "components.RequestModal.requesttitle": "Request {title}",
@@ -248,15 +245,15 @@
   "components.RequestModal.status": "Status",
   "components.ResetPassword.confirmpassword": "Confirm Password",
   "components.ResetPassword.email": "Email Address",
-  "components.ResetPassword.emailresetlink": "Email Me a Recovery Link",
-  "components.ResetPassword.forgotpassword": "Reset your password",
-  "components.ResetPassword.gobacklogin": "Go Back to Sign-In Page",
+  "components.ResetPassword.emailresetlink": "Email a Recovery Link",
+  "components.ResetPassword.gobacklogin": "Return to Sign-In Page",
   "components.ResetPassword.password": "Password",
+  "components.ResetPassword.passwordreset": "Password Reset",
   "components.ResetPassword.requestresetlinksuccessmessage": "A password reset link will be sent to the provided email address if it is associated with a valid user.",
   "components.ResetPassword.resetpassword": "Reset your password",
-  "components.ResetPassword.resetpasswordsuccessmessage": "Password successfully reset, if the link was valid and associated with an existing user.",
+  "components.ResetPassword.resetpasswordsuccessmessage": "Password reset successfully!",
   "components.ResetPassword.validationemailrequired": "You must provide a valid email address",
-  "components.ResetPassword.validationpasswordmatch": "Password must match",
+  "components.ResetPassword.validationpasswordmatch": "Passwords must match",
   "components.ResetPassword.validationpasswordminchars": "Password is too short; should be a minimum of 8 characters",
   "components.ResetPassword.validationpasswordrequired": "You must provide a password",
   "components.Search.search": "Search",
@@ -354,8 +351,8 @@
   "components.Settings.Notifications.validationBotAPIRequired": "You must provide a bot authentication token",
   "components.Settings.Notifications.validationChatIdRequired": "You must provide a valid chat ID",
   "components.Settings.Notifications.validationEmail": "You must provide a valid email address",
-  "components.Settings.Notifications.validationSmtpHostRequired": "You must provide an SMTP host",
-  "components.Settings.Notifications.validationSmtpPortRequired": "You must provide an SMTP port",
+  "components.Settings.Notifications.validationSmtpHostRequired": "You must provide a hostname or IP address",
+  "components.Settings.Notifications.validationSmtpPortRequired": "You must provide a valid port number",
   "components.Settings.Notifications.validationUrl": "You must provide a valid URL",
   "components.Settings.Notifications.webhookUrl": "Webhook URL",
   "components.Settings.Notifications.webhookUrlPlaceholder": "Server Settings → Integrations → Webhooks",
@@ -369,7 +366,7 @@
   "components.Settings.RadarrModal.editradarr": "Edit Radarr Server",
   "components.Settings.RadarrModal.externalUrl": "External URL",
   "components.Settings.RadarrModal.externalUrlPlaceholder": "External URL pointing to your Radarr server",
-  "components.Settings.RadarrModal.hostname": "Hostname",
+  "components.Settings.RadarrModal.hostname": "Hostname or IP Address",
   "components.Settings.RadarrModal.loadingprofiles": "Loading quality profiles…",
   "components.Settings.RadarrModal.loadingrootfolders": "Loading root folders…",
   "components.Settings.RadarrModal.minimumAvailability": "Minimum Availability",
@@ -392,28 +389,28 @@
   "components.Settings.RadarrModal.testFirstRootFolders": "Test connection to load root folders",
   "components.Settings.RadarrModal.testing": "Testing…",
   "components.Settings.RadarrModal.toastRadarrTestFailure": "Failed to connect to Radarr.",
-  "components.Settings.RadarrModal.toastRadarrTestSuccess": "Radarr connection established!",
+  "components.Settings.RadarrModal.toastRadarrTestSuccess": "Radarr connection established successfully!",
   "components.Settings.RadarrModal.validationApiKeyRequired": "You must provide an API key",
   "components.Settings.RadarrModal.validationApplicationUrl": "You must provide a valid URL",
   "components.Settings.RadarrModal.validationApplicationUrlTrailingSlash": "URL must not end in a trailing slash",
   "components.Settings.RadarrModal.validationBaseUrlLeadingSlash": "Base URL must have a leading slash",
   "components.Settings.RadarrModal.validationBaseUrlTrailingSlash": "Base URL must not end in a trailing slash",
-  "components.Settings.RadarrModal.validationHostnameRequired": "You must provide a hostname/IP",
+  "components.Settings.RadarrModal.validationHostnameRequired": "You must provide a hostname or IP address",
   "components.Settings.RadarrModal.validationMinimumAvailabilityRequired": "You must select a minimum availability",
   "components.Settings.RadarrModal.validationNameRequired": "You must provide a server name",
-  "components.Settings.RadarrModal.validationPortRequired": "You must provide a port",
+  "components.Settings.RadarrModal.validationPortRequired": "You must provide a valid port number",
   "components.Settings.RadarrModal.validationProfileRequired": "You must select a quality profile",
   "components.Settings.RadarrModal.validationRootFolderRequired": "You must select a root folder",
   "components.Settings.SettingsAbout.Releases.currentversion": "Current Version",
   "components.Settings.SettingsAbout.Releases.latestversion": "Latest",
   "components.Settings.SettingsAbout.Releases.releasedataMissing": "Release data unavailable. Is GitHub down?",
   "components.Settings.SettingsAbout.Releases.releases": "Releases",
-  "components.Settings.SettingsAbout.Releases.runningDevelop": "You are running a develop version of Overseerr!",
-  "components.Settings.SettingsAbout.Releases.runningDevelopMessage": "The changes in your version will not be available below. Please see the <GithubLink>GitHub repository</GithubLink> for latest updates.",
+  "components.Settings.SettingsAbout.Releases.runningDevelop": "Development Version",
+  "components.Settings.SettingsAbout.Releases.runningDevelopMessage": "The latest changes to the <code>develop</code> branch of Overseerr are not shown below. Please see the commit history for this branch on <GithubLink>GitHub</GithubLink> for details.",
   "components.Settings.SettingsAbout.Releases.versionChangelog": "Version Changelog",
   "components.Settings.SettingsAbout.Releases.viewchangelog": "View Changelog",
   "components.Settings.SettingsAbout.Releases.viewongithub": "View on GitHub",
-  "components.Settings.SettingsAbout.clickheretojoindiscord": "Click here to join our Discord server!",
+  "components.Settings.SettingsAbout.about": "About",
   "components.Settings.SettingsAbout.documentation": "Documentation",
   "components.Settings.SettingsAbout.gettingsupport": "Getting Support",
   "components.Settings.SettingsAbout.githubdiscussions": "GitHub Discussions",
@@ -421,7 +418,7 @@
   "components.Settings.SettingsAbout.overseerrinformation": "Overseerr Information",
   "components.Settings.SettingsAbout.preferredmethod": "Preferred",
   "components.Settings.SettingsAbout.supportoverseerr": "Support Overseerr",
-  "components.Settings.SettingsAbout.timezone": "Timezone",
+  "components.Settings.SettingsAbout.timezone": "Time Zone",
   "components.Settings.SettingsAbout.totalmedia": "Total Media",
   "components.Settings.SettingsAbout.totalrequests": "Total Requests",
   "components.Settings.SettingsAbout.version": "Version",
@@ -443,6 +440,7 @@
   "components.Settings.SettingsJobsCache.jobname": "Job Name",
   "components.Settings.SettingsJobsCache.jobs": "Jobs",
   "components.Settings.SettingsJobsCache.jobsDescription": "Overseerr performs certain maintenance tasks as regularly-scheduled jobs, but they can also be manually triggered below. Manually running a job will not alter its schedule.",
+  "components.Settings.SettingsJobsCache.jobsandcache": "Jobs & Cache",
   "components.Settings.SettingsJobsCache.jobstarted": "{jobname} started.",
   "components.Settings.SettingsJobsCache.jobtype": "Type",
   "components.Settings.SettingsJobsCache.nextexecution": "Next Execution",
@@ -476,9 +474,10 @@
   "components.Settings.SettingsUsers.save": "Save Changes",
   "components.Settings.SettingsUsers.saving": "Saving…",
   "components.Settings.SettingsUsers.toastSettingsFailure": "Something went wrong while saving settings.",
-  "components.Settings.SettingsUsers.toastSettingsSuccess": "Settings successfully saved!",
-  "components.Settings.SettingsUsers.userSettings": "Users",
+  "components.Settings.SettingsUsers.toastSettingsSuccess": "User settings saved successfully!",
+  "components.Settings.SettingsUsers.userSettings": "User Settings",
   "components.Settings.SettingsUsers.userSettingsDescription": "Configure global and default user settings.",
+  "components.Settings.SettingsUsers.users": "Users",
   "components.Settings.SonarrModal.add": "Add Server",
   "components.Settings.SonarrModal.animelanguageprofile": "Anime Language Profile",
   "components.Settings.SonarrModal.animequalityprofile": "Anime Quality Profile",
@@ -492,7 +491,7 @@
   "components.Settings.SonarrModal.editsonarr": "Edit Sonarr Server",
   "components.Settings.SonarrModal.externalUrl": "External URL",
   "components.Settings.SonarrModal.externalUrlPlaceholder": "External URL pointing to your Sonarr server",
-  "components.Settings.SonarrModal.hostname": "Hostname",
+  "components.Settings.SonarrModal.hostname": "Hostname or IP Address",
   "components.Settings.SonarrModal.languageprofile": "Language Profile",
   "components.Settings.SonarrModal.loadinglanguageprofiles": "Loading language profiles…",
   "components.Settings.SonarrModal.loadingprofiles": "Loading quality profiles…",
@@ -518,16 +517,16 @@
   "components.Settings.SonarrModal.testFirstRootFolders": "Test connection to load root folders",
   "components.Settings.SonarrModal.testing": "Testing…",
   "components.Settings.SonarrModal.toastSonarrTestFailure": "Failed to connect to Sonarr.",
-  "components.Settings.SonarrModal.toastSonarrTestSuccess": "Sonarr connection established!",
+  "components.Settings.SonarrModal.toastSonarrTestSuccess": "Sonarr connection established successfully!",
   "components.Settings.SonarrModal.validationApiKeyRequired": "You must provide an API key",
   "components.Settings.SonarrModal.validationApplicationUrl": "You must provide a valid URL",
   "components.Settings.SonarrModal.validationApplicationUrlTrailingSlash": "URL must not end in a trailing slash",
   "components.Settings.SonarrModal.validationBaseUrlLeadingSlash": "Base URL must have a leading slash",
   "components.Settings.SonarrModal.validationBaseUrlTrailingSlash": "Base URL must not end in a trailing slash",
-  "components.Settings.SonarrModal.validationHostnameRequired": "You must provide a hostname/IP",
+  "components.Settings.SonarrModal.validationHostnameRequired": "You must provide a hostname or IP address",
   "components.Settings.SonarrModal.validationLanguageProfileRequired": "You must select a language profile",
   "components.Settings.SonarrModal.validationNameRequired": "You must provide a server name",
-  "components.Settings.SonarrModal.validationPortRequired": "You must provide a port",
+  "components.Settings.SonarrModal.validationPortRequired": "You must provide a valid port number",
   "components.Settings.SonarrModal.validationProfileRequired": "You must select a quality profile",
   "components.Settings.SonarrModal.validationRootFolderRequired": "You must select a root folder",
   "components.Settings.activeProfile": "Active Profile",
@@ -540,8 +539,8 @@
   "components.Settings.cancelscan": "Cancel Scan",
   "components.Settings.copied": "Copied API key to clipboard.",
   "components.Settings.csrfProtection": "Enable CSRF Protection",
-  "components.Settings.csrfProtectionHoverTip": "Do NOT enable this unless you understand what you are doing!",
-  "components.Settings.csrfProtectionTip": "Sets external API access to read-only (requires HTTPS and Overseerr must be reloaded for changes to take effect)",
+  "components.Settings.csrfProtectionHoverTip": "Do NOT enable this setting unless you understand what you are doing!",
+  "components.Settings.csrfProtectionTip": "Sets external API access to read-only (requires HTTPS, and Overseerr must be reloaded for changes to take effect)",
   "components.Settings.currentlibrary": "Current Library: {name}",
   "components.Settings.default": "Default",
   "components.Settings.default4k": "Default 4K",
@@ -550,15 +549,16 @@
   "components.Settings.edit": "Edit",
   "components.Settings.email": "Email",
   "components.Settings.enablenotifications": "Enable Notifications",
+  "components.Settings.general": "General",
   "components.Settings.generalsettings": "General Settings",
   "components.Settings.generalsettingsDescription": "Configure global and default settings for Overseerr.",
   "components.Settings.hideAvailable": "Hide Available Media",
-  "components.Settings.hostname": "Hostname/IP",
+  "components.Settings.hostname": "Hostname or IP Address",
   "components.Settings.librariesRemaining": "Libraries Remaining: {count}",
   "components.Settings.manualscan": "Manual Library Scan",
   "components.Settings.manualscanDescription": "Normally, this will only be run once every 24 hours. Overseerr will check your Plex server's recently added more aggressively. If this is your first time configuring Plex, a one-time full manual library scan is recommended!",
   "components.Settings.menuAbout": "About",
-  "components.Settings.menuGeneralSettings": "General Settings",
+  "components.Settings.menuGeneralSettings": "General",
   "components.Settings.menuJobs": "Jobs & Cache",
   "components.Settings.menuLogs": "Logs",
   "components.Settings.menuNotifications": "Notifications",
@@ -569,6 +569,7 @@
   "components.Settings.nodefaultdescription": "At least one server must be marked as default before any requests will make it to your services.",
   "components.Settings.notificationAgentSettingsDescription": "Choose the types of notifications to send, and which notification agents to use.",
   "components.Settings.notificationAgentsSettings": "Notification Agents",
+  "components.Settings.notifications": "Notifications",
   "components.Settings.notificationsettings": "Notification Settings",
   "components.Settings.notificationsettingsDescription": "Configure global notification settings. The options below will apply to all notification agents.",
   "components.Settings.notificationsettingsfailed": "Notification settings failed to save.",
@@ -576,8 +577,9 @@
   "components.Settings.notrunning": "Not Running",
   "components.Settings.originalLanguageDefault": "All Languages",
   "components.Settings.originallanguage": "Discover Language",
-  "components.Settings.originallanguageTip": "Filter content by original language (only applies to the \"Popular\" and \"Upcoming\" categories)",
-  "components.Settings.partialRequestsEnabled": "Enable Partial Series Requests",
+  "components.Settings.originallanguageTip": "Filter content by original language",
+  "components.Settings.partialRequestsEnabled": "Allow Partial Series Requests",
+  "components.Settings.plex": "Plex",
   "components.Settings.plexlibraries": "Plex Libraries",
   "components.Settings.plexlibrariesDescription": "The libraries Overseerr scans for titles. Set up and save your Plex connection settings, then click the button below if no libraries are listed.",
   "components.Settings.plexsettings": "Plex Settings",
@@ -586,7 +588,7 @@
   "components.Settings.radarrSettingsDescription": "Configure your Radarr connection below. You can have multiple Radarr configurations, but only two can be active as defaults at any time (one for standard HD and one for 4K). Administrators can override the server which is used for new requests.",
   "components.Settings.radarrsettings": "Radarr Settings",
   "components.Settings.region": "Discover Region",
-  "components.Settings.regionTip": "Filter content by region (only applies to the \"Popular\" and \"Upcoming\" categories)",
+  "components.Settings.regionTip": "Filter content by regional availability",
   "components.Settings.save": "Save Changes",
   "components.Settings.saving": "Saving…",
   "components.Settings.scan": "Scan Plex Libraries",
@@ -602,31 +604,31 @@
   "components.Settings.serverpresetManualMessage": "Manual configuration",
   "components.Settings.serverpresetPlaceholder": "Plex Server",
   "components.Settings.serverpresetRefreshing": "Retrieving servers…",
+  "components.Settings.services": "Services",
   "components.Settings.settingUpPlex": "Setting Up Plex",
   "components.Settings.settingUpPlexDescription": "To set up Plex, you can either enter your details manually or select a server retrieved from <RegisterPlexTVLink>plex.tv</RegisterPlexTVLink>. Press the button to the right of the dropdown to check connectivity and retrieve available servers.",
-  "components.Settings.settings": "Settings",
   "components.Settings.sonarrSettingsDescription": "Configure your Sonarr connection below. You can have multiple Sonarr configurations, but only two can be active as defaults at any time (one for standard HD and one for 4K). Administrators can override the server which is used for new requests.",
   "components.Settings.sonarrsettings": "Sonarr Settings",
   "components.Settings.ssl": "SSL",
   "components.Settings.startscan": "Start Scan",
   "components.Settings.timeout": "Timeout",
   "components.Settings.toastApiKeyFailure": "Something went wrong while generating a new API key.",
-  "components.Settings.toastApiKeySuccess": "New API key generated!",
+  "components.Settings.toastApiKeySuccess": "New API key generated successfully!",
   "components.Settings.toastPlexConnecting": "Attempting to connect to Plex…",
-  "components.Settings.toastPlexConnectingFailure": "Unable to connect to Plex!",
-  "components.Settings.toastPlexConnectingSuccess": "Connected to Plex server.",
+  "components.Settings.toastPlexConnectingFailure": "Failed to connect to Plex.",
+  "components.Settings.toastPlexConnectingSuccess": "Plex connection established successfully!",
   "components.Settings.toastPlexRefresh": "Retrieving server list from Plex…",
-  "components.Settings.toastPlexRefreshFailure": "Unable to retrieve Plex server list!",
-  "components.Settings.toastPlexRefreshSuccess": "Retrieved Plex server list.",
+  "components.Settings.toastPlexRefreshFailure": "Failed to retrieve Plex server list.",
+  "components.Settings.toastPlexRefreshSuccess": "Plex server list retrieved successfully!",
   "components.Settings.toastSettingsFailure": "Something went wrong while saving settings.",
-  "components.Settings.toastSettingsSuccess": "Settings successfully saved!",
+  "components.Settings.toastSettingsSuccess": "Settings saved successfully!",
   "components.Settings.trustProxy": "Enable Proxy Support",
   "components.Settings.trustProxyTip": "Allows Overseerr to correctly register client IP addresses behind a proxy (Overseerr must be reloaded for changes to take effect)",
   "components.Settings.validationApplicationTitle": "You must provide an application title",
   "components.Settings.validationApplicationUrl": "You must provide a valid URL",
   "components.Settings.validationApplicationUrlTrailingSlash": "URL must not end in a trailing slash",
-  "components.Settings.validationHostnameRequired": "You must provide a hostname/IP",
-  "components.Settings.validationPortRequired": "You must provide a port",
+  "components.Settings.validationHostnameRequired": "You must provide a hostname or IP address",
+  "components.Settings.validationPortRequired": "You must provide a valid port number",
   "components.Settings.webhook": "Webhook",
   "components.Setup.configureplex": "Configure Plex",
   "components.Setup.configureservices": "Configure Services",
@@ -641,9 +643,9 @@
   "components.Setup.welcome": "Welcome to Overseerr",
   "components.Slider.noresults": "No results.",
   "components.StatusBadge.status4k": "4K {status}",
-  "components.StatusChacker.newversionDescription": "An update is now available. Click the button below to reload the application.",
-  "components.StatusChacker.newversionavailable": "New Version Available",
-  "components.StatusChacker.reloadOverseerr": "Reload Overseerr",
+  "components.StatusChacker.newversionDescription": "Overseerr has been updated! Please click the button below to reload the page.",
+  "components.StatusChacker.newversionavailable": "Application Update",
+  "components.StatusChacker.reloadOverseerr": "Reload",
   "components.TitleCard.movie": "Movie",
   "components.TitleCard.tvshow": "Series",
   "components.TvDetails.TvCast.fullseriescast": "Full Series Cast",
@@ -678,11 +680,9 @@
   "components.TvDetails.play4konplex": "Play 4K on Plex",
   "components.TvDetails.playonplex": "Play on Plex",
   "components.TvDetails.recommendations": "Recommendations",
-  "components.TvDetails.recommendationssubtext": "If you liked {title}, you might also like…",
   "components.TvDetails.seasons": "{seasonCount, plural, one {# Season} other {# Seasons}}",
   "components.TvDetails.showtype": "Series Type",
   "components.TvDetails.similar": "Similar Series",
-  "components.TvDetails.similarsubtext": "Other series similar to {title}",
   "components.TvDetails.status": "Status",
   "components.TvDetails.unavailable": "Unavailable",
   "components.TvDetails.userrating": "User Rating",
@@ -730,10 +730,10 @@
   "components.UserList.usercreatedsuccess": "User created successfully!",
   "components.UserList.userdeleted": "User deleted.",
   "components.UserList.userdeleteerror": "Something went wrong while deleting the user.",
-  "components.UserList.userfail": "Something went wrong while saving the user.",
+  "components.UserList.userfail": "Something went wrong while saving user permissions.",
   "components.UserList.userlist": "User List",
   "components.UserList.users": "Users",
-  "components.UserList.userssaved": "Users saved!",
+  "components.UserList.userssaved": "User permissions saved successfully!",
   "components.UserList.validationEmail": "You must provide a valid email address",
   "components.UserList.validationpasswordminchars": "Password is too short; should be a minimum of 8 characters",
   "components.UserProfile.ProfileHeader.joindate": "Joined {joindate}",
@@ -744,26 +744,28 @@
   "components.UserProfile.UserSettings.UserGeneralSettings.accounttype": "Account Type",
   "components.UserProfile.UserSettings.UserGeneralSettings.admin": "Admin",
   "components.UserProfile.UserSettings.UserGeneralSettings.displayName": "Display Name",
+  "components.UserProfile.UserSettings.UserGeneralSettings.general": "General",
   "components.UserProfile.UserSettings.UserGeneralSettings.generalsettings": "General Settings",
   "components.UserProfile.UserSettings.UserGeneralSettings.languageServerDefault": "Default ({language})",
   "components.UserProfile.UserSettings.UserGeneralSettings.localuser": "Local User",
   "components.UserProfile.UserSettings.UserGeneralSettings.originalLanguageDefault": "All Languages",
   "components.UserProfile.UserSettings.UserGeneralSettings.originallanguage": "Discover Language",
-  "components.UserProfile.UserSettings.UserGeneralSettings.originallanguageTip": "Filter content by original language (only applies to the \"Popular\" and \"Upcoming\" categories)",
+  "components.UserProfile.UserSettings.UserGeneralSettings.originallanguageTip": "Filter content by original language",
   "components.UserProfile.UserSettings.UserGeneralSettings.owner": "Owner",
   "components.UserProfile.UserSettings.UserGeneralSettings.plexuser": "Plex User",
   "components.UserProfile.UserSettings.UserGeneralSettings.region": "Discover Region",
-  "components.UserProfile.UserSettings.UserGeneralSettings.regionTip": "Filter content by region (only applies to the \"Popular\" and \"Upcoming\" categories)",
+  "components.UserProfile.UserSettings.UserGeneralSettings.regionTip": "Filter content by regional availability",
   "components.UserProfile.UserSettings.UserGeneralSettings.role": "Role",
   "components.UserProfile.UserSettings.UserGeneralSettings.save": "Save Changes",
   "components.UserProfile.UserSettings.UserGeneralSettings.saving": "Saving…",
   "components.UserProfile.UserSettings.UserGeneralSettings.toastSettingsFailure": "Something went wrong while saving settings.",
-  "components.UserProfile.UserSettings.UserGeneralSettings.toastSettingsSuccess": "Settings successfully saved!",
+  "components.UserProfile.UserSettings.UserGeneralSettings.toastSettingsSuccess": "Settings saved successfully!",
   "components.UserProfile.UserSettings.UserGeneralSettings.user": "User",
   "components.UserProfile.UserSettings.UserNotificationSettings.discordId": "Discord ID",
   "components.UserProfile.UserSettings.UserNotificationSettings.discordIdTip": "The <FindDiscordIdLink>ID number</FindDiscordIdLink> for your Discord user account",
   "components.UserProfile.UserSettings.UserNotificationSettings.enableNotifications": "Enable Notifications",
   "components.UserProfile.UserSettings.UserNotificationSettings.localuser": "Local User",
+  "components.UserProfile.UserSettings.UserNotificationSettings.notifications": "Notifications",
   "components.UserProfile.UserSettings.UserNotificationSettings.notificationsettings": "Notification Settings",
   "components.UserProfile.UserSettings.UserNotificationSettings.pgpKey": "<PgpLink>PGP</PgpLink> Public Key",
   "components.UserProfile.UserSettings.UserNotificationSettings.pgpKeyTip": "Encrypt email messages",
@@ -776,7 +778,7 @@
   "components.UserProfile.UserSettings.UserNotificationSettings.telegramChatIdTip": "Add <GetIdBotLink>@get_id_bot</GetIdBotLink> to the chat",
   "components.UserProfile.UserSettings.UserNotificationSettings.telegramChatIdTipLong": "<TelegramBotLink>Start a chat</TelegramBotLink>, add <GetIdBotLink>@get_id_bot</GetIdBotLink>, and issue the <code>/my_id</code> command",
   "components.UserProfile.UserSettings.UserNotificationSettings.toastSettingsFailure": "Something went wrong while saving settings.",
-  "components.UserProfile.UserSettings.UserNotificationSettings.toastSettingsSuccess": "Settings successfully saved!",
+  "components.UserProfile.UserSettings.UserNotificationSettings.toastSettingsSuccess": "Notification settings saved successfully!",
   "components.UserProfile.UserSettings.UserNotificationSettings.validationDiscordId": "You must provide a valid Discord user ID",
   "components.UserProfile.UserSettings.UserNotificationSettings.validationTelegramChatId": "You must provide a valid Telegram chat ID",
   "components.UserProfile.UserSettings.UserPasswordChange.confirmpassword": "Confirm Password",
@@ -784,15 +786,17 @@
   "components.UserProfile.UserSettings.UserPasswordChange.newpassword": "New Password",
   "components.UserProfile.UserSettings.UserPasswordChange.nopasswordset": "No Password Set",
   "components.UserProfile.UserSettings.UserPasswordChange.nopasswordsetDescription": "This user account currently does not have a password specifically for {applicationTitle}. Configure a password below to enable this account to sign in as a \"local user.\"",
+  "components.UserProfile.UserSettings.UserPasswordChange.nopasswordsetDescriptionOwnAccount": "Your account currently does not have a password specifically for {applicationTitle}. Configure a password below to enable sign in as a \"local user\" using your email address.",
   "components.UserProfile.UserSettings.UserPasswordChange.nopermission": "Unauthorized",
   "components.UserProfile.UserSettings.UserPasswordChange.nopermissionDescription": "You do not have permission to modify this user's password.",
   "components.UserProfile.UserSettings.UserPasswordChange.password": "Password",
   "components.UserProfile.UserSettings.UserPasswordChange.save": "Save Changes",
   "components.UserProfile.UserSettings.UserPasswordChange.saving": "Saving…",
-  "components.UserProfile.UserSettings.UserPasswordChange.toastSettingsFailure": "Something went wrong while changing the password. Is your current password correct?",
-  "components.UserProfile.UserSettings.UserPasswordChange.toastSettingsSuccess": "Password changed!",
-  "components.UserProfile.UserSettings.UserPasswordChange.validationConfirmPassword": "You must confirm your new password",
-  "components.UserProfile.UserSettings.UserPasswordChange.validationConfirmPasswordSame": "Password must match",
+  "components.UserProfile.UserSettings.UserPasswordChange.toastSettingsFailure": "Something went wrong while saving the password.",
+  "components.UserProfile.UserSettings.UserPasswordChange.toastSettingsFailureVerifyCurrent": "Something went wrong while saving the password. Was your current password entered correctly?",
+  "components.UserProfile.UserSettings.UserPasswordChange.toastSettingsSuccess": "Password saved successfully!",
+  "components.UserProfile.UserSettings.UserPasswordChange.validationConfirmPassword": "You must confirm the new password",
+  "components.UserProfile.UserSettings.UserPasswordChange.validationConfirmPasswordSame": "Passwords must match",
   "components.UserProfile.UserSettings.UserPasswordChange.validationCurrentPassword": "You must provide your current password",
   "components.UserProfile.UserSettings.UserPasswordChange.validationNewPassword": "You must provide a new password",
   "components.UserProfile.UserSettings.UserPasswordChange.validationNewPasswordLength": "Password is too short; should be a minimum of 8 characters",
@@ -803,14 +807,13 @@
   "components.UserProfile.UserSettings.UserPermissions.save": "Save Changes",
   "components.UserProfile.UserSettings.UserPermissions.saving": "Saving…",
   "components.UserProfile.UserSettings.UserPermissions.toastSettingsFailure": "Something went wrong while saving settings.",
-  "components.UserProfile.UserSettings.UserPermissions.toastSettingsSuccess": "Settings successfully saved!",
+  "components.UserProfile.UserSettings.UserPermissions.toastSettingsSuccess": "Permissions saved successfully!",
   "components.UserProfile.UserSettings.UserPermissions.unauthorized": "Unauthorized",
   "components.UserProfile.UserSettings.UserPermissions.unauthorizedDescription": "You cannot modify your own permissions.",
   "components.UserProfile.UserSettings.menuChangePass": "Password",
-  "components.UserProfile.UserSettings.menuGeneralSettings": "General Settings",
+  "components.UserProfile.UserSettings.menuGeneralSettings": "General",
   "components.UserProfile.UserSettings.menuNotifications": "Notifications",
   "components.UserProfile.UserSettings.menuPermissions": "Permissions",
-  "components.UserProfile.UserSettings.settings": "User Settings",
   "components.UserProfile.UserSettings.unauthorized": "Unauthorized",
   "components.UserProfile.UserSettings.unauthorizedDescription": "You do not have permission to modify this user's settings.",
   "components.UserProfile.norequests": "No Requests",
@@ -836,12 +839,15 @@
   "i18n.request": "Request",
   "i18n.requested": "Requested",
   "i18n.retry": "Retry",
+  "i18n.settings": "Settings",
   "i18n.tvshows": "Series",
   "i18n.unavailable": "Unavailable",
-  "pages.internalServerError": "{statusCode} - Internal server error",
+  "i18n.usersettings": "User Settings",
+  "pages.errormessagewithcode": "404 - {error}",
+  "pages.internalservererror": "Internal Server Error",
   "pages.oops": "Oops",
-  "pages.pageNotFound": "404 - Page Not Found",
+  "pages.pagenotfound": "Page Not Found",
   "pages.returnHome": "Return Home",
-  "pages.serviceUnavailable": "{statusCode} - Service unavailable",
-  "pages.somethingWentWrong": "{statusCode} - Something went wrong"
+  "pages.serviceunavailable": "Service Unavailable",
+  "pages.somethingwentwrong": "Something Went Wrong"
 }
diff --git a/src/pages/404.tsx b/src/pages/404.tsx
index deabedb7..5ec79d8b 100644
--- a/src/pages/404.tsx
+++ b/src/pages/404.tsx
@@ -1,21 +1,28 @@
 import Link from 'next/link';
 import React from 'react';
-import { defineMessages, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
+import PageTitle from '../components/Common/PageTitle';
 
 const messages = defineMessages({
-  pageNotFound: '404 - Page Not Found',
+  errormessagewithcode: '404 - {error}',
+  pagenotfound: 'Page Not Found',
   returnHome: 'Return Home',
 });
 
 const Custom404: React.FC = () => {
+  const intl = useIntl();
+
   return (
     <div className="error-message">
+      <PageTitle title={intl.formatMessage(messages.pagenotfound)} />
       <div className="text-4xl">
-        <FormattedMessage {...messages.pageNotFound} />
+        {intl.formatMessage(messages.errormessagewithcode, {
+          error: intl.formatMessage(messages.pagenotfound),
+        })}
       </div>
       <Link href="/">
         <a className="flex">
-          <FormattedMessage {...messages.returnHome} />
+          {intl.formatMessage(messages.returnHome)}
           <svg
             className="w-6 h-6 ml-2"
             fill="none"
diff --git a/src/pages/_error.tsx b/src/pages/_error.tsx
index b40c501a..bb24b57f 100644
--- a/src/pages/_error.tsx
+++ b/src/pages/_error.tsx
@@ -2,16 +2,18 @@ import React from 'react';
 import type { NextPage } from 'next';
 import Link from 'next/link';
 import type { Undefinable } from '../utils/typeHelpers';
-import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
+import PageTitle from '../components/Common/PageTitle';
 
 interface ErrorProps {
   statusCode?: number;
 }
 
 const messages = defineMessages({
-  internalServerError: '{statusCode} - Internal server error',
-  serviceUnavailable: '{statusCode} - Service unavailable',
-  somethingWentWrong: '{statusCode} - Something went wrong',
+  errormessagewithcode: '{statusCode} - {error}',
+  internalservererror: 'Internal Server Error',
+  serviceunavailable: 'Service Unavailable',
+  somethingwentwrong: 'Something Went Wrong',
   oops: 'Oops',
   returnHome: 'Return Home',
 });
@@ -22,25 +24,29 @@ const Error: NextPage<ErrorProps> = ({ statusCode }) => {
   const getErrorMessage = (statusCode?: number) => {
     switch (statusCode) {
       case 500:
-        return intl.formatMessage(messages.internalServerError, {
-          statusCode: 500,
-        });
+        return intl.formatMessage(messages.internalservererror);
       case 503:
-        return intl.formatMessage(messages.serviceUnavailable, {
-          statusCode: 503,
-        });
+        return intl.formatMessage(messages.serviceunavailable);
       default:
-        return intl.formatMessage(messages.somethingWentWrong, {
-          statusCode: statusCode ?? intl.formatMessage(messages.oops),
-        });
+        return statusCode
+          ? intl.formatMessage(messages.somethingwentwrong)
+          : intl.formatMessage(messages.oops);
     }
   };
   return (
     <div className="error-message">
-      <div className="text-4xl">{getErrorMessage(statusCode)}</div>
+      <PageTitle title={getErrorMessage(statusCode)} />
+      <div className="text-4xl">
+        {statusCode
+          ? intl.formatMessage(messages.errormessagewithcode, {
+              statusCode: statusCode,
+              message: getErrorMessage(statusCode),
+            })
+          : getErrorMessage(statusCode)}
+      </div>
       <Link href="/">
         <a className="flex">
-          <FormattedMessage {...messages.returnHome} />
+          {intl.formatMessage(messages.returnHome)}
           <svg
             className="w-6 h-6 ml-2"
             fill="none"