diff --git a/frontend/src/Activity/Queue/QueueOptions.js b/frontend/src/Activity/Queue/QueueOptions.js
index 63a1fc4228..adf0c25b19 100644
--- a/frontend/src/Activity/Queue/QueueOptions.js
+++ b/frontend/src/Activity/Queue/QueueOptions.js
@@ -61,7 +61,7 @@ class QueueOptions extends Component {
             type={inputTypes.CHECK}
             name="includeUnknownMovieItems"
             value={includeUnknownMovieItems}
-            helpText={translate('ShownUnknownMovieItemsHelpText')}
+            helpText={translate('ShowUnknownMovieItemsHelpText')}
             onChange={this.onOptionChange}
           />
         </FormGroup>
diff --git a/frontend/src/Activity/Queue/TimeleftCell.js b/frontend/src/Activity/Queue/TimeleftCell.js
index 5677af2ee5..ab1134b8c4 100644
--- a/frontend/src/Activity/Queue/TimeleftCell.js
+++ b/frontend/src/Activity/Queue/TimeleftCell.js
@@ -41,7 +41,7 @@ function TimeleftCell(props) {
     return (
       <TableRowCell
         className={styles.timeleft}
-        title={translate('RetryingDownload', { date, time })}
+        title={translate('RetryingDownloadOn', { date, time })}
       >
         -
       </TableRowCell>
diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.js b/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.js
index 4408c87b3a..5214632a50 100644
--- a/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.js
+++ b/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.js
@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import TagInputTag from 'Components/Form/TagInputTag';
 import { kinds } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
 import styles from './FilterBuilderRowValueTag.css';
 
 function FilterBuilderRowValueTag(props) {
@@ -15,10 +16,11 @@ function FilterBuilderRowValueTag(props) {
       />
 
       {
-        !props.isLastTag &&
-          <span className={styles.or}>
-            or
-          </span>
+        props.isLastTag ?
+          null :
+          <div className={styles.or}>
+            {translate('Or')}
+          </div>
       }
     </span>
   );
diff --git a/frontend/src/Components/Form/UMaskInput.js b/frontend/src/Components/Form/UMaskInput.js
index 6480d80841..dcbee09ec3 100644
--- a/frontend/src/Components/Form/UMaskInput.js
+++ b/frontend/src/Components/Form/UMaskInput.js
@@ -102,7 +102,7 @@ class UMaskInput extends Component {
         </div>
         <div className={styles.details}>
           <div>
-            <label>{translate('UMask')}</label>
+            <label>{translate('Umask')}</label>
             <div className={styles.value}>{umask}</div>
           </div>
           <div>
diff --git a/frontend/src/Components/Table/TableOptions/TableOptionsModal.js b/frontend/src/Components/Table/TableOptions/TableOptionsModal.js
index 80613de689..42961676f5 100644
--- a/frontend/src/Components/Table/TableOptions/TableOptionsModal.js
+++ b/frontend/src/Components/Table/TableOptions/TableOptionsModal.js
@@ -51,9 +51,9 @@ class TableOptionsModal extends Component {
     let pageSizeError = null;
 
     if (value < 5) {
-      pageSizeError = 'Page size must be at least 5';
+      pageSizeError = translate('TablePageSizeMinimum', { minimumValue: '5' });
     } else if (value > 250) {
-      pageSizeError = 'Page size must not exceed 250';
+      pageSizeError = translate('TablePageSizeMaximum', { maximumValue: '250' });
     } else {
       this.props.onTableOptionChange({ pageSize: value });
     }
@@ -145,13 +145,13 @@ class TableOptionsModal extends Component {
                     {
                       hasPageSize ?
                         <FormGroup>
-                          <FormLabel>{translate('PageSize')}</FormLabel>
+                          <FormLabel>{translate('TablePageSize')}</FormLabel>
 
                           <FormInputGroup
                             type={inputTypes.NUMBER}
                             name="pageSize"
                             value={pageSize || 0}
-                            helpText={translate('PageSizeHelpText')}
+                            helpText={translate('TablePageSizeHelpText')}
                             errors={pageSizeError ? [{ message: pageSizeError }] : undefined}
                             onChange={this.onPageSizeChange}
                           />
diff --git a/frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContent.js b/frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContent.js
index 5e26588015..d6cf2feb05 100644
--- a/frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContent.js
+++ b/frontend/src/Settings/CustomFormats/CustomFormats/ImportCustomFormatModalContent.js
@@ -106,7 +106,7 @@ class ImportCustomFormatModalContent extends Component {
                 <Form>
                   <FormGroup size={sizes.MEDIUM}>
                     <FormLabel>
-                      {translate('CustomFormatJSON')}
+                      {translate('CustomFormatJson')}
                     </FormLabel>
                     <FormInputGroup
                       key={0}
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index e3bb7a7788..27808952b0 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -203,7 +203,7 @@
   "CustomFilters": "Custom Filters",
   "CustomFormat": "Custom Format",
   "CustomFormatHelpText": "Radarr scores each release using the sum of scores for matching custom formats. If a new release would improve the score, at the same or better quality, then Radarr will grab it.",
-  "CustomFormatJSON": "Custom Format JSON",
+  "CustomFormatJson": "Custom Format JSON",
   "CustomFormatScore": "Custom Format Score",
   "CustomFormatUnknownCondition": "Unknown Custom Format condition '{0}'",
   "CustomFormatUnknownConditionOption": "Unknown option '{0}' for condition '{1}'",
@@ -771,6 +771,7 @@
   "OpenBrowserOnStart": "Open browser on start",
   "OpenThisModal": "Open This Modal",
   "Options": "Options",
+  "Or": "or",
   "Organize": "Organize",
   "OrganizeAndRename": "Organize & Rename",
   "OrganizeConfirm": "Are you sure you want to organize all files in the {count} selected movie(s)?",
@@ -791,8 +792,6 @@
   "Overview": "Overview",
   "OverviewOptions": "Overview Options",
   "PackageVersion": "Package Version",
-  "PageSize": "Page Size",
-  "PageSizeHelpText": "Number of items to show on each page",
   "Parse": "Parse",
   "ParseModalErrorParsing": "Error parsing, please try again.",
   "ParseModalHelpText": "Enter a release title in the input above",
@@ -1114,9 +1113,9 @@
   "ShowTmdbRating": "Show TMDb Rating",
   "ShowTmdbRatingHelpText": "Show TMDb rating under poster",
   "ShowUnknownMovieItems": "Show Unknown Movie Items",
+  "ShowUnknownMovieItemsHelpText": "Show items without a movie in the queue. This could include removed movies or anything else in Radarr's category",
   "ShowYear": "Show Year",
   "ShownClickToHide": "Shown, click to hide",
-  "ShownUnknownMovieItemsHelpText": "Show items without a movie in the queue. This could include removed movies or anything else in Radarr's category",
   "Shutdown": "Shutdown",
   "Size": "Size",
   "SizeLimit": "Size Limit",
@@ -1159,6 +1158,10 @@
   "TableOptions": "Table Options",
   "TableOptionsButton": "Table Options Button",
   "TableOptionsColumnsMessage": "Choose which columns are visible and which order they appear in",
+  "TablePageSize": "Page Size",
+  "TablePageSizeHelpText": "Number of items to show on each page",
+  "TablePageSizeMaximum": "Page size must not exceed {maximumValue}",
+  "TablePageSizeMinimum": "Page size must be at least {minimumValue}",
   "TagCannotBeDeletedWhileInUse": "Cannot be deleted while in use",
   "TagDetails": "Tag Details - {label}",
   "TagIsNotUsedAndCanBeDeleted": "Tag is not used and can be deleted",
@@ -1208,8 +1211,8 @@
   "UILanguageHelpTextWarning": "Browser Reload Required",
   "UISettings": "UI Settings",
   "UISettingsSummary": "Calendar, date and color impaired options",
-  "UMask": "UMask",
   "URLBase": "URL Base",
+  "Umask": "Umask",
   "UnableToAddANewConditionPleaseTryAgain": "Unable to add a new condition, please try again.",
   "UnableToAddANewCustomFormatPleaseTryAgain": "Unable to add a new custom format, please try again.",
   "UnableToAddANewDownloadClientPleaseTryAgain": "Unable to add a new download client, please try again.",