Multiple Translations updated by Weblate

ignore-downstream

Co-authored-by: Havok Dan <havokdan@yahoo.com.br>
Co-authored-by: Stevie Robinson <stevie.robinson@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://translate.servarr.com/projects/servarr/radarr/pt_BR/
Translation: Servarr/Radarr

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '5.3.3'
+  majorVersion: '5.3.4'
   minorVersion: $[counter('minorVersion', 2000)]
   radarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(radarrVersion)'

frontend/src/AddMovie/ImportMovie/Import/ImportMovieRow.js

@@ -10,6 +10,7 @@ import styles from './ImportMovieRow.css';
 function ImportMovieRow(props) {
   const {
     id,
+    relativePath,
     monitor,
     qualityProfileId,
     minimumAvailability,
@@ -31,7 +32,7 @@ function ImportMovieRow(props) {
       />
 
       <VirtualTableRowCell className={styles.folder}>
-        {id}
+        {relativePath}
       </VirtualTableRowCell>
 
       <VirtualTableRowCell className={styles.movie}>
@@ -73,6 +74,7 @@ function ImportMovieRow(props) {
 
 ImportMovieRow.propTypes = {
   id: PropTypes.string.isRequired,
+  relativePath: PropTypes.string.isRequired,
   monitor: PropTypes.string.isRequired,
   qualityProfileId: PropTypes.number.isRequired,
   minimumAvailability: PropTypes.string.isRequired,

frontend/src/AddMovie/ImportMovie/Import/ImportMovieTable.js

@@ -30,7 +30,7 @@ class ImportMovieTable extends Component {
     unmappedFolders.forEach((unmappedFolder) => {
       const id = unmappedFolder.name;
 
-      onMovieLookup(id, unmappedFolder.path);
+      onMovieLookup(id, unmappedFolder.path, unmappedFolder.relativePath);
 
       onSetImportMovieValue({
         id,

frontend/src/AddMovie/ImportMovie/Import/ImportMovieTableConnector.js

@@ -25,10 +25,11 @@ function createMapStateToProps() {
 
 function createMapDispatchToProps(dispatch, props) {
   return {
-    onMovieLookup(name, path) {
+    onMovieLookup(name, path, relativePath) {
       dispatch(queueLookupMovie({
         name,
         path,
+        relativePath,
         term: name
       }));
     },

frontend/src/Collection/CollectionFooter.js

@@ -14,6 +14,50 @@ import styles from './CollectionFooter.css';
 
 const NO_CHANGE = 'noChange';
 
+const monitoredOptions = [
+  {
+    key: NO_CHANGE,
+    get value() {
+      return translate('NoChange');
+    },
+    disabled: true
+  },
+  {
+    key: 'monitored',
+    get value() {
+      return translate('Monitored');
+    }
+  },
+  {
+    key: 'unmonitored',
+    get value() {
+      return translate('Unmonitored');
+    }
+  }
+];
+
+const searchOnAddOptions = [
+  {
+    key: NO_CHANGE,
+    get value() {
+      return translate('NoChange');
+    },
+    disabled: true
+  },
+  {
+    key: 'yes',
+    get value() {
+      return translate('Yes');
+    }
+  },
+  {
+    key: 'no',
+    get value() {
+      return translate('No');
+    }
+  }
+];
+
 class CollectionFooter extends Component {
 
   //
@@ -23,12 +67,12 @@ class CollectionFooter extends Component {
     super(props, context);
 
     this.state = {
-      monitor: NO_CHANGE,
       monitored: NO_CHANGE,
+      monitor: NO_CHANGE,
       qualityProfileId: NO_CHANGE,
       minimumAvailability: NO_CHANGE,
       rootFolderPath: NO_CHANGE,
-      destinationRootFolder: null
+      searchOnAdd: NO_CHANGE
     };
   }
 
@@ -44,8 +88,9 @@ class CollectionFooter extends Component {
         monitored: NO_CHANGE,
         monitor: NO_CHANGE,
         qualityProfileId: NO_CHANGE,
+        minimumAvailability: NO_CHANGE,
         rootFolderPath: NO_CHANGE,
-        minimumAvailability: NO_CHANGE
+        searchOnAdd: NO_CHANGE
       });
     }
 
@@ -63,11 +108,12 @@ class CollectionFooter extends Component {
 
   onUpdateSelectedPress = () => {
     const {
-      monitor,
       monitored,
+      monitor,
       qualityProfileId,
       minimumAvailability,
-      rootFolderPath
+      rootFolderPath,
+      searchOnAdd
     } = this.state;
 
     const changes = {};
@@ -92,6 +138,10 @@ class CollectionFooter extends Component {
       changes.rootFolderPath = rootFolderPath;
     }
 
+    if (searchOnAdd !== NO_CHANGE) {
+      changes.searchOnAdd = searchOnAdd === 'yes';
+    }
+
     this.props.onUpdateSelectedPress(changes);
   };
 
@@ -109,15 +159,10 @@ class CollectionFooter extends Component {
       monitor,
       qualityProfileId,
       minimumAvailability,
-      rootFolderPath
+      rootFolderPath,
+      searchOnAdd
     } = this.state;
 
-    const monitoredOptions = [
-      { key: NO_CHANGE, value: translate('NoChange'), disabled: true },
-      { key: 'monitored', value: translate('Monitored') },
-      { key: 'unmonitored', value: translate('Unmonitored') }
-    ];
-
     const selectedCount = selectedIds.length;
 
     return (
@@ -125,7 +170,7 @@ class CollectionFooter extends Component {
         <div className={styles.inputContainer}>
           <CollectionFooterLabel
             label={translate('MonitorCollection')}
-            isSaving={isSaving}
+            isSaving={isSaving && monitored !== NO_CHANGE}
           />
 
           <SelectInput
@@ -140,7 +185,7 @@ class CollectionFooter extends Component {
         <div className={styles.inputContainer}>
           <CollectionFooterLabel
             label={translate('MonitorMovies')}
-            isSaving={isSaving}
+            isSaving={isSaving && monitor !== NO_CHANGE}
           />
 
           <SelectInput
@@ -198,10 +243,25 @@ class CollectionFooter extends Component {
           />
         </div>
 
+        <div className={styles.inputContainer}>
+          <CollectionFooterLabel
+            label={translate('SearchMoviesOnAdd')}
+            isSaving={isSaving && searchOnAdd !== NO_CHANGE}
+          />
+
+          <SelectInput
+            name="searchOnAdd"
+            value={searchOnAdd}
+            values={searchOnAddOptions}
+            isDisabled={!selectedCount}
+            onChange={this.onInputChange}
+          />
+        </div>
+
         <div className={styles.buttonContainer}>
           <div className={styles.buttonContainerContent}>
             <CollectionFooterLabel
-              label={translate('CollectionsSelectedInterp', [selectedCount])}
+              label={translate('CountCollectionsSelected', { count: selectedCount })}
               isSaving={false}
             />
 

frontend/src/Components/ImportListList.js

@@ -19,7 +19,7 @@ function ImportListList({ lists, importListList }) {
           return (
             <Label
               key={list.id}
-              kind={kinds.INFO}
+              kind={kinds.SUCCESS}
               size={sizes.MEDIUM}
             >
               {list.name}

frontend/src/Components/Page/Sidebar/PageSidebar.js

@@ -101,7 +101,7 @@ const links = [
         to: '/settings/downloadclients'
       },
       {
-        title: () => translate('Lists'),
+        title: () => translate('ImportLists'),
         to: '/settings/importlists'
       },
       {
@@ -121,7 +121,7 @@ const links = [
         to: '/settings/general'
       },
       {
-        title: () => translate('UI'),
+        title: () => translate('Ui'),
         to: '/settings/ui'
       }
     ]

frontend/src/DiscoverMovie/DiscoverMovie.js

@@ -329,10 +329,7 @@ class DiscoverMovie extends Component {
                 null
             }
 
-            {
-              (view === 'posters' || view === 'overview') &&
-                <PageToolbarSeparator />
-            }
+            <PageToolbarSeparator />
 
             <DiscoverMovieViewMenu
               view={view}

frontend/src/DiscoverMovie/Overview/DiscoverMovieOverview.js

@@ -97,6 +97,8 @@ class DiscoverMovieOverview extends Component {
       isExisting,
       isExcluded,
       isRecommendation,
+      isPopular,
+      isTrending,
       isSelected,
       overviewOptions,
       ...otherProps
@@ -214,6 +216,26 @@ class DiscoverMovieOverview extends Component {
                   null
               }
 
+              {
+                isPopular ?
+                  <Label
+                    kind={kinds.INFO}
+                  >
+                    {translate('Popular')}
+                  </Label> :
+                  null
+              }
+
+              {
+                isTrending ?
+                  <Label
+                    kind={kinds.INFO}
+                  >
+                    {translate('Trending')}
+                  </Label> :
+                  null
+              }
+
               <ImportListListConnector
                 lists={lists}
               />
@@ -283,6 +305,8 @@ DiscoverMovieOverview.propTypes = {
   isExisting: PropTypes.bool.isRequired,
   isExcluded: PropTypes.bool.isRequired,
   isRecommendation: PropTypes.bool.isRequired,
+  isPopular: PropTypes.bool.isRequired,
+  isTrending: PropTypes.bool.isRequired,
   isSelected: PropTypes.bool,
   lists: PropTypes.arrayOf(PropTypes.number).isRequired,
   onSelectedChange: PropTypes.func.isRequired

frontend/src/DiscoverMovie/Table/DiscoverMovieHeader.css

@@ -57,10 +57,12 @@
   flex: 0 0 115px;
 }
 
+.isTrending,
+.isPopular,
 .isRecommendation {
   composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';
 
-  flex: 0 0 50px;
+  flex: 0 0 30px;
 }
 
 .actions {

frontend/src/DiscoverMovie/Table/DiscoverMovieHeader.css.d.ts

@@ -7,7 +7,9 @@ interface CssExports {
   'digitalRelease': string;
   'genres': string;
   'inCinemas': string;
+  'isPopular': string;
   'isRecommendation': string;
+  'isTrending': string;
   'lists': string;
   'originalLanguage': string;
   'physicalRelease': string;

frontend/src/DiscoverMovie/Table/DiscoverMovieHeader.js

@@ -103,6 +103,40 @@ class DiscoverMovieHeader extends Component {
               );
             }
 
+            if (name === 'isTrending') {
+              return (
+                <VirtualTableHeaderCell
+                  key={name}
+                  className={styles[name]}
+                  name={name}
+                  isSortable={true}
+                  {...otherProps}
+                >
+                  <Icon
+                    name={icons.TRENDING}
+                    size={12}
+                  />
+                </VirtualTableHeaderCell>
+              );
+            }
+
+            if (name === 'isPopular') {
+              return (
+                <VirtualTableHeaderCell
+                  key={name}
+                  className={styles[name]}
+                  name={name}
+                  isSortable={true}
+                  {...otherProps}
+                >
+                  <Icon
+                    name={icons.POPULAR}
+                    size={12}
+                  />
+                </VirtualTableHeaderCell>
+              );
+            }
+
             return (
               <VirtualTableHeaderCell
                 key={name}

frontend/src/DiscoverMovie/Table/DiscoverMovieRow.css

@@ -76,10 +76,12 @@
   flex: 1 0 110px;
 }
 
+.isTrending,
+.isPopular,
 .isRecommendation {
   composes: cell;
 
-  flex: 0 0 50px;
+  flex: 0 0 30px;
 }
 
 .actions {
@@ -95,6 +97,11 @@
   margin-top: 0;
 }
 
+.statusIcon {
+  width: 20px !important;
+  text-align: center;
+}
+
 .externalLinks {
   margin-right: 0.5em;
 }

frontend/src/DiscoverMovie/Table/DiscoverMovieRow.css.d.ts

@@ -12,7 +12,9 @@ interface CssExports {
   'externalLinks': string;
   'genres': string;
   'inCinemas': string;
+  'isPopular': string;
   'isRecommendation': string;
+  'isTrending': string;
   'lists': string;
   'originalLanguage': string;
   'physicalRelease': string;
@@ -21,6 +23,7 @@ interface CssExports {
   'runtime': string;
   'sortTitle': string;
   'status': string;
+  'statusIcon': string;
   'studio': string;
 }
 export const cssExports: CssExports;

frontend/src/DiscoverMovie/Table/DiscoverMovieRow.js

@@ -82,6 +82,8 @@ class DiscoverMovieRow extends Component {
       isExisting,
       isExcluded,
       isRecommendation,
+      isTrending,
+      isPopular,
       isSelected,
       lists,
       onSelectedChange
@@ -305,6 +307,7 @@ class DiscoverMovieRow extends Component {
                   {
                     isRecommendation ?
                       <Icon
+                        className={styles.statusIcon}
                         name={icons.RECOMMENDED}
                         size={12}
                         title={translate('MovieIsRecommend')}
@@ -315,6 +318,46 @@ class DiscoverMovieRow extends Component {
               );
             }
 
+            if (name === 'isTrending') {
+              return (
+                <VirtualTableRowCell
+                  key={name}
+                  className={styles[name]}
+                >
+                  {
+                    isTrending ?
+                      <Icon
+                        className={styles.statusIcon}
+                        name={icons.TRENDING}
+                        size={12}
+                        title={translate('MovieIsTrending')}
+                      /> :
+                      null
+                  }
+                </VirtualTableRowCell>
+              );
+            }
+
+            if (name === 'isPopular') {
+              return (
+                <VirtualTableRowCell
+                  key={name}
+                  className={styles[name]}
+                >
+                  {
+                    isPopular ?
+                      <Icon
+                        className={styles.statusIcon}
+                        name={icons.POPULAR}
+                        size={12}
+                        title={translate('MovieIsPopular')}
+                      /> :
+                      null
+                  }
+                </VirtualTableRowCell>
+              );
+            }
+
             if (name === 'actions') {
               return (
                 <VirtualTableRowCell
@@ -404,6 +447,8 @@ DiscoverMovieRow.propTypes = {
   isExcluded: PropTypes.bool.isRequired,
   isSelected: PropTypes.bool,
   isRecommendation: PropTypes.bool.isRequired,
+  isPopular: PropTypes.bool.isRequired,
+  isTrending: PropTypes.bool.isRequired,
   lists: PropTypes.arrayOf(PropTypes.number).isRequired,
   onSelectedChange: PropTypes.func.isRequired
 };

frontend/src/Helpers/Props/icons.js

@@ -23,6 +23,7 @@ import {
 import {
   faArrowCircleLeft as fasArrowCircleLeft,
   faArrowCircleRight as fasArrowCircleRight,
+  faArrowTrendUp as fasArrowTrendUp,
   faAsterisk as fasAsterisk,
   faBackward as fasBackward,
   faBan as fasBan,
@@ -233,6 +234,7 @@ export const TAGS = fasTags;
 export const TBA = fasQuestionCircle;
 export const TEST = fasVial;
 export const TRANSLATE = fasLanguage;
+export const TRENDING = fasArrowTrendUp;
 export const UNGROUP = farObjectUngroup;
 export const UNKNOWN = fasQuestion;
 export const UNMONITORED = farBookmark;

frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.tsx

@@ -242,25 +242,6 @@ function InteractiveImportModalContent(
   const [interactiveImportErrorMessage, setInteractiveImportErrorMessage] =
     useState<string | null>(null);
   const [selectState, setSelectState] = useSelectState();
-  const [bulkSelectOptions, setBulkSelectOptions] = useState([
-    {
-      key: 'select',
-      value: translate('SelectDropdown'),
-      disabled: true,
-    },
-    {
-      key: 'quality',
-      value: translate('SelectQuality'),
-    },
-    {
-      key: 'releaseGroup',
-      value: translate('SelectReleaseGroup'),
-    },
-    {
-      key: 'language',
-      value: translate('SelectLanguage'),
-    },
-  ]);
   const { allSelected, allUnselected, selectedState } = selectState;
   const previousIsDeleting = usePrevious(isDeleting);
   const dispatch = useDispatch();
@@ -283,19 +264,39 @@ function InteractiveImportModalContent(
     return getSelectedIds(selectedState);
   }, [selectedState]);
 
+  const bulkSelectOptions = useMemo(() => {
+    const options = [
+      {
+        key: 'select',
+        value: translate('SelectDropdown'),
+        disabled: true,
+      },
+      {
+        key: 'quality',
+        value: translate('SelectQuality'),
+      },
+      {
+        key: 'releaseGroup',
+        value: translate('SelectReleaseGroup'),
+      },
+      {
+        key: 'language',
+        value: translate('SelectLanguage'),
+      },
+    ];
+
+    if (allowMovieChange) {
+      options.splice(1, 0, {
+        key: 'movie',
+        value: translate('SelectMovie'),
+      });
+    }
+
+    return options;
+  }, [allowMovieChange]);
+
   useEffect(
     () => {
-      if (allowMovieChange) {
-        const newBulkSelectOptions = [...bulkSelectOptions];
-
-        newBulkSelectOptions.splice(1, 0, {
-          key: 'movie',
-          value: translate('SelectMovie'),
-        });
-
-        setBulkSelectOptions(newBulkSelectOptions);
-      }
-
       if (initialSortKey) {
         const sortProps: { sortKey: string; sortDirection?: string } = {
           sortKey: initialSortKey,

frontend/src/InteractiveSearch/InteractiveSearch.js

@@ -88,13 +88,6 @@ const columns = [
     isSortable: true,
     isVisible: true
   },
-  {
-    name: 'releaseWeight',
-    label: React.createElement(Icon, { name: icons.DOWNLOAD }),
-    isSortable: true,
-    fixedSortDirection: sortDirections.ASCENDING,
-    isVisible: true
-  },
   {
     name: 'rejections',
     label: React.createElement(Icon, {
@@ -104,6 +97,13 @@ const columns = [
     isSortable: true,
     fixedSortDirection: sortDirections.ASCENDING,
     isVisible: true
+  },
+  {
+    name: 'releaseWeight',
+    label: React.createElement(Icon, { name: icons.DOWNLOAD }),
+    isSortable: true,
+    fixedSortDirection: sortDirections.ASCENDING,
+    isVisible: true
   }
 ];
 

frontend/src/Movie/Details/MovieDetailsLinks.css

@@ -3,6 +3,7 @@
 }
 
 .link {
+  display: inline-block;
   white-space: nowrap;
 }
 

frontend/src/Movie/Index/MovieIndex.tsx

@@ -235,7 +235,7 @@ const MovieIndex = withScrollPosition((props: MovieIndexProps) => {
             />
 
             <PageToolbarButton
-              label={translate('RSSSync')}
+              label={translate('RssSync')}
               iconName={icons.RSS}
               isSpinning={isRssSyncExecuting}
               isDisabled={hasNoMovie}

frontend/src/MovieFile/Editor/MovieFileEditorTableContent.js

@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
+import translate from 'Utilities/String/translate';
 import MovieFileEditorRow from './MovieFileEditorRow';
 import styles from './MovieFileEditorTableContent.css';
 
@@ -22,7 +23,7 @@ class MovieFileEditorTableContent extends Component {
         {
           !items.length &&
             <div className={styles.blankpad}>
-              No movie files to manage.
+              {translate('NoMovieFilesToManage')}
             </div>
         }
 

frontend/src/MovieFile/Editor/MovieFileEditorTableContentConnector.js

@@ -23,9 +23,7 @@ function createMapStateToProps() {
     ) => {
       const languages = languageProfiles.items;
       const qualities = getQualities(qualityProfiles.schema.items);
-      const filesForMovie = movieFiles.items.filter((obj) => {
-        return obj.movieId === movieId;
-      });
+      const filesForMovie = movieFiles.items.filter((file) => file.movieId === movieId);
 
       return {
         items: filesForMovie,
@@ -42,11 +40,11 @@ function createMapStateToProps() {
 
 function createMapDispatchToProps(dispatch, props) {
   return {
-    dispatchFetchQualityProfileSchema(name, path) {
+    dispatchFetchQualityProfileSchema() {
       dispatch(fetchQualityProfileSchema());
     },
 
-    dispatchFetchLanguages(name, path) {
+    dispatchFetchLanguages() {
       dispatch(fetchLanguages());
     },
 

frontend/src/MovieFile/Extras/ExtraFileTableContent.js

@@ -46,7 +46,7 @@ class ExtraFileTableContent extends Component {
         {
           !items.length &&
             <div className={styles.blankpad}>
-              No extra files to manage.
+              {translate('NoExtraFilesToManage')}
             </div>
         }
 

frontend/src/MovieFile/Extras/ExtraFileTableContentConnector.js

@@ -14,9 +14,7 @@ function createMapStateToProps() {
       movieId,
       extraFiles
     ) => {
-      const filesForMovie = extraFiles.items.filter((obj) => {
-        return obj.movieId === movieId;
-      });
+      const filesForMovie = extraFiles.items.filter((file) => file.movieId === movieId);
 
       return {
         items: filesForMovie,
@@ -26,11 +24,6 @@ function createMapStateToProps() {
   );
 }
 
-function createMapDispatchToProps(dispatch, props) {
-  return {
-  };
-}
-
 class ExtraFileTableContentConnector extends Component {
 
   //
@@ -53,4 +46,4 @@ ExtraFileTableContentConnector.propTypes = {
   movieId: PropTypes.number.isRequired
 };
 
-export default connect(createMapStateToProps, createMapDispatchToProps)(ExtraFileTableContentConnector);
+export default connect(createMapStateToProps, null)(ExtraFileTableContentConnector);

frontend/src/Settings/CustomFormats/CustomFormatSettingsPage.tsx

@@ -6,11 +6,12 @@ import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
 import ParseToolbarButton from 'Parse/ParseToolbarButton';
 import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
+import translate from 'Utilities/String/translate';
 import CustomFormatsConnector from './CustomFormats/CustomFormatsConnector';
 
 function CustomFormatSettingsPage() {
   return (
-    <PageContent title="Custom Format Settings">
+    <PageContent title={translate('CustomFormatsSettings')}>
       <SettingsToolbarConnector
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore

frontend/src/Settings/CustomFormats/CustomFormats/CustomFormats.js

@@ -61,7 +61,7 @@ class CustomFormats extends Component {
     return (
       <FieldSet legend={translate('CustomFormats')}>
         <PageSectionContent
-          errorMessage={translate('UnableToLoadCustomFormats')}
+          errorMessage={translate('CustomFormatsLoadError')}
           {...otherProps}c={true}
         >
           <div className={styles.customFormats}>

frontend/src/Settings/CustomFormats/CustomFormats/EditCustomFormatModalContent.js

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Alert from 'Components/Alert';
 import Card from 'Components/Card';
 import FieldSet from 'Components/FieldSet';
 import Form from 'Components/Form/Form';
@@ -112,9 +113,9 @@ class EditCustomFormatModalContent extends Component {
 
             {
               !isFetching && !!error &&
-                <div>
-                  {translate('UnableToAddANewCustomFormatPleaseTryAgain')}
-                </div>
+                <Alert kind={kinds.DANGER}>
+                  {translate('AddCustomFormatError')}
+                </Alert>
             }
 
             {

frontend/src/Settings/CustomFormats/CustomFormats/ExportCustomFormatModalContent.js

@@ -43,7 +43,7 @@ class ExportCustomFormatModalContent extends Component {
             {
               !isFetching && !!error &&
                 <Alert kind={kinds.DANGER}>
-                  {translate('UnableToLoadCustomFormats')}
+                  {translate('CustomFormatsLoadError')}
                 </Alert>
             }
 

frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContent.js

@@ -97,7 +97,7 @@ class ImportCustomFormatModalContent extends Component {
             {
               !isFetching && !!error &&
                 <Alert kind={kinds.DANGER}>
-                  {translate('UnableToLoadCustomFormats')}
+                  {translate('CustomFormatsLoadError')}
                 </Alert>
             }
 

frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContentConnector.js

@@ -89,7 +89,9 @@ class ImportCustomFormatModalContentConnector extends Component {
     const selectedImplementation = _.find(this.props.specificationSchema, { implementation: spec.implementation });
 
     if (!selectedImplementation) {
-      throw new Error(translate('CustomFormatUnknownCondition', [spec.implementation]));
+      throw new Error(translate('CustomFormatUnknownCondition', {
+        implementation: spec.implementation
+      }));
     }
 
     this.props.selectCustomFormatSpecificationSchema({ implementation: spec.implementation });
@@ -109,7 +111,10 @@ class ImportCustomFormatModalContentConnector extends Component {
     for (const [key, value] of Object.entries(fields)) {
       const field = _.find(schema.fields, { name: key });
       if (!field) {
-        throw new Error(translate('CustomFormatUnknownConditionOption', [key, schema.implementationName]));
+        throw new Error(translate('CustomFormatUnknownConditionOption', {
+          key,
+          implementation: schema.implementationName
+        }));
       }
 
       this.props.setCustomFormatSpecificationFieldValue({ name: key, value });

frontend/src/Settings/CustomFormats/CustomFormats/Specifications/AddSpecificationModalContent.js

@@ -43,7 +43,7 @@ class AddSpecificationModalContent extends Component {
           {
             !isSchemaFetching && !!schemaError &&
               <div>
-                {translate('UnableToAddANewConditionPleaseTryAgain')}
+                {translate('AddConditionError')}
               </div>
           }
 
@@ -53,10 +53,10 @@ class AddSpecificationModalContent extends Component {
 
                 <Alert kind={kinds.INFO}>
                   <div>
-                    {translate('RadarrSupportsCustomConditionsAgainstTheReleasePropertiesBelow')}
+                    {translate('SupportedCustomConditions')}
                   </div>
                   <div>
-                    {translate('VisitGithubCustomFormatsAphrodite')}
+                    {translate('VisitTheWikiForMoreDetails')}
                     <Link to="https://wiki.servarr.com/radarr/settings#custom-formats-2">{translate('Wiki')}</Link>
                   </div>
                 </Alert>

frontend/src/Settings/CustomFormats/CustomFormats/Specifications/EditSpecificationModalContent.js

@@ -7,8 +7,8 @@ import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup';
 import Button from 'Components/Link/Button';
-import Link from 'Components/Link/Link';
 import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton';
+import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
 import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
@@ -52,12 +52,13 @@ function EditSpecificationModalContent(props) {
             fields && fields.some((x) => x.label === translate('CustomFormatsSpecificationRegularExpression')) &&
               <Alert kind={kinds.INFO}>
                 <div>
-                  <div dangerouslySetInnerHTML={{ __html: translate('ThisConditionMatchesUsingRegularExpressions', ['<code>\\^$.|?*+()[{</code>', '<code>\\</code>']) }} />
-                  {translate('MoreDetails')} <Link to="https://www.regular-expressions.info/tutorial.html">{translate('LinkHere')}</Link>
+                  <InlineMarkdown data={translate('ConditionUsingRegularExpressions')} />
                 </div>
                 <div>
-                  {translate('RegularExpressionsCanBeTested')}
-                  <Link to="http://regexstorm.net/tester">{translate('LinkHere')}</Link>
+                  <InlineMarkdown data={translate('RegularExpressionsTutorialLink')} />
+                </div>
+                <div>
+                  <InlineMarkdown data={translate('RegularExpressionsCanBeTested')} />
                 </div>
               </Alert>
           }
@@ -99,7 +100,7 @@ function EditSpecificationModalContent(props) {
               type={inputTypes.CHECK}
               name="negate"
               {...negate}
-              helpText={translate('NegateHelpText', [implementationName])}
+              helpText={translate('NegateHelpText', { implementationName })}
               onChange={onInputChange}
             />
           </FormGroup>
@@ -113,7 +114,7 @@ function EditSpecificationModalContent(props) {
               type={inputTypes.CHECK}
               name="required"
               {...required}
-              helpText={translate('RequiredHelpText', [implementationName, implementationName])}
+              helpText={translate('RequiredHelpText', { implementationName })}
               onChange={onInputChange}
             />
           </FormGroup>

frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContent.js

@@ -43,9 +43,9 @@ class AddDownloadClientModalContent extends Component {
 
           {
             !isSchemaFetching && !!schemaError &&
-              <div>
-                {translate('UnableToAddANewDownloadClientPleaseTryAgain')}
-              </div>
+              <Alert kind={kinds.DANGER}>
+                {translate('AddDownloadClientError')}
+              </Alert>
           }
 
           {
@@ -54,10 +54,10 @@ class AddDownloadClientModalContent extends Component {
 
                 <Alert kind={kinds.INFO}>
                   <div>
-                    {translate('RadarrSupportsAnyDownloadClient')}
+                    {translate('SupportedDownloadClients')}
                   </div>
                   <div>
-                    {translate('ForMoreInformationOnTheIndividualDownloadClients')}
+                    {translate('SupportedDownloadClientsMoreInfo')}
                   </div>
                 </Alert>
 

frontend/src/Settings/DownloadClients/DownloadClients/EditDownloadClientModalContent.js

@@ -69,9 +69,9 @@ class EditDownloadClientModalContent extends Component {
 
           {
             !isFetching && !!error &&
-              <div>
-                {translate('UnableToAddANewDownloadClientPleaseTryAgain')}
-              </div>
+              <Alert kind={kinds.DANGER}>
+                {translate('AddDownloadClientError')}
+              </Alert>
           }
 
           {
@@ -147,7 +147,7 @@ class EditDownloadClientModalContent extends Component {
                   <FormInputGroup
                     type={inputTypes.TAG}
                     name="tags"
-                    helpText={translate('DownloadClientTagHelpText')}
+                    helpText={translate('DownloadClientMovieTagHelpText')}
                     {...tags}
                     onChange={onInputChange}
                   />
@@ -184,7 +184,6 @@ class EditDownloadClientModalContent extends Component {
                       </FormGroup>
                   }
                 </FieldSet>
-
               </Form>
           }
         </ModalBody>

frontend/src/Settings/DownloadClients/Options/DownloadClientOptions.js

@@ -30,7 +30,7 @@ function DownloadClientOptions(props) {
       {
         !isFetching && error &&
           <Alert kind={kinds.DANGER}>
-            {translate('UnableToLoadDownloadClientOptions')}
+            {translate('DownloadClientOptionsLoadError')}
           </Alert>
       }
 
@@ -38,6 +38,7 @@ function DownloadClientOptions(props) {
         hasSettings && !isFetching && !error && advancedSettings &&
           <div>
             <FieldSet legend={translate('CompletedDownloadHandling')}>
+
               <Form>
                 <FormGroup
                   advancedSettings={advancedSettings}

frontend/src/Settings/DownloadClients/RemotePathMappings/EditRemotePathMappingModalContent.js

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import Alert from 'Components/Alert';
 import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
@@ -52,9 +53,9 @@ function EditRemotePathMappingModalContent(props) {
 
         {
           !isFetching && !!error &&
-            <div>
-              {translate('UnableToAddANewRemotePathMappingPleaseTryAgain')}
-            </div>
+            <Alert kind={kinds.DANGER}>
+              {translate('AddRemotePathMappingError')}
+            </Alert>
         }
 
         {
@@ -66,7 +67,7 @@ function EditRemotePathMappingModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.SELECT}
                   name="host"
-                  helpText={translate('SettingsRemotePathMappingHostHelpText')}
+                  helpText={translate('RemotePathMappingHostHelpText')}
                   {...host}
                   values={downloadClientHosts}
                   onChange={onInputChange}
@@ -74,24 +75,24 @@ function EditRemotePathMappingModalContent(props) {
               </FormGroup>
 
               <FormGroup>
-                <FormLabel>{translate('SettingsRemotePathMappingRemotePath')}</FormLabel>
+                <FormLabel>{translate('RemotePath')}</FormLabel>
 
                 <FormInputGroup
                   type={inputTypes.TEXT}
                   name="remotePath"
-                  helpText={translate('SettingsRemotePathMappingRemotePathHelpText')}
+                  helpText={translate('RemotePathMappingRemotePathHelpText')}
                   {...remotePath}
                   onChange={onInputChange}
                 />
               </FormGroup>
 
               <FormGroup>
-                <FormLabel>{translate('SettingsRemotePathMappingLocalPath')}</FormLabel>
+                <FormLabel>{translate('LocalPath')}</FormLabel>
 
                 <FormInputGroup
                   type={inputTypes.PATH}
                   name="localPath"
-                  helpText={translate('SettingsRemotePathMappingLocalPathHelpText')}
+                  helpText={translate('RemotePathMappingLocalPathHelpText')}
                   {...localPath}
                   onChange={onInputChange}
                 />

frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappings.js

@@ -49,12 +49,12 @@ class RemotePathMappings extends Component {
     return (
       <FieldSet legend={translate('RemotePathMappings')}>
         <PageSectionContent
-          errorMessage={translate('UnableToLoadRemotePathMappings')}
+          errorMessage={translate('RemotePathMappingsLoadError')}
           {...otherProps}
         >
 
           <Alert kind={kinds.INFO}>
-            <InlineMarkdown data={translate('RemotePathMappingsInfo', { app: 'Radarr', wikiLink: 'https://wiki.servarr.com/radarr/settings#remote-path-mappings' })} />
+            <InlineMarkdown data={translate('RemotePathMappingsInfo', { wikiLink: 'https://wiki.servarr.com/radarr/settings#remote-path-mappings' })} />
           </Alert>
 
           <div className={styles.remotePathMappingsHeader}>

frontend/src/Settings/General/GeneralSettings.js

@@ -22,6 +22,7 @@ const requiresRestartKeys = [
   'bindAddress',
   'port',
   'urlBase',
+  'instanceName',
   'enableSsl',
   'sslPort',
   'sslCertPath',
@@ -125,7 +126,7 @@ class GeneralSettings extends Component {
           {
             !isFetching && error &&
               <Alert kind={kinds.DANGER}>
-                {translate('UnableToLoadGeneralSettings')}
+                {translate('GeneralSettingsLoadError')}
               </Alert>
           }
 
@@ -186,10 +187,8 @@ class GeneralSettings extends Component {
           isOpen={this.state.isRestartRequiredModalOpen}
           kind={kinds.DANGER}
           title={translate('RestartRadarr')}
-          message={
-            `Radarr requires a restart to apply changes, do you want to restart now? ${isWindowsService ? 'Depending which user is running the Radarr service you may need to restart Radarr as admin once before the service will start automatically.' : ''}`
-          }
-          cancelLabel={translate('IllRestartLater')}
+          message={`${translate('RestartRequiredToApplyChanges')} ${isWindowsService ? translate('RestartRequiredWindowsService') : ''}`}
+          cancelLabel={translate('RestartLater')}
           confirmLabel={translate('RestartNow')}
           onConfirm={this.onConfirmRestart}
           onCancel={this.onCloseRestartRequiredModalOpen}

frontend/src/Settings/General/HostSettings.js

@@ -63,7 +63,7 @@ function HostSettings(props) {
       </FormGroup>
 
       <FormGroup>
-        <FormLabel>{translate('URLBase')}</FormLabel>
+        <FormLabel>{translate('UrlBase')}</FormLabel>
 
         <FormInputGroup
           type={inputTypes.TEXT}
@@ -111,7 +111,7 @@ function HostSettings(props) {
         isAdvanced={true}
         size={sizes.MEDIUM}
       >
-        <FormLabel>{translate('EnableSSL')}</FormLabel>
+        <FormLabel>{translate('EnableSsl')}</FormLabel>
 
         <FormInputGroup
           type={inputTypes.CHECK}
@@ -128,7 +128,7 @@ function HostSettings(props) {
             advancedSettings={advancedSettings}
             isAdvanced={true}
           >
-            <FormLabel>{translate('SSLPort')}</FormLabel>
+            <FormLabel>{translate('SslPort')}</FormLabel>
 
             <FormInputGroup
               type={inputTypes.NUMBER}
@@ -149,12 +149,12 @@ function HostSettings(props) {
             advancedSettings={advancedSettings}
             isAdvanced={true}
           >
-            <FormLabel>{translate('SSLCertPath')}</FormLabel>
+            <FormLabel>{translate('SslCertPath')}</FormLabel>
 
             <FormInputGroup
               type={inputTypes.TEXT}
               name="sslCertPath"
-              helpText={translate('SSLCertPathHelpText')}
+              helpText={translate('SslCertPathHelpText')}
               helpTextWarning={translate('RestartRequiredHelpTextWarning')}
               onChange={onInputChange}
               {...sslCertPath}
@@ -169,12 +169,12 @@ function HostSettings(props) {
             advancedSettings={advancedSettings}
             isAdvanced={true}
           >
-            <FormLabel>{translate('SSLCertPassword')}</FormLabel>
+            <FormLabel>{translate('SslCertPassword')}</FormLabel>
 
             <FormInputGroup
               type={inputTypes.PASSWORD}
               name="sslCertPassword"
-              helpText={translate('SSLCertPasswordHelpText')}
+              helpText={translate('SslCertPasswordHelpText')}
               helpTextWarning={translate('RestartRequiredHelpTextWarning')}
               onChange={onInputChange}
               {...sslCertPassword}
@@ -184,18 +184,19 @@ function HostSettings(props) {
       }
 
       {
-        isWindows && mode !== 'service' &&
+        isWindows && mode !== 'service' ?
           <FormGroup size={sizes.MEDIUM}>
             <FormLabel>{translate('OpenBrowserOnStart')}</FormLabel>
 
             <FormInputGroup
               type={inputTypes.CHECK}
               name="launchBrowser"
-              helpText={translate('LaunchBrowserHelpText')}
+              helpText={translate('OpenBrowserOnStartHelpText')}
               onChange={onInputChange}
               {...launchBrowser}
             />
-          </FormGroup>
+          </FormGroup> :
+          null
       }
 
     </FieldSet>

frontend/src/Settings/General/ProxySettings.js

@@ -25,9 +25,18 @@ function ProxySettings(props) {
   } = settings;
 
   const proxyTypeOptions = [
-    { key: 'http', value: translate('HttpHttps') },
-    { key: 'socks4', value: translate('Socks4') },
-    { key: 'socks5', value: translate('Socks5') }
+    {
+      key: 'http',
+      value: translate('HttpHttps')
+    },
+    {
+      key: 'socks4',
+      value: translate('Socks4')
+    },
+    {
+      key: 'socks5',
+      value: translate('Socks5')
+    }
   ];
 
   return (

frontend/src/Settings/General/UpdateSettings.js

@@ -70,7 +70,8 @@ function UpdateSettings(props) {
       </FormGroup>
 
       {
-        !isWindows &&
+        isWindows ?
+          null :
           <div>
             <FormGroup
               advancedSettings={advancedSettings}

frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js

@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
+import Alert from 'Components/Alert';
 import Form from 'Components/Form/Form';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputGroup from 'Components/Form/FormInputGroup';
@@ -39,7 +40,7 @@ function EditImportListExclusionModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {id ? translate('EditListExclusion') : translate('AddListExclusion')}
+        {id ? translate('EditImportListExclusion') : translate('AddImportListExclusion')}
       </ModalHeader>
 
       <ModalBody className={styles.body}>
@@ -50,9 +51,9 @@ function EditImportListExclusionModalContent(props) {
 
         {
           !isFetching && !!error &&
-            <div>
-              {translate('UnableToAddANewListExclusionPleaseTryAgain')}
-            </div>
+            <Alert kind={kinds.DANGER}>
+              {translate('AddImportListExclusionError')}
+            </Alert>
         }
 
         {

frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.js

@@ -45,14 +45,14 @@ class ImportListExclusions extends Component {
     } = this.props;
 
     return (
-      <FieldSet legend={translate('ListExclusions')}>
+      <FieldSet legend={translate('ImportListExclusions')}>
         <PageSectionContent
-          errorMessage={translate('UnableToLoadListExclusions')}
+          errorMessage={translate('ImportListExclusionsLoadError')}
           {...otherProps}
         >
           <div className={styles.importListExclusionsHeader}>
             <div className={styles.tmdbId}>
-              TMDb Id
+              {translate('TMDBId')}
             </div>
             <div className={styles.title}>
               {translate('Title')}

frontend/src/Settings/ImportLists/ImportListSettings.js

@@ -70,7 +70,7 @@ class ImportListSettings extends Component {
     } = this.state;
 
     return (
-      <PageContent title={translate('ListSettings')}>
+      <PageContent title={translate('ImportListSettings')}>
         <SettingsToolbarConnector
           isSaving={isSaving}
           hasPendingChanges={hasPendingChanges}

frontend/src/Settings/ImportLists/ImportLists/AddImportListModalContent.js

@@ -37,42 +37,46 @@ class AddImportListModalContent extends Component {
 
         <ModalBody>
           {
-            isSchemaFetching &&
-              <LoadingIndicator />
+            isSchemaFetching ?
+              <LoadingIndicator /> :
+              null
           }
 
           {
-            !isSchemaFetching && !!schemaError &&
-              <div>
-                {translate('UnableToAddANewListPleaseTryAgain')}
-              </div>
+            !isSchemaFetching && !!schemaError ?
+              <Alert kind={kinds.DANGER}>
+                {translate('AddListError')}
+              </Alert> :
+              null
           }
 
           {
-            isSchemaPopulated && !schemaError &&
+            isSchemaPopulated && !schemaError ?
               <div>
 
                 <Alert kind={kinds.INFO}>
                   <div>
-                    {translate('RadarrSupportsAnyRSSMovieListsAsWellAsTheOneStatedBelow')}
+                    {translate('SupportedListsMovie')}
                   </div>
                   <div>
-                    {translate('ForMoreInformationOnTheIndividualImportListsClinkOnTheInfoButtons')}
+                    {translate('SupportedListsMoreInfo')}
                   </div>
                 </Alert>
-
                 {
                   Object.keys(listGroups).map((key) => {
                     return (
-                      <FieldSet legend={`${titleCase(key)} List`} key={key}>
+                      <FieldSet key={key} legend={translate('TypeOfList', {
+                        typeOfList: titleCase(key)
+                      })}
+                      >
                         <div className={styles.importLists}>
                           {
-                            listGroups[key].map((importList) => {
+                            listGroups[key].map((list) => {
                               return (
                                 <AddImportListItem
-                                  key={importList.implementation}
-                                  implementation={importList.implementation}
-                                  {...importList}
+                                  key={list.implementation}
+                                  implementation={list.implementation}
+                                  {...list}
                                   onImportListSelect={onImportListSelect}
                                 />
                               );
@@ -83,7 +87,8 @@ class AddImportListModalContent extends Component {
                     );
                   })
                 }
-              </div>
+              </div> :
+              null
           }
         </ModalBody>
         <ModalFooter>

frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js

@@ -67,10 +67,11 @@ function EditImportListModalContent(props) {
         }
 
         {
-          !isFetching && (!!error || !!rootFolderError) &&
-            <div>
-              {translate('UnableToAddANewListPleaseTryAgain')}
-            </div>
+          !isFetching && (!!error || !!rootFolderError) ?
+            <Alert kind={kinds.DANGER}>
+              {translate('AddListError')}
+            </Alert> :
+            null
         }
 
         {
@@ -92,7 +93,9 @@ function EditImportListModalContent(props) {
                 kind={kinds.INFO}
                 className={styles.message}
               >
-                {translate('ListWillRefreshEveryInterp', [formatShortTimeSpan(minRefreshInterval.value)])}
+                {translate('ListWillRefreshEveryInterval', {
+                  refreshInterval: formatShortTimeSpan(minRefreshInterval.value)
+                })}
               </Alert>
 
               <FormGroup>
@@ -112,7 +115,7 @@ function EditImportListModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.CHECK}
                   name="enabled"
-                  helpText={translate('EnabledHelpText')}
+                  helpText={translate('ListEnabledHelpText')}
                   {...enabled}
                   onChange={onInputChange}
                 />
@@ -124,7 +127,7 @@ function EditImportListModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.CHECK}
                   name="enableAuto"
-                  helpText={translate('EnableAutoHelpText')}
+                  helpText={translate('EnableAutomaticAddMovieHelpText')}
                   {...enableAuto}
                   onChange={onInputChange}
                 />
@@ -136,7 +139,7 @@ function EditImportListModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.MOVIE_MONITORED_SELECT}
                   name="monitor"
-                  helpText={translate('ShouldMonitorHelpText')}
+                  helpText={translate('ListMonitorMovieHelpText')}
                   {...monitor}
                   onChange={onInputChange}
                 />
@@ -148,7 +151,7 @@ function EditImportListModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.CHECK}
                   name="searchOnAdd"
-                  helpText={translate('SearchOnAddHelpText')}
+                  helpText={translate('ListSearchOnAddMovieHelpText')}
                   {...searchOnAdd}
                   onChange={onInputChange}
                 />
@@ -170,6 +173,7 @@ function EditImportListModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.QUALITY_PROFILE_SELECT}
                   name="qualityProfileId"
+                  helpText={translate('ListQualityProfileHelpText')}
                   {...qualityProfileId}
                   onChange={onInputChange}
                 />
@@ -181,6 +185,7 @@ function EditImportListModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.ROOT_FOLDER_SELECT}
                   name="rootFolderPath"
+                  helpText={translate('ListRootFolderHelpText')}
                   {...rootFolderPath}
                   includeMissingValue={true}
                   onChange={onInputChange}

frontend/src/Settings/ImportLists/ImportLists/ImportList.js

@@ -89,7 +89,7 @@ class ImportList extends Component {
           {
             enableAuto &&
               <Label kind={kinds.SUCCESS}>
-                {translate('Auto')}
+                {translate('AutomaticAdd')}
               </Label>
           }
         </div>

frontend/src/Settings/ImportLists/ImportLists/ImportLists.js

@@ -59,9 +59,9 @@ class ImportLists extends Component {
     } = this.state;
 
     return (
-      <FieldSet legend={translate('Lists')}>
+      <FieldSet legend={translate('ImportLists')} >
         <PageSectionContent
-          errorMessage={translate('UnableToLoadLists')}
+          errorMessage={translate('ImportListsLoadError')}
           {...otherProps}
         >
           <div className={styles.importLists}>

frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.js

@@ -43,9 +43,9 @@ class AddIndexerModalContent extends Component {
 
           {
             !isSchemaFetching && !!schemaError &&
-              <div>
-                {translate('UnableToAddANewIndexerPleaseTryAgain')}
-              </div>
+              <Alert kind={kinds.DANGER}>
+                {translate('AddIndexerError')}
+              </Alert>
           }
 
           {
@@ -54,10 +54,10 @@ class AddIndexerModalContent extends Component {
 
                 <Alert kind={kinds.INFO}>
                   <div>
-                    {translate('RadarrSupportsAnyIndexer')}
+                    {translate('SupportedIndexers')}
                   </div>
                   <div>
-                    {translate('ForMoreInformationOnTheIndividualIndexers')}
+                    {translate('SupportedIndexersMoreInfo')}
                   </div>
                 </Alert>
 

frontend/src/Settings/Indexers/Indexers/EditIndexerModalContent.js

@@ -67,7 +67,7 @@ function EditIndexerModalContent(props) {
         {
           !isFetching && !!error &&
             <div>
-              {translate('UnableToAddANewIndexerPleaseTryAgain')}
+              {translate('AddIndexerError')}
             </div>
         }
 
@@ -86,13 +86,13 @@ function EditIndexerModalContent(props) {
               </FormGroup>
 
               <FormGroup>
-                <FormLabel>{translate('EnableRSS')}</FormLabel>
+                <FormLabel>{translate('EnableRss')}</FormLabel>
 
                 <FormInputGroup
                   type={inputTypes.CHECK}
                   name="enableRss"
-                  helpText={supportsRss.value ? translate('RSSHelpText') : undefined}
-                  helpTextWarning={supportsRss.value ? undefined : translate('RSSIsNotSupportedWithThisIndexer')}
+                  helpText={supportsRss.value ? translate('EnableRssHelpText') : undefined}
+                  helpTextWarning={supportsRss.value ? undefined : translate('RssIsNotSupportedWithThisIndexer')}
                   isDisabled={!supportsRss.value}
                   {...enableRss}
                   onChange={onInputChange}
@@ -106,7 +106,7 @@ function EditIndexerModalContent(props) {
                   type={inputTypes.CHECK}
                   name="enableAutomaticSearch"
                   helpText={supportsSearch.value ? translate('EnableAutomaticSearchHelpText') : undefined}
-                  helpTextWarning={supportsSearch.value ? undefined : translate('EnableAutomaticSearchHelpTextWarning')}
+                  helpTextWarning={supportsSearch.value ? undefined : translate('SearchIsNotSupportedWithThisIndexer')}
                   isDisabled={!supportsSearch.value}
                   {...enableAutomaticSearch}
                   onChange={onInputChange}
@@ -120,7 +120,7 @@ function EditIndexerModalContent(props) {
                   type={inputTypes.CHECK}
                   name="enableInteractiveSearch"
                   helpText={supportsSearch.value ? translate('EnableInteractiveSearchHelpText') : undefined}
-                  helpTextWarning={supportsSearch.value ? undefined : translate('EnableInteractiveSearchHelpTextWarning')}
+                  helpTextWarning={supportsSearch.value ? undefined : translate('SearchIsNotSupportedWithThisIndexer')}
                   isDisabled={!supportsSearch.value}
                   {...enableInteractiveSearch}
                   onChange={onInputChange}
@@ -182,7 +182,7 @@ function EditIndexerModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.TAG}
                   name="tags"
-                  helpText={translate('IndexerTagHelpText')}
+                  helpText={translate('IndexerTagMovieHelpText')}
                   {...tags}
                   onChange={onInputChange}
                 />

frontend/src/Settings/Indexers/Indexers/Indexer.js

@@ -101,7 +101,7 @@ class Indexer extends Component {
           {
             supportsRss && enableRss &&
               <Label kind={kinds.SUCCESS}>
-                {translate('RSS')}
+                {translate('Rss')}
               </Label>
           }
 

frontend/src/Settings/Indexers/Indexers/Indexers.js

@@ -70,7 +70,7 @@ class Indexers extends Component {
     return (
       <FieldSet legend={translate('Indexers')}>
         <PageSectionContent
-          errorMessage={translate('UnableToLoadIndexers')}
+          errorMessage={translate('IndexersLoadError')}
           {...otherProps}
         >
           <div className={styles.indexers}>

frontend/src/Settings/Indexers/Indexers/Manage/Edit/ManageIndexersEditModalContent.tsx

@@ -127,7 +127,7 @@ function ManageIndexersEditModalContent(
 
       <ModalBody>
         <FormGroup>
-          <FormLabel>{translate('EnableRSS')}</FormLabel>
+          <FormLabel>{translate('EnableRss')}</FormLabel>
 
           <FormInputGroup
             type={inputTypes.SELECT}

frontend/src/Settings/Indexers/Indexers/Manage/ManageIndexersModalContent.tsx

@@ -50,7 +50,7 @@ const COLUMNS = [
   },
   {
     name: 'enableRss',
-    label: () => translate('EnableRSS'),
+    label: () => translate('EnableRss'),
     isSortable: true,
     isVisible: true,
   },

frontend/src/Settings/Indexers/Options/IndexerOptions.js

@@ -31,7 +31,7 @@ function IndexerOptions(props) {
       {
         !isFetching && error &&
           <Alert kind={kinds.DANGER}>
-            {translate('UnableToLoadIndexerOptions')}
+            {translate('IndexerOptionsLoadError')}
           </Alert>
       }
 
@@ -110,7 +110,7 @@ function IndexerOptions(props) {
               advancedSettings={advancedSettings}
               isAdvanced={true}
             >
-              <FormLabel>{translate('RSSSyncInterval')}</FormLabel>
+              <FormLabel>{translate('RssSyncInterval')}</FormLabel>
 
               <FormInputGroup
                 type={inputTypes.NUMBER}
@@ -118,8 +118,8 @@ function IndexerOptions(props) {
                 min={0}
                 max={120}
                 unit="minutes"
-                helpText={translate('RssSyncHelpText')}
-                helpTextWarning={translate('RSSSyncIntervalHelpTextWarning')}
+                helpText={translate('RssSyncIntervalHelpText')}
+                helpTextWarning={translate('RssSyncIntervalHelpTextWarning')}
                 helpLink="https://wiki.servarr.com/radarr/faq#how-does-radarr-work"
                 onChange={onInputChange}
                 {...settings.rssSyncInterval}

frontend/src/Settings/MediaManagement/MediaManagement.js

@@ -119,7 +119,7 @@ class MediaManagement extends Component {
             !isFetching && error ?
               <FieldSet legend={translate('NamingSettings')}>
                 <Alert kind={kinds.DANGER}>
-                  {translate('UnableToLoadMediaManagementSettings')}
+                  {translate('MediaManagementSettingsLoadError')}
                 </Alert>
               </FieldSet> : null
           }
@@ -204,7 +204,7 @@ class MediaManagement extends Component {
                           type={inputTypes.NUMBER}
                           unit='MB'
                           name="minimumFreeSpaceWhenImporting"
-                          helpText={translate('MinimumFreeSpaceWhenImportingHelpText')}
+                          helpText={translate('MinimumFreeSpaceHelpText')}
                           onChange={onInputChange}
                           {...settings.minimumFreeSpaceWhenImporting}
                         />
@@ -220,7 +220,7 @@ class MediaManagement extends Component {
                         <FormInputGroup
                           type={inputTypes.CHECK}
                           name="copyUsingHardlinks"
-                          helpText={translate('CopyUsingHardlinksHelpText')}
+                          helpText={translate('CopyUsingHardlinksMovieHelpText')}
                           helpTextWarning={translate('CopyUsingHardlinksHelpTextWarning')}
                           onChange={onInputChange}
                           {...settings.copyUsingHardlinks}
@@ -237,7 +237,7 @@ class MediaManagement extends Component {
                         <FormInputGroup
                           type={inputTypes.CHECK}
                           name="useScriptImport"
-                          helpText={translate('UseScriptImportHelpText')}
+                          helpText={translate('ImportUsingScriptHelpText')}
                           onChange={onInputChange}
                           {...settings.useScriptImport}
                         />
@@ -255,7 +255,7 @@ class MediaManagement extends Component {
                               type={inputTypes.PATH}
                               includeFiles={true}
                               name="scriptImportPath"
-                              helpText={translate('ScriptImportPathHelpText')}
+                              helpText={translate('ImportScriptPathHelpText')}
                               onChange={onInputChange}
                               {...settings.scriptImportPath}
                             />
@@ -268,7 +268,7 @@ class MediaManagement extends Component {
                         <FormInputGroup
                           type={inputTypes.CHECK}
                           name="importExtraFiles"
-                          helpText={translate('ImportExtraFilesHelpText')}
+                          helpText={translate('ImportExtraFilesMovieHelpText')}
                           onChange={onInputChange}
                           {...settings.importExtraFiles}
                         />
@@ -286,8 +286,8 @@ class MediaManagement extends Component {
                               type={inputTypes.TEXT}
                               name="extraFileExtensions"
                               helpTexts={[
-                                translate('ExtraFileExtensionsHelpTexts1'),
-                                translate('ExtraFileExtensionsHelpTexts2')
+                                translate('ExtraFileExtensionsHelpText'),
+                                translate('ExtraFileExtensionsHelpTextsExamples')
                               ]}
                               onChange={onInputChange}
                               {...settings.extraFileExtensions}
@@ -323,8 +323,8 @@ class MediaManagement extends Component {
                       type={inputTypes.SELECT}
                       name="downloadPropersAndRepacks"
                       helpTexts={[
-                        translate('DownloadPropersAndRepacksHelpText1'),
-                        translate('DownloadPropersAndRepacksHelpText2')
+                        translate('DownloadPropersAndRepacksHelpText'),
+                        translate('DownloadPropersAndRepacksHelpTextCustomFormat')
                       ]}
                       helpTextWarning={
                         settings.downloadPropersAndRepacks.value === 'doNotPrefer' ?
@@ -347,7 +347,7 @@ class MediaManagement extends Component {
                     <FormInputGroup
                       type={inputTypes.CHECK}
                       name="enableMediaInfo"
-                      helpText={translate('EnableMediaInfoHelpText')}
+                      helpText={translate('AnalyseVideoFilesHelpText')}
                       onChange={onInputChange}
                       {...settings.enableMediaInfo}
                     />
@@ -362,7 +362,7 @@ class MediaManagement extends Component {
                     <FormInputGroup
                       type={inputTypes.SELECT}
                       name="rescanAfterRefresh"
-                      helpText={translate('RescanAfterRefreshHelpText')}
+                      helpText={translate('RescanAfterRefreshMovieHelpText')}
                       helpTextWarning={translate('RescanAfterRefreshHelpTextWarning')}
                       values={rescanAfterRefreshOptions}
                       onChange={onInputChange}
@@ -379,7 +379,7 @@ class MediaManagement extends Component {
                     <FormInputGroup
                       type={inputTypes.SELECT}
                       name="fileDate"
-                      helpText={translate('FileDateHelpText')}
+                      helpText={translate('ChangeFileDateHelpText')}
                       values={fileDateOptions}
                       onChange={onInputChange}
                       {...settings.fileDate}
@@ -395,7 +395,7 @@ class MediaManagement extends Component {
                     <FormInputGroup
                       type={inputTypes.PATH}
                       name="recycleBin"
-                      helpText={translate('RecycleBinHelpText')}
+                      helpText={translate('RecyclingBinHelpText')}
                       onChange={onInputChange}
                       {...settings.recycleBin}
                     />
@@ -410,8 +410,8 @@ class MediaManagement extends Component {
                     <FormInputGroup
                       type={inputTypes.NUMBER}
                       name="recycleBinCleanupDays"
-                      helpText={translate('RecycleBinCleanupDaysHelpText')}
-                      helpTextWarning={translate('RecycleBinCleanupDaysHelpTextWarning')}
+                      helpText={translate('RecyclingBinCleanupHelpText')}
+                      helpTextWarning={translate('RecyclingBinCleanupHelpTextWarning')}
                       min={0}
                       onChange={onInputChange}
                       {...settings.recycleBinCleanupDays}
@@ -461,13 +461,13 @@ class MediaManagement extends Component {
                         advancedSettings={advancedSettings}
                         isAdvanced={true}
                       >
-                        <FormLabel>{translate('ChmodGroup')}</FormLabel>
+                        <FormLabel>{translate('ChownGroup')}</FormLabel>
 
                         <FormInputGroup
                           type={inputTypes.TEXT}
                           name="chownGroup"
-                          helpText={translate('ChmodGroupHelpText')}
-                          helpTextWarning={translate('ChmodGroupHelpTextWarning')}
+                          helpText={translate('ChownGroupHelpText')}
+                          helpTextWarning={translate('ChownGroupHelpTextWarning')}
                           values={fileDateOptions}
                           onChange={onInputChange}
                           {...settings.chownGroup}

frontend/src/Settings/MediaManagement/Naming/Naming.js

@@ -110,7 +110,7 @@ class Naming extends Component {
 
     if (examplesPopulated) {
       if (examples.movieExample) {
-        standardMovieFormatHelpTexts.push(`Movie: ${examples.movieExample}`);
+        standardMovieFormatHelpTexts.push(`${translate('Movie')}: ${examples.movieExample}`);
       } else {
         standardMovieFormatErrors.push({ get message() {
           return translate('MovieInvalidFormat');
@@ -118,7 +118,7 @@ class Naming extends Component {
       }
 
       if (examples.movieFolderExample) {
-        movieFolderFormatHelpTexts.push(`Example: ${examples.movieFolderExample}`);
+        movieFolderFormatHelpTexts.push(`${translate('Example')}: ${examples.movieFolderExample}`);
       } else {
         movieFolderFormatErrors.push({ get message() {
           return translate('InvalidFormat');
@@ -136,7 +136,7 @@ class Naming extends Component {
         {
           !isFetching && error &&
             <Alert kind={kinds.DANGER}>
-              {translate('UnableToLoadNamingSettings')}
+              {translate('NamingSettingsLoadError')}
             </Alert>
         }
 
@@ -214,7 +214,7 @@ class Naming extends Component {
                   buttons={<FormInputButton onPress={this.onMovieFolderNamingModalOpenClick}>?</FormInputButton>}
                   onChange={onInputChange}
                   {...settings.movieFolderFormat}
-                  helpTexts={['Used when adding a new movie or moving movies via the editor', ...movieFolderFormatHelpTexts]}
+                  helpTexts={[translate('MovieFolderFormatHelpText'), ...movieFolderFormatHelpTexts]}
                   errors={[...movieFolderFormatErrors, ...settings.movieFolderFormat.errors]}
                 />
               </FormGroup>

frontend/src/Settings/MediaManagement/Naming/NamingModal.js

@@ -5,6 +5,7 @@ import SelectInput from 'Components/Form/SelectInput';
 import TextInput from 'Components/Form/TextInput';
 import Icon from 'Components/Icon';
 import Button from 'Components/Link/Button';
+import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
 import Modal from 'Components/Modal/Modal';
 import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
@@ -16,10 +17,30 @@ import NamingOption from './NamingOption';
 import styles from './NamingModal.css';
 
 const separatorOptions = [
-  { key: ' ', value: 'Space ( )' },
-  { key: '.', value: 'Period (.)' },
-  { key: '_', value: 'Underscore (_)' },
-  { key: '-', value: 'Dash (-)' }
+  {
+    key: ' ',
+    get value() {
+      return `${translate('Space')} ( )`;
+    }
+  },
+  {
+    key: '.',
+    get value() {
+      return `${translate('Period')} (.)`;
+    }
+  },
+  {
+    key: '_',
+    get value() {
+      return `${translate('Underscore')} (_)`;
+    }
+  },
+  {
+    key: '-',
+    get value() {
+      return `${translate('Dash')} (-)`;
+    }
+  }
 ];
 
 const caseOptions = [
@@ -32,13 +53,13 @@ const caseOptions = [
   {
     key: 'lower',
     get value() {
-      return translate('LowerCase');
+      return translate('Lowercase');
     }
   },
   {
     key: 'upper',
     get value() {
-      return translate('UpperCase');
+      return translate('Uppercase');
     }
   }
 ];
@@ -336,10 +357,7 @@ class NamingModal extends Component {
 
                     <div className={styles.footNote}>
                       <Icon className={styles.icon} name={icons.FOOTNOTE} />
-                      <div>
-                        MediaInfo Full/AudioLanguages/SubtitleLanguages support a <code>:EN+DE</code> suffix allowing you to filter the languages included in the filename. Use <code>-DE</code> to exclude specific languages.
-                        Appending <code>+</code> (eg <code>:EN+</code>) will output <code>[EN]</code>/<code>[EN+--]</code>/<code>[--]</code> depending on excluded languages. For example <code>{'{'}MediaInfo Full:EN+DE{'}'}</code>.
-                      </div>
+                      <InlineMarkdown data={translate('MediaInfoFootNote')} />
                     </div>
                   </FieldSet>
 

frontend/src/Settings/Metadata/Metadata/EditMetadataModalContent.js

@@ -36,7 +36,7 @@ function EditMetadataModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        Edit {name.value} Metadata
+        {translate('EditMetadata', { metadataType: name.value })}
       </ModalHeader>
 
       <ModalBody>
@@ -47,7 +47,7 @@ function EditMetadataModalContent(props) {
             <FormInputGroup
               type={inputTypes.CHECK}
               name="enable"
-              helpText={translate('EnableHelpText')}
+              helpText={translate('EnableMetadataHelpText')}
               {...enable}
               onChange={onInputChange}
             />

frontend/src/Settings/Metadata/Metadata/Metadatas.js

@@ -15,7 +15,7 @@ function Metadatas(props) {
   return (
     <FieldSet legend={translate('Metadata')}>
       <PageSectionContent
-        errorMessage={translate('UnableToLoadMetadata')}
+        errorMessage={translate('MetadataLoadError')}
         {...otherProps}
       >
         <div className={styles.metadatas}>

frontend/src/Settings/Notifications/Notifications/AddNotificationModalContent.js

@@ -1,11 +1,13 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import Alert from 'Components/Alert';
 import Button from 'Components/Link/Button';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
+import { kinds } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import AddNotificationItem from './AddNotificationItem';
 import styles from './AddNotificationModalContent.css';
@@ -39,9 +41,9 @@ class AddNotificationModalContent extends Component {
 
           {
             !isSchemaFetching && !!schemaError &&
-              <div>
-                {translate('UnableToAddANewNotificationPleaseTryAgain')}
-              </div>
+              <Alert kind={kinds.DANGER}>
+                {translate('AddNotificationError')}
+              </Alert>
           }
 
           {

frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js

@@ -59,9 +59,9 @@ function EditNotificationModalContent(props) {
 
         {
           !isFetching && !!error &&
-            <div>
-              {translate('UnableToAddANewNotificationPleaseTryAgain')}
-            </div>
+            <Alert kind={kinds.DANGER}>
+              {translate('AddNotificationError')}
+            </Alert>
         }
 
         {
@@ -99,7 +99,7 @@ function EditNotificationModalContent(props) {
                 <FormInputGroup
                   type={inputTypes.TAG}
                   name="tags"
-                  helpText={translate('TagsHelpText')}
+                  helpText={translate('NotificationsTagsMovieHelpText')}
                   {...tags}
                   onChange={onInputChange}
                 />

frontend/src/Settings/Notifications/Notifications/NotificationEventItems.js

@@ -55,7 +55,7 @@ function NotificationEventItems(props) {
             <FormInputGroup
               type={inputTypes.CHECK}
               name="onGrab"
-              helpText={translate('OnGrabHelpText')}
+              helpText={translate('OnGrab')}
               isDisabled={!supportsOnGrab.value}
               {...onGrab}
               onChange={onInputChange}
@@ -66,7 +66,7 @@ function NotificationEventItems(props) {
             <FormInputGroup
               type={inputTypes.CHECK}
               name="onDownload"
-              helpText={translate('OnDownloadHelpText')}
+              helpText={translate('OnImport')}
               isDisabled={!supportsOnDownload.value}
               {...onDownload}
               onChange={onInputChange}
@@ -79,7 +79,7 @@ function NotificationEventItems(props) {
                 <FormInputGroup
                   type={inputTypes.CHECK}
                   name="onUpgrade"
-                  helpText={translate('OnUpgradeHelpText')}
+                  helpText={translate('OnUpgrade')}
                   isDisabled={!supportsOnUpgrade.value}
                   {...onUpgrade}
                   onChange={onInputChange}
@@ -91,7 +91,7 @@ function NotificationEventItems(props) {
             <FormInputGroup
               type={inputTypes.CHECK}
               name="onRename"
-              helpText={translate('OnRenameHelpText')}
+              helpText={translate('OnRename')}
               isDisabled={!supportsOnRename.value}
               {...onRename}
               onChange={onInputChange}
@@ -102,7 +102,7 @@ function NotificationEventItems(props) {
             <FormInputGroup
               type={inputTypes.CHECK}
               name="onMovieAdded"
-              helpText={translate('OnMovieAddedHelpText')}
+              helpText={translate('OnMovieAdded')}
               isDisabled={!supportsOnMovieAdded.value}
               {...onMovieAdded}
               onChange={onInputChange}
@@ -113,7 +113,7 @@ function NotificationEventItems(props) {
             <FormInputGroup
               type={inputTypes.CHECK}
               name="onMovieDelete"
-              helpText={translate('OnMovieDeleteHelpText')}
+              helpText={translate('OnMovieDelete')}
               isDisabled={!supportsOnMovieDelete.value}
               {...onMovieDelete}
               onChange={onInputChange}
@@ -124,7 +124,7 @@ function NotificationEventItems(props) {
             <FormInputGroup
               type={inputTypes.CHECK}
               name="onMovieFileDelete"
-              helpText={translate('OnMovieFileDeleteHelpText')}
+              helpText={translate('OnMovieFileDelete')}
               isDisabled={!supportsOnMovieFileDelete.value}
               {...onMovieFileDelete}
               onChange={onInputChange}
@@ -137,7 +137,7 @@ function NotificationEventItems(props) {
                 <FormInputGroup
                   type={inputTypes.CHECK}
                   name="onMovieFileDeleteForUpgrade"
-                  helpText={translate('OnMovieFileDeleteForUpgradeHelpText')}
+                  helpText={translate('OnMovieFileDeleteForUpgrade')}
                   isDisabled={!supportsOnMovieFileDeleteForUpgrade.value}
                   {...onMovieFileDeleteForUpgrade}
                   onChange={onInputChange}
@@ -149,7 +149,7 @@ function NotificationEventItems(props) {
             <FormInputGroup
               type={inputTypes.CHECK}
               name="onHealthIssue"
-              helpText={translate('OnHealthIssueHelpText')}
+              helpText={translate('OnHealthIssue')}
               isDisabled={!supportsOnHealthIssue.value}
               {...onHealthIssue}
               onChange={onInputChange}
@@ -160,7 +160,7 @@ function NotificationEventItems(props) {
             <FormInputGroup
               type={inputTypes.CHECK}
               name="onHealthRestored"
-              helpText={translate('OnHealthRestoredHelpText')}
+              helpText={translate('OnHealthRestored')}
               isDisabled={!supportsOnHealthRestored.value}
               {...onHealthRestored}
               onChange={onInputChange}
@@ -173,7 +173,7 @@ function NotificationEventItems(props) {
                 <FormInputGroup
                   type={inputTypes.CHECK}
                   name="includeHealthWarnings"
-                  helpText={translate('IncludeHealthWarningsHelpText')}
+                  helpText={translate('IncludeHealthWarnings')}
                   isDisabled={!supportsOnHealthIssue.value}
                   {...includeHealthWarnings}
                   onChange={onInputChange}
@@ -185,7 +185,7 @@ function NotificationEventItems(props) {
             <FormInputGroup
               type={inputTypes.CHECK}
               name="onApplicationUpdate"
-              helpText={translate('OnApplicationUpdateHelpText')}
+              helpText={translate('OnApplicationUpdate')}
               isDisabled={!supportsOnApplicationUpdate.value}
               {...onApplicationUpdate}
               onChange={onInputChange}
@@ -196,7 +196,7 @@ function NotificationEventItems(props) {
             <FormInputGroup
               type={inputTypes.CHECK}
               name="onManualInteractionRequired"
-              helpText={translate('OnManualInteractionRequiredHelpText')}
+              helpText={translate('OnManualInteractionRequired')}
               isDisabled={!supportsOnManualInteractionRequired.value}
               {...onManualInteractionRequired}
               onChange={onInputChange}

frontend/src/Settings/Notifications/Notifications/Notifications.js

@@ -62,7 +62,7 @@ class Notifications extends Component {
     return (
       <FieldSet legend={translate('Connections')}>
         <PageSectionContent
-          errorMessage={translate('UnableToLoadNotifications')}
+          errorMessage={translate('NotificationsLoadError')}
           {...otherProps}
         >
           <div className={styles.notifications}>

frontend/src/Settings/PendingChangesModal.js

@@ -15,12 +15,17 @@ function PendingChangesModal(props) {
     isOpen,
     onConfirm,
     onCancel,
-    bindShortcut
+    bindShortcut,
+    unbindShortcut
   } = props;
 
   useEffect(() => {
-    bindShortcut('enter', onConfirm);
-  }, [bindShortcut, onConfirm]);
+    if (isOpen) {
+      bindShortcut('enter', onConfirm);
+
+      return () => unbindShortcut('enter', onConfirm);
+    }
+  }, [bindShortcut, unbindShortcut, isOpen, onConfirm]);
 
   return (
     <Modal
@@ -61,7 +66,8 @@ PendingChangesModal.propTypes = {
   kind: PropTypes.oneOf(kinds.all),
   onConfirm: PropTypes.func.isRequired,
   onCancel: PropTypes.func.isRequired,
-  bindShortcut: PropTypes.func.isRequired
+  bindShortcut: PropTypes.func.isRequired,
+  unbindShortcut: PropTypes.func.isRequired
 };
 
 PendingChangesModal.defaultProps = {

frontend/src/Settings/Profiles/Delay/DelayProfile.js

@@ -17,15 +17,15 @@ function getDelay(enabled, delay) {
   }
 
   if (!delay) {
-    return 'No Delay';
+    return translate('NoDelay');
   }
 
   if (delay === 1) {
-    return '1 Minute';
+    return translate('OneMinute');
   }
 
   // TODO: use better units of time than just minutes
-  return `${delay} Minutes`;
+  return translate('DelayMinutes', { delay });
 }
 
 class DelayProfile extends Component {
@@ -85,7 +85,7 @@ class DelayProfile extends Component {
       connectDragSource
     } = this.props;
 
-    let preferred = `Prefer ${titleCase(preferredProtocol)}`;
+    let preferred = titleCase(translate('PreferProtocol', { preferredProtocol }));
 
     if (!enableUsenet) {
       preferred = translate('OnlyTorrent');

frontend/src/Settings/Profiles/Delay/DelayProfiles.js

@@ -70,7 +70,7 @@ class DelayProfiles extends Component {
       <Measure onMeasure={this.onMeasure}>
         <FieldSet legend={translate('DelayProfiles')}>
           <PageSectionContent
-            errorMessage={translate('UnableToLoadDelayProfiles')}
+            errorMessage={translate('DelayProfilesLoadError')}
             {...otherProps}
           >
             <Scroller

frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContent.js

@@ -87,9 +87,9 @@ function EditDelayProfileModalContent(props) {
 
         {
           !isFetching && !!error ?
-            <div>
-              {translate('UnableToAddANewQualityProfilePleaseTryAgain')}
-            </div> :
+            <Alert kind={kinds.DANGER}>
+              {translate('AddDelayProfileError')}
+            </Alert> :
             null
         }
 
@@ -186,7 +186,7 @@ function EditDelayProfileModalContent(props) {
               {
                 id === 1 ?
                   <Alert>
-                    {translate('DefaultDelayProfile')}
+                    {translate('DefaultDelayProfileMovie')}
                   </Alert> :
 
                   <FormGroup>
@@ -196,7 +196,7 @@ function EditDelayProfileModalContent(props) {
                       type={inputTypes.TAG}
                       name="tags"
                       {...tags}
-                      helpText={translate('TagsHelpText')}
+                      helpText={translate('DelayProfileMovieTagsHelpText')}
                       onChange={onInputChange}
                     />
                   </FormGroup>

frontend/src/Settings/Profiles/Profiles.js

@@ -8,6 +8,7 @@ import translate from 'Utilities/String/translate';
 import DelayProfilesConnector from './Delay/DelayProfilesConnector';
 import QualityProfilesConnector from './Quality/QualityProfilesConnector';
 import ReleaseProfilesConnector from './Release/ReleaseProfilesConnector';
+
 // Only a single DragDrop Context can exist so it's done here to allow editing
 // quality profiles and reordering delay profiles to work.
 
@@ -19,9 +20,7 @@ class Profiles extends Component {
   render() {
     return (
       <PageContent title={translate('Profiles')}>
-        <SettingsToolbarConnector
-          showSave={false}
-        />
+        <SettingsToolbarConnector showSave={false} />
 
         <PageContentBody>
           <DndProvider options={HTML5toTouch}>

frontend/src/Settings/Profiles/Quality/EditQualityProfileModalContent.js

@@ -158,7 +158,7 @@ class EditQualityProfileModalContent extends Component {
               {
                 !isFetching && !!error &&
                   <div>
-                    {translate('UnableToAddANewQualityProfilePleaseTryAgain')}
+                    {translate('AddQualityProfileError')}
                   </div>
               }
 
@@ -191,7 +191,7 @@ class EditQualityProfileModalContent extends Component {
                             type={inputTypes.CHECK}
                             name="upgradeAllowed"
                             {...upgradeAllowed}
-                            helpText={translate('UpgradeAllowedHelpText')}
+                            helpText={translate('UpgradesAllowedHelpText')}
                             onChange={onInputChange}
                           />
                         </FormGroup>
@@ -200,7 +200,7 @@ class EditQualityProfileModalContent extends Component {
                           upgradeAllowed.value &&
                             <FormGroup size={sizes.EXTRA_SMALL}>
                               <FormLabel size={sizes.SMALL}>
-                                {translate('UpgradeUntilQuality')}
+                                {translate('UpgradeUntil')}
                               </FormLabel>
 
                               <FormInputGroup
@@ -208,7 +208,7 @@ class EditQualityProfileModalContent extends Component {
                                 name="cutoff"
                                 {...cutoff}
                                 values={qualities}
-                                helpText={translate('CutoffHelpText')}
+                                helpText={translate('UpgradeUntilMovieHelpText')}
                                 onChange={onCutoffChange}
                               />
                             </FormGroup>
@@ -225,7 +225,7 @@ class EditQualityProfileModalContent extends Component {
                                 type={inputTypes.NUMBER}
                                 name="minFormatScore"
                                 {...minFormatScore}
-                                helpText={translate('MinFormatScoreHelpText')}
+                                helpText={translate('MinimumCustomFormatScoreHelpText')}
                                 onChange={onInputChange}
                               />
                             </FormGroup>
@@ -242,7 +242,7 @@ class EditQualityProfileModalContent extends Component {
                                 type={inputTypes.NUMBER}
                                 name="cutoffFormatScore"
                                 {...cutoffFormatScore}
-                                helpText={translate('CutoffFormatScoreHelpText')}
+                                helpText={translate('UpgradeUntilCustomFormatScoreMovieHelpText')}
                                 onChange={onInputChange}
                               />
                             </FormGroup>
@@ -301,7 +301,7 @@ class EditQualityProfileModalContent extends Component {
                   className={styles.deleteButtonContainer}
                   title={
                     isInUse ?
-                      translate('QualityProfileInUse') :
+                      translate('QualityProfileInUseMovieListCollection') :
                       undefined
                   }
                 >

frontend/src/Settings/Profiles/Quality/QualityProfileFormatItems.js

@@ -4,7 +4,7 @@ import React, { Component } from 'react';
 import FormGroup from 'Components/Form/FormGroup';
 import FormInputHelpText from 'Components/Form/FormInputHelpText';
 import FormLabel from 'Components/Form/FormLabel';
-import Link from 'Components/Link/Link';
+import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
 import { sizes } from 'Helpers/Props';
 import translate from 'Utilities/String/translate';
 import QualityProfileFormatItem from './QualityProfileFormatItem';
@@ -67,10 +67,7 @@ class QualityProfileFormatItems extends Component {
 
     if (profileFormatItems.length < 1) {
       return (
-        <div className={styles.addCustomFormatMessage}>
-          {translate('MoreControlCFText')}
-          <Link to='/settings/customformats'> {translate('CustomFormat')} </Link>
-        </div>
+        <InlineMarkdown className={styles.addCustomFormatMessage} data={translate('WantMoreControlAddACustomFormat')} />
       );
     }
 

frontend/src/Settings/Profiles/Quality/QualityProfiles.js

@@ -54,7 +54,7 @@ class QualityProfiles extends Component {
     return (
       <FieldSet legend={translate('QualityProfiles')}>
         <PageSectionContent
-          errorMessage={translate('UnableToLoadQualityProfiles')}
+          errorMessage={translate('QualityProfilesLoadError')}
           {...otherProps}c={true}
         >
           <div className={styles.qualityProfiles}>

frontend/src/Settings/Profiles/Release/EditReleaseProfileModalContent.js

@@ -41,7 +41,7 @@ function EditReleaseProfileModalContent(props) {
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
-        {id ? translate('Edit Release Profile') : translate('Add Release Profile')}
+        {id ? translate('EditReleaseProfile') : translate('AddReleaseProfile')}
       </ModalHeader>
 
       <ModalBody>
@@ -54,7 +54,7 @@ function EditReleaseProfileModalContent(props) {
               type={inputTypes.TEXT}
               name="name"
               {...name}
-              placeholder="Optional name"
+              placeholder={translate('OptionalName')}
               canEdit={true}
               onChange={onInputChange}
             />
@@ -66,7 +66,7 @@ function EditReleaseProfileModalContent(props) {
             <FormInputGroup
               type={inputTypes.CHECK}
               name="enabled"
-              helpText="Check to enable release profile"
+              helpText={translate('EnableProfileHelpText')}
               {...enabled}
               onChange={onInputChange}
             />
@@ -80,9 +80,9 @@ function EditReleaseProfileModalContent(props) {
               inputClassName={styles.tagInternalInput}
               type={inputTypes.TEXT_TAG}
               name="required"
-              helpText="The release must contain at least one of these terms (case insensitive)"
+              helpText={translate('MustContainHelpText')}
               kind={kinds.SUCCESS}
-              placeholder={translate('RequiredRestrictionPlaceHolder')}
+              placeholder={translate('AddNewRestriction')}
               delimiters={tagInputDelimiters}
               canEdit={true}
               onChange={onInputChange}
@@ -97,9 +97,9 @@ function EditReleaseProfileModalContent(props) {
               inputClassName={styles.tagInternalInput}
               type={inputTypes.TEXT_TAG}
               name="ignored"
-              helpText="The release will be rejected if it contains one or more of terms (case insensitive)"
+              helpText={translate('MustNotContainHelpText')}
               kind={kinds.DANGER}
-              placeholder={translate('IgnoredPlaceHolder')}
+              placeholder={translate('AddNewRestriction')}
               delimiters={tagInputDelimiters}
               canEdit={true}
               onChange={onInputChange}
@@ -112,8 +112,8 @@ function EditReleaseProfileModalContent(props) {
             <FormInputGroup
               type={inputTypes.INDEXER_SELECT}
               name="indexerId"
-              helpText="Specify what indexer the profile applies to"
-              helpTextWarning="Using a specific indexer with release profiles can lead to duplicate releases being grabbed"
+              helpText={translate('ReleaseProfileIndexerHelpText')}
+              helpTextWarning={translate('ReleaseProfileIndexerHelpTextWarning')}
               {...indexerId}
               includeAny={true}
               onChange={onInputChange}
@@ -126,7 +126,7 @@ function EditReleaseProfileModalContent(props) {
             <FormInputGroup
               type={inputTypes.TAG}
               name="tags"
-              helpText="Release profiles will apply to movies with at least one matching tag. Leave blank to apply to all movies"
+              helpText={translate('ReleaseProfileTagMovieHelpText')}
               {...tags}
               onChange={onInputChange}
             />

frontend/src/Settings/Profiles/Release/ReleaseProfile.js

@@ -5,6 +5,7 @@ import Label from 'Components/Label';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import TagList from 'Components/TagList';
 import { kinds } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import EditReleaseProfileModalConnector from './EditReleaseProfileModalConnector';
 import styles from './ReleaseProfile.css';
 
@@ -137,7 +138,7 @@ class ReleaseProfile extends Component {
                 kind={kinds.DISABLED}
                 outline={true}
               >
-                Disabled
+                {translate('Disabled')}
               </Label>
           }
 
@@ -162,9 +163,9 @@ class ReleaseProfile extends Component {
         <ConfirmModal
           isOpen={isDeleteReleaseProfileModalOpen}
           kind={kinds.DANGER}
-          title="Delete ReleaseProfile"
-          message={'Are you sure you want to delete this releaseProfile?'}
-          confirmLabel="Delete"
+          title={translate('DeleteReleaseProfile')}
+          message={translate('DeleteReleaseProfileMessageText', { name })}
+          confirmLabel={translate('Delete')}
           onConfirm={this.onConfirmDeleteReleaseProfile}
           onCancel={this.onDeleteReleaseProfileModalClose}
         />

frontend/src/Settings/Quality/Definition/QualityDefinition.js

@@ -150,13 +150,13 @@ class QualityDefinition extends Component {
     } = this.state;
 
     const minBytes = minSize * 1024 * 1024;
-    const minSixty = `${formatBytes(minBytes * 60)}/h`;
+    const minSixty = `${formatBytes(minBytes * 60)}/${translate('HourShorthand')}`;
 
     const preferredBytes = preferredSize * 1024 * 1024;
-    const preferredSixty = preferredBytes ? `${formatBytes(preferredBytes * 60)}/h` : translate('Unlimited');
+    const preferredSixty = preferredBytes ? `${formatBytes(preferredBytes * 60)}/${translate('HourShorthand')}` : translate('Unlimited');
 
     const maxBytes = maxSize && maxSize * 1024 * 1024;
-    const maxSixty = maxBytes ? `${formatBytes(maxBytes * 60)}/h` : translate('Unlimited');
+    const maxSixty = maxBytes ? `${formatBytes(maxBytes * 60)}/${translate('HourShorthand')}` : translate('Unlimited');
 
     return (
       <div className={styles.qualityDefinition}>

frontend/src/Settings/Quality/Definition/QualityDefinitionLimits.js

@@ -20,13 +20,13 @@ function QualityDefinitionLimits(props) {
   return (
     <div>
       <div>
-        {translate('MinutesSixty', [sixty])}
+        {translate('MinutesSixty', { sixty })}
       </div>
       <div>
-        {translate('MinutesNinety', [ninety])}
+        {translate('MinutesNinety', { ninety })}
       </div>
       <div>
-        {translate('MinutesHundredTwenty', [hundredTwenty])}
+        {translate('MinutesHundredTwenty', { hundredTwenty })}
       </div>
     </div>
   );

frontend/src/Settings/Quality/Definition/QualityDefinitions.js

@@ -21,7 +21,7 @@ class QualityDefinitions extends Component {
     return (
       <FieldSet legend={translate('QualityDefinitions')}>
         <PageSectionContent
-          errorMessage={translate('UnableToLoadQualityDefinitions')}
+          errorMessage={translate('QualityDefinitionsLoadError')}
           {...otherProps}
         >
           <div className={styles.header}>
@@ -60,7 +60,7 @@ class QualityDefinitions extends Component {
 
           <div className={styles.sizeLimitHelpTextContainer}>
             <div className={styles.sizeLimitHelpText}>
-              {translate('QualityLimitsHelpText')}
+              {translate('QualityLimitsMovieRuntimeHelpText')}
             </div>
           </div>
         </PageSectionContent>

frontend/src/Settings/Settings.js

@@ -84,11 +84,11 @@ function Settings() {
           className={styles.link}
           to="/settings/importlists"
         >
-          {translate('Lists')}
+          {translate('ImportLists')}
         </Link>
 
         <div className={styles.summary}>
-          {translate('ListsSettingsSummary')}
+          {translate('ImportListsSettingsSummary')}
         </div>
 
         <Link
@@ -110,7 +110,7 @@ function Settings() {
         </Link>
 
         <div className={styles.summary}>
-          {translate('MetadataSettingsSummary')}
+          {translate('MetadataSettingsMovieSummary')}
         </div>
 
         <Link
@@ -139,11 +139,11 @@ function Settings() {
           className={styles.link}
           to="/settings/ui"
         >
-          {translate('UI')}
+          {translate('Ui')}
         </Link>
 
         <div className={styles.summary}>
-          {translate('UISettingsSummary')}
+          {translate('UiSettingsSummary')}
         </div>
       </PageContentBody>
     </PageContent>

frontend/src/Settings/Tags/AutoTagging/AutoTaggings.js

@@ -58,7 +58,7 @@ export default function AutoTaggings() {
   return (
     <FieldSet legend={translate('AutoTagging')}>
       <PageSectionContent
-        errorMessage={translate('UnableToLoadAutoTagging')}
+        errorMessage={translate('AutoTaggingLoadError')}
         error={error}
         isFetching={isFetching}
         isPopulated={isPopulated}

frontend/src/Settings/Tags/AutoTagging/EditAutoTaggingModalContent.js

@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import Alert from 'Components/Alert';
 import Card from 'Components/Card';
 import FieldSet from 'Components/FieldSet';
 import Form from 'Components/Form/Form';
@@ -122,9 +123,9 @@ export default function EditAutoTaggingModalContent(props) {
 
           {
             !isFetching && !!error ?
-              <div>
-                {'Unable to add a new auto tag, please try again.'}
-              </div> :
+              <Alert kind={kinds.DANGER}>
+                {translate('AddAutoTagError')}
+              </Alert> :
               null
           }
 

frontend/src/Settings/Tags/AutoTagging/Specifications/AddSpecificationModalContent.js

@@ -55,9 +55,9 @@ export default function AddSpecificationModalContent(props) {
 
         {
           !isSchemaFetching && !!schemaError ?
-            <div>
-              {'Unable to add a new condition, please try again.'}
-            </div> :
+            <Alert kind={kinds.DANGER}>
+              {translate('AddConditionError')}
+            </Alert> :
             null
         }
 
@@ -67,7 +67,7 @@ export default function AddSpecificationModalContent(props) {
 
               <Alert kind={kinds.INFO}>
                 <div>
-                  {'Radarr supports the follow properties for auto tagging rules'}
+                  {translate('SupportedAutoTaggingProperties')}
                 </div>
               </Alert>
 

frontend/src/Settings/Tags/AutoTagging/Specifications/EditSpecificationModalContent.js

@@ -8,8 +8,8 @@ import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import ProviderFieldFormGroup from 'Components/Form/ProviderFieldFormGroup';
 import Button from 'Components/Link/Button';
-import Link from 'Components/Link/Link';
 import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton';
+import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
 import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
@@ -83,12 +83,13 @@ function EditSpecificationModalContent(props) {
             fields && fields.some((x) => x.label === 'Regular Expression') &&
               <Alert kind={kinds.INFO}>
                 <div>
-                  <div dangerouslySetInnerHTML={{ __html: 'This condition matches using Regular Expressions. Note that the characters <code>\\^$.|?*+()[{</code> have special meanings and need escaping with a <code>\\</code>' }} />
-                  {'More details'} <Link to="https://www.regular-expressions.info/tutorial.html">{'Here'}</Link>
+                  <InlineMarkdown data={translate('ConditionUsingRegularExpressions')} />
                 </div>
                 <div>
-                  {'Regular expressions can be tested '}
-                  <Link to="http://regexstorm.net/tester">Here</Link>
+                  <InlineMarkdown data={translate('RegularExpressionsTutorialLink')} />
+                </div>
+                <div>
+                  <InlineMarkdown data={translate('RegularExpressionsCanBeTested')} />
                 </div>
               </Alert>
           }
@@ -130,7 +131,7 @@ function EditSpecificationModalContent(props) {
               type={inputTypes.CHECK}
               name="negate"
               {...negate}
-              helpText={translate('AutoTaggingNegateHelpText', [implementationName])}
+              helpText={translate('AutoTaggingNegateHelpText', { implementationName })}
               onChange={onInputChange}
             />
           </FormGroup>
@@ -144,7 +145,7 @@ function EditSpecificationModalContent(props) {
               type={inputTypes.CHECK}
               name="required"
               {...required}
-              helpText={translate('AutoTaggingRequiredHelpText', [implementationName])}
+              helpText={translate('AutoTaggingRequiredHelpText', { implementationName })}
               onChange={onInputChange}
             />
           </FormGroup>

frontend/src/Settings/Tags/AutoTagging/Specifications/Specification.js

@@ -5,6 +5,7 @@ import Label from 'Components/Label';
 import IconButton from 'Components/Link/IconButton';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import { icons, kinds } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import EditSpecificationModal from './EditSpecificationModal';
 import styles from './Specification.css';
 
@@ -60,7 +61,7 @@ export default function Specification(props) {
 
         <IconButton
           className={styles.cloneButton}
-          title="Clone"
+          title={translate('Clone')}
           name={icons.CLONE}
           onPress={onClonePress}
         />
@@ -74,7 +75,7 @@ export default function Specification(props) {
         {
           negate ?
             <Label kind={kinds.DANGER}>
-              Negated
+              {translate('Negated')}
             </Label> :
             null
         }
@@ -82,7 +83,7 @@ export default function Specification(props) {
         {
           required ?
             <Label kind={kinds.SUCCESS}>
-              Required
+              {translate('Required')}
             </Label> :
             null
         }
@@ -98,9 +99,9 @@ export default function Specification(props) {
       <ConfirmModal
         isOpen={isDeleteModalOpen}
         kind={kinds.DANGER}
-        title="Delete Specification"
-        message={`Are you sure you want to delete specification ${name} ?`}
-        confirmLabel="Delete"
+        title={translate('DeleteSpecification')}
+        message={translate('DeleteSpecificationHelpText', { name })}
+        confirmLabel={translate('Delete')}
         onConfirm={onConfirmDelete}
         onCancel={onDeleteModalClose}
       />

frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.js

@@ -15,13 +15,13 @@ function TagDetailsDelayProfile(props) {
   return (
     <div>
       <div>
-        Protocol: {titleCase(preferredProtocol)}
+        {titleCase(translate('DelayProfileProtocol', { preferredProtocol }))}
       </div>
 
       <div>
         {
           enableUsenet ?
-            translate('UsenetDelayTime', [usenetDelay]) :
+            translate('UsenetDelayTime', { usenetDelay }) :
             translate('UsenetDisabled')
         }
       </div>
@@ -29,7 +29,7 @@ function TagDetailsDelayProfile(props) {
       <div>
         {
           enableTorrent ?
-            translate('TorrentDelayTime', [torrentDelay]) :
+            translate('TorrentDelayTime', { torrentDelay }) :
             translate('TorrentsDisabled')
         }
       </div>

frontend/src/Settings/Tags/Details/TagDetailsModalContent.js

@@ -104,6 +104,22 @@ function TagDetailsModalContent(props) {
             null
         }
 
+        {
+          importLists.length ?
+            <FieldSet legend={translate('ImportLists')}>
+              {
+                importLists.map((item) => {
+                  return (
+                    <div key={item.id}>
+                      {item.name}
+                    </div>
+                  );
+                })
+              }
+            </FieldSet> :
+            null
+        }
+
         {
           releaseProfiles.length ?
             <FieldSet legend={translate('ReleaseProfiles')}>
@@ -167,22 +183,6 @@ function TagDetailsModalContent(props) {
             null
         }
 
-        {
-          importLists.length ?
-            <FieldSet legend={translate('Lists')}>
-              {
-                importLists.map((item) => {
-                  return (
-                    <div key={item.id}>
-                      {item.name}
-                    </div>
-                  );
-                })
-              }
-            </FieldSet> :
-            null
-        }
-
         {
           downloadClients.length ?
             <FieldSet legend={translate('DownloadClients')}>

frontend/src/Settings/Tags/Tag.js

@@ -88,50 +88,55 @@ class Tag extends Component {
           isTagUsed ?
             <div>
               <TagInUse
-                label="movie"
+                label={translate('Movie')}
+                labelPlural={translate('Movies')}
                 count={movieIds.length}
               />
 
               <TagInUse
-                label="delay profile"
+                label={translate('DelayProfile')}
+                labelPlural={translate('DelayProfiles')}
                 count={delayProfileIds.length}
               />
 
               <TagInUse
-                label="import list"
+                label={translate('ImportList')}
+                labelPlural={translate('ImportLists')}
                 count={importListIds.length}
               />
 
               <TagInUse
-                label="connection"
+                label={translate('Connection')}
+                labelPlural={translate('Connections')}
                 count={notificationIds.length}
               />
 
               <TagInUse
-                label="release profile"
-                count={releaseProfileIds.length}
-              />
-
-              <TagInUse
-                label="indexer"
+                label={translate('Indexer')}
+                labelPlural={translate('Indexers')}
                 count={indexerIds.length}
               />
 
               <TagInUse
-                label="download client"
+                label={translate('DownloadClient')}
+                labelPlural={translate('DownloadClients')}
                 count={downloadClientIds.length}
               />
 
               <TagInUse
-                label="auto tagging"
+                label={translate('AutoTagging')}
                 count={autoTagIds.length}
-                shouldPluralize={false}
               />
             </div> :
             null
         }
 
-        {!isTagUsed && <div>{translate('NoLinks')}</div>}
+        {
+          !isTagUsed &&
+            <div>
+              {translate('NoLinks')}
+            </div>
+        }
 
         <TagDetailsModal
           label={label}

frontend/src/Settings/Tags/TagInUse.js

@@ -4,31 +4,31 @@ import React from 'react';
 export default function TagInUse(props) {
   const {
     label,
-    count,
-    shouldPluralize = true
+    labelPlural,
+    count
   } = props;
 
   if (count === 0) {
     return null;
   }
 
-  if (count > 1 && shouldPluralize) {
+  if (count > 1 && labelPlural ) {
     return (
       <div>
-        {count} {label}s
+        {count} {labelPlural.toLowerCase()}
       </div>
     );
   }
 
   return (
     <div>
-      {count} {label}
+      {count} {label.toLowerCase()}
     </div>
   );
 }
 
 TagInUse.propTypes = {
   label: PropTypes.string.isRequired,
-  count: PropTypes.number.isRequired,
-  shouldPluralize: PropTypes.bool
+  labelPlural: PropTypes.string,
+  count: PropTypes.number.isRequired
 };

frontend/src/Settings/Tags/Tags.js

@@ -27,7 +27,7 @@ function Tags(props) {
       legend={translate('Tags')}
     >
       <PageSectionContent
-        errorMessage={translate('UnableToLoadTags')}
+        errorMessage={translate('TagsLoadError')}
         {...otherProps}
       >
         <div className={styles.tags}>

frontend/src/Settings/UI/UISettings.js

@@ -84,7 +84,7 @@ class UISettings extends Component {
     const uiLanguages = languages.filter((item) => item.value !== 'Original');
 
     return (
-      <PageContent title={translate('UISettings')}>
+      <PageContent title={translate('UiSettings')}>
         <SettingsToolbarConnector
           {...otherProps}
           onSavePress={onSavePress}
@@ -92,26 +92,28 @@ class UISettings extends Component {
 
         <PageContentBody>
           {
-            isFetching &&
-              <LoadingIndicator />
+            isFetching ?
+              <LoadingIndicator /> :
+              null
           }
 
           {
-            !isFetching && error &&
+            !isFetching && error ?
               <Alert kind={kinds.DANGER}>
-                {translate('UnableToLoadUISettings')}
-              </Alert>
+                {translate('UiSettingsLoadError')}
+              </Alert> :
+              null
           }
 
           {
-            hasSettings && !isFetching && !error &&
+            hasSettings && !isFetching && !error ?
               <Form
                 id="uiSettings"
                 {...otherProps}
               >
                 <FieldSet legend={translate('Calendar')}>
                   <FormGroup>
-                    <FormLabel>{translate('SettingsFirstDayOfWeek')}</FormLabel>
+                    <FormLabel>{translate('FirstDayOfWeek')}</FormLabel>
 
                     <FormInputGroup
                       type={inputTypes.SELECT}
@@ -123,14 +125,14 @@ class UISettings extends Component {
                   </FormGroup>
 
                   <FormGroup>
-                    <FormLabel>{translate('SettingsWeekColumnHeader')}</FormLabel>
+                    <FormLabel>{translate('WeekColumnHeader')}</FormLabel>
 
                     <FormInputGroup
                       type={inputTypes.SELECT}
                       name="calendarWeekColumnHeader"
                       values={weekColumnOptions}
                       onChange={onInputChange}
-                      helpText={translate('SettingsWeekColumnHeaderHelpText')}
+                      helpText={translate('WeekColumnHeaderHelpText')}
                       {...settings.calendarWeekColumnHeader}
                     />
                   </FormGroup>
@@ -138,7 +140,7 @@ class UISettings extends Component {
 
                 <FieldSet legend={translate('Movies')}>
                   <FormGroup>
-                    <FormLabel>{translate('SettingsRuntimeFormat')}</FormLabel>
+                    <FormLabel>{translate('RuntimeFormat')}</FormLabel>
 
                     <FormInputGroup
                       type={inputTypes.SELECT}
@@ -150,9 +152,11 @@ class UISettings extends Component {
                   </FormGroup>
                 </FieldSet>
 
-                <FieldSet legend={translate('Dates')}>
+                <FieldSet
+                  legend={translate('Dates')}
+                >
                   <FormGroup>
-                    <FormLabel>{translate('SettingsShortDateFormat')}</FormLabel>
+                    <FormLabel>{translate('ShortDateFormat')}</FormLabel>
 
                     <FormInputGroup
                       type={inputTypes.SELECT}
@@ -164,7 +168,7 @@ class UISettings extends Component {
                   </FormGroup>
 
                   <FormGroup>
-                    <FormLabel>{translate('SettingsLongDateFormat')}</FormLabel>
+                    <FormLabel>{translate('LongDateFormat')}</FormLabel>
 
                     <FormInputGroup
                       type={inputTypes.SELECT}
@@ -176,7 +180,7 @@ class UISettings extends Component {
                   </FormGroup>
 
                   <FormGroup>
-                    <FormLabel>{translate('SettingsTimeFormat')}</FormLabel>
+                    <FormLabel>{translate('TimeFormat')}</FormLabel>
 
                     <FormInputGroup
                       type={inputTypes.SELECT}
@@ -188,24 +192,26 @@ class UISettings extends Component {
                   </FormGroup>
 
                   <FormGroup>
-                    <FormLabel>{translate('SettingsShowRelativeDates')}</FormLabel>
+                    <FormLabel>{translate('ShowRelativeDates')}</FormLabel>
                     <FormInputGroup
                       type={inputTypes.CHECK}
                       name="showRelativeDates"
-                      helpText={translate('SettingsShowRelativeDatesHelpText')}
+                      helpText={translate('ShowRelativeDatesHelpText')}
                       onChange={onInputChange}
                       {...settings.showRelativeDates}
                     />
                   </FormGroup>
                 </FieldSet>
 
-                <FieldSet legend={translate('Style')}>
+                <FieldSet
+                  legend={translate('Style')}
+                >
                   <FormGroup>
-                    <FormLabel>{translate('SettingsTheme')}</FormLabel>
+                    <FormLabel>{translate('Theme')}</FormLabel>
                     <FormInputGroup
                       type={inputTypes.SELECT}
                       name="theme"
-                      helpText={translate('SettingsThemeHelpText')}
+                      helpText={translate('ThemeHelpText')}
                       values={themeOptions}
                       onChange={onInputChange}
                       {...settings.theme}
@@ -213,11 +219,11 @@ class UISettings extends Component {
                   </FormGroup>
 
                   <FormGroup>
-                    <FormLabel>{translate('SettingsEnableColorImpairedMode')}</FormLabel>
+                    <FormLabel>{translate('EnableColorImpairedMode')}</FormLabel>
                     <FormInputGroup
                       type={inputTypes.CHECK}
                       name="enableColorImpairedMode"
-                      helpText={translate('SettingsEnableColorImpairedModeHelpText')}
+                      helpText={translate('EnableColorImpairedModeHelpText')}
                       onChange={onInputChange}
                       {...settings.enableColorImpairedMode}
                     />
@@ -239,13 +245,13 @@ class UISettings extends Component {
                   </FormGroup>
 
                   <FormGroup>
-                    <FormLabel>{translate('UILanguage')}</FormLabel>
+                    <FormLabel>{translate('UiLanguage')}</FormLabel>
                     <FormInputGroup
                       type={inputTypes.LANGUAGE_SELECT}
                       name="uiLanguage"
                       values={uiLanguages}
-                      helpText={translate('UILanguageHelpText')}
-                      helpTextWarning={translate('UILanguageHelpTextWarning')}
+                      helpText={translate('UiLanguageHelpText')}
+                      helpTextWarning={translate('BrowserReloadRequired')}
                       onChange={onInputChange}
                       {...settings.uiLanguage}
                       errors={
@@ -258,7 +264,8 @@ class UISettings extends Component {
                     />
                   </FormGroup>
                 </FieldSet>
-              </Form>
+              </Form> :
+              null
           }
         </PageContentBody>
       </PageContent>

frontend/src/Store/Actions/discoverMovieActions.js

@@ -88,6 +88,20 @@ export const defaultState = {
       isVisible: true,
       isModifiable: false
     },
+    {
+      name: 'isTrending',
+      columnLabel: 'Trending',
+      isSortable: true,
+      isVisible: true,
+      isModifiable: false
+    },
+    {
+      name: 'isPopular',
+      columnLabel: 'Popular',
+      isSortable: true,
+      isVisible: true,
+      isModifiable: false
+    },
     {
       name: 'sortTitle',
       label: () => translate('MovieTitle'),
@@ -267,6 +281,28 @@ export const defaultState = {
       label: () => translate('All'),
       filters: []
     },
+    {
+      key: 'popular',
+      label: 'Popular',
+      filters: [
+        {
+          key: 'isPopular',
+          value: true,
+          type: filterTypes.EQUAL
+        }
+      ]
+    },
+    {
+      key: 'trending',
+      label: 'Trending',
+      filters: [
+        {
+          key: 'isTrending',
+          value: true,
+          type: filterTypes.EQUAL
+        }
+      ]
+    },
     {
       key: 'newNotExcluded',
       label: 'New Non-Excluded',
@@ -456,6 +492,18 @@ export const defaultState = {
       label: 'Recommended',
       type: filterBuilderTypes.EXACT,
       valueType: filterBuilderValueTypes.BOOL
+    },
+    {
+      name: 'isTrending',
+      label: 'Trending',
+      type: filterBuilderTypes.EXACT,
+      valueType: filterBuilderValueTypes.BOOL
+    },
+    {
+      name: 'isPopular',
+      label: 'Popular',
+      type: filterBuilderTypes.EXACT,
+      valueType: filterBuilderValueTypes.BOOL
     }
   ]
 };

frontend/src/Store/Actions/importMovieActions.js

@@ -66,6 +66,7 @@ export const actionHandlers = handleThunks({
     const {
       name,
       path,
+      relativePath,
       term,
       topOfQueue = false
     } = payload;
@@ -75,6 +76,7 @@ export const actionHandlers = handleThunks({
       id: name,
       term,
       path,
+      relativePath,
       isFetching: false,
       isPopulated: false,
       error: null

frontend/src/Store/Actions/interactiveImportActions.js

@@ -56,6 +56,8 @@ export const defaultState = {
 };
 
 export const persistState = [
+  'interactiveImport.sortKey',
+  'interactiveImport.sortDirection',
   'interactiveImport.recentFolders',
   'interactiveImport.importMode'
 ];

frontend/src/Store/Actions/movieCollectionActions.js

@@ -347,8 +347,9 @@ export const actionHandlers = handleThunks({
       monitored,
       monitor,
       qualityProfileId,
+      minimumAvailability,
       rootFolderPath,
-      minimumAvailability
+      searchOnAdd
     } = payload;
 
     const response = {};
@@ -369,6 +370,10 @@ export const actionHandlers = handleThunks({
       response.minimumAvailability = minimumAvailability;
     }
 
+    if (payload.hasOwnProperty('searchOnAdd')) {
+      response.searchOnAdd = searchOnAdd;
+    }
+
     response.rootFolderPath = rootFolderPath;
     response.collectionIds = collectionIds;
 

src/NzbDrone.Common.Test/ExtensionTests/StringExtensionTests/ReverseFixture.cs

@@ -0,0 +1,17 @@
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Common.Extensions;
+
+namespace NzbDrone.Common.Test.ExtensionTests.StringExtensionTests
+{
+    [TestFixture]
+    public class ReverseFixture
+    {
+        [TestCase("input", "tupni")]
+        [TestCase("racecar", "racecar")]
+        public void should_reverse_string(string input, string expected)
+        {
+            input.Reverse().Should().Be(expected);
+        }
+    }
+}

src/NzbDrone.Common/Extensions/StringExtensions.cs

@@ -219,5 +219,14 @@ namespace NzbDrone.Common.Extensions
         {
             return input.Contains(':') ? $"[{input}]" : input;
         }
+
+        public static string Reverse(this string text)
+        {
+            var array = text.ToCharArray();
+
+            Array.Reverse(array);
+
+            return new string(array);
+        }
     }
 }

src/NzbDrone.Core.Test/Download/CompletedDownloadServiceTests/ImportFixture.cs

@@ -138,7 +138,7 @@ namespace NzbDrone.Core.Test.Download
                                        new LocalMovie { Path = @"C:\TestPath\Droned.1998.mkv" }, new Rejection("Rejected!")), "Test Failure")
                            });
 
-            _trackedDownload.RemoteMovie.Movie = null;
+            _trackedDownload.RemoteMovie.Movie = new Movie();
 
             Subject.Import(_trackedDownload);
 

src/NzbDrone.Core.Test/MediaFiles/MovieImport/Specifications/AlreadyImportedSpecificationFixture.cs

@@ -115,7 +115,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Specifications
 
             GivenHistory(history);
 
-            Subject.IsSatisfiedBy(_localMovie, _downloadClientItem).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(_localMovie, _downloadClientItem).Accepted.Should().BeFalse();
         }
     }
 }

src/NzbDrone.Core.Test/MovieStatsTests/MovieStatisticsFixture.cs

@@ -0,0 +1,113 @@
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Languages;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Movies;
+using NzbDrone.Core.MovieStats;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.MovieStatsTests
+{
+    [TestFixture]
+    public class MovieStatisticsFixture : DbTest<MovieStatisticsRepository, Movie>
+    {
+        private Movie _movie;
+        private MovieFile _movieFile;
+
+        [SetUp]
+        public void Setup()
+        {
+            var movieMetadata = Builder<MovieMetadata>.CreateNew()
+                .With(h => h.TmdbId = 123456)
+                .With(m => m.Runtime = 90)
+                .BuildNew();
+            Db.Insert(movieMetadata);
+
+            _movie = Builder<Movie>.CreateNew()
+                .With(m => m.MovieMetadataId = movieMetadata.Id)
+                .With(e => e.MovieFileId = 0)
+                .With(e => e.Monitored = false)
+                .BuildNew();
+
+            _movie.Id = Db.Insert(_movie).Id;
+
+            _movieFile = Builder<MovieFile>.CreateNew()
+                .With(e => e.MovieId = _movie.Id)
+                .With(e => e.Quality = new QualityModel(Quality.Bluray720p))
+                .With(e => e.Languages = new List<Language> { Language.English })
+                .BuildNew();
+        }
+
+        private void GivenMovieWithFile()
+        {
+            _movie.MovieFileId = 1;
+        }
+
+        private void GivenMonitoredMovie()
+        {
+            _movie.Monitored = true;
+        }
+
+        private void GivenMovieFile()
+        {
+            Db.Insert(_movieFile);
+        }
+
+        [Test]
+        public void should_get_stats_for_movie()
+        {
+            GivenMonitoredMovie();
+
+            var stats = Subject.MovieStatistics();
+
+            stats.Should().HaveCount(1);
+        }
+
+        [Test]
+        public void should_have_size_on_disk_of_zero_when_no_movie_file()
+        {
+            var stats = Subject.MovieStatistics();
+
+            stats.Should().HaveCount(1);
+            stats.First().SizeOnDisk.Should().Be(0);
+        }
+
+        [Test]
+        public void should_have_size_on_disk_when_movie_file_exists()
+        {
+            GivenMovieWithFile();
+            GivenMovieFile();
+
+            var stats = Subject.MovieStatistics();
+
+            stats.Should().HaveCount(1);
+            stats.First().SizeOnDisk.Should().Be(_movieFile.Size);
+        }
+
+        // [Test]
+        // public void should_not_duplicate_size_for_multi_movie_files()
+        // {
+        //     GivenMovieWithFile();
+        //     GivenMovieFile();
+        //
+        //     var movie2 = _movie.JsonClone();
+        //
+        //     var movieMetadata = Builder<MovieMetadata>.CreateNew().With(h => h.TmdbId = 234567).BuildNew();
+        //     Db.Insert(movieMetadata);
+        //
+        //     movie2.Id = 0;
+        //     movie2.MovieMetadataId = movieMetadata.Id;
+        //
+        //     Db.Insert(movie2);
+        //
+        //     var stats = Subject.MovieStatistics();
+        //
+        //     stats.Should().HaveCount(1);
+        //     stats.First().SizeOnDisk.Should().Be(_movieFile.Size);
+        // }
+    }
+}

src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TruncatedMovieTitleFixture.cs

@@ -0,0 +1,56 @@
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.Movies;
+using NzbDrone.Core.Organizer;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
+{
+    [TestFixture]
+
+    public class TruncatedMovieTitleFixture : CoreTest<FileNameBuilder>
+    {
+        private Movie _movie;
+        private NamingConfig _namingConfig;
+
+        [SetUp]
+        public void Setup()
+        {
+            _movie = Builder<Movie>
+                    .CreateNew()
+                    .With(s => s.Title = "Movie Title")
+                    .Build();
+
+            _namingConfig = NamingConfig.Default;
+            _namingConfig.RenameMovies = true;
+
+            Mocker.GetMock<INamingConfigService>()
+                  .Setup(c => c.GetConfig()).Returns(_namingConfig);
+
+            Mocker.GetMock<IQualityDefinitionService>()
+                .Setup(v => v.Get(Moq.It.IsAny<Quality>()))
+                .Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v));
+
+            Mocker.GetMock<ICustomFormatService>()
+                  .Setup(v => v.All())
+                  .Returns(new List<CustomFormat>());
+        }
+
+        [TestCase("{Movie Title:16}", "The Fantastic...")]
+        [TestCase("{Movie TitleThe:17}", "Fantastic Life...")]
+        [TestCase("{Movie CleanTitle:-13}", "...Mr. Sisko")]
+        public void should_truncate_series_title(string format, string expected)
+        {
+            _movie.Title = "The Fantastic Life of Mr. Sisko";
+            _namingConfig.MovieFolderFormat = format;
+
+            var result = Subject.GetMovieFolder(_movie, _namingConfig);
+            result.Should().Be(expected);
+        }
+    }
+}

src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TruncatedReleaseGroupFixture.cs

@@ -0,0 +1,82 @@
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Movies;
+using NzbDrone.Core.Organizer;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
+{
+    [TestFixture]
+
+    public class TruncatedReleaseGroupFixture : CoreTest<FileNameBuilder>
+    {
+        private Movie _movie;
+        private MovieFile _movieFile;
+        private NamingConfig _namingConfig;
+
+        [SetUp]
+        public void Setup()
+        {
+            _movie = Builder<Movie>
+                    .CreateNew()
+                    .With(s => s.Title = "Movie Title")
+                    .With(s => s.Year = 2024)
+                    .Build();
+
+            _namingConfig = NamingConfig.Default;
+            _namingConfig.RenameMovies = true;
+
+            Mocker.GetMock<INamingConfigService>()
+                  .Setup(c => c.GetConfig()).Returns(_namingConfig);
+
+            _movieFile = new MovieFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "RadarrTest" };
+
+            Mocker.GetMock<IQualityDefinitionService>()
+                .Setup(v => v.Get(Moq.It.IsAny<Quality>()))
+                .Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v));
+
+            Mocker.GetMock<ICustomFormatService>()
+                  .Setup(v => v.All())
+                  .Returns(new List<CustomFormat>());
+        }
+
+        private void GivenProper()
+        {
+            _movieFile.Quality.Revision.Version = 2;
+        }
+
+        [Test]
+        public void should_truncate_from_beginning()
+        {
+            _movie.Title = "The Fantastic Life of Mr. Sisko";
+
+            _movieFile.Quality.Quality = Quality.Bluray1080p;
+            _movieFile.ReleaseGroup = "IWishIWasALittleBitTallerIWishIWasABallerIWishIHadAGirlWhoLookedGoodIWouldCallHerIWishIHadARabbitInAHatWithABatAndASixFourImpala";
+            _namingConfig.StandardMovieFormat = "{Movie Title} ({Release Year}) {Quality Full}-{ReleaseGroup:12}";
+
+            var result = Subject.BuildFileName(_movie, _movieFile);
+            result.Length.Should().BeLessOrEqualTo(255);
+            result.Should().Be("The Fantastic Life of Mr. Sisko (2024) Bluray-1080p-IWishIWas...");
+        }
+
+        [Test]
+        public void should_truncate_from_from_end()
+        {
+            _movie.Title = "The Fantastic Life of Mr. Sisko";
+
+            _movieFile.Quality.Quality = Quality.Bluray1080p;
+            _movieFile.ReleaseGroup = "IWishIWasALittleBitTallerIWishIWasABallerIWishIHadAGirlWhoLookedGoodIWouldCallHerIWishIHadARabbitInAHatWithABatAndASixFourImpala";
+            _namingConfig.StandardMovieFormat = "{Movie Title} ({Release Year}) {Quality Full}-{ReleaseGroup:-17}";
+
+            var result = Subject.BuildFileName(_movie, _movieFile);
+            result.Length.Should().BeLessOrEqualTo(255);
+            result.Should().Be("The Fantastic Life of Mr. Sisko (2024) Bluray-1080p-...ASixFourImpala");
+        }
+    }
+}