From 28dee7bc0164c05cb9028c8f4ada317349f34aa8 Mon Sep 17 00:00:00 2001
From: Bogdan <mynameisbogdan@users.noreply.github.com>
Date: Fri, 7 Mar 2025 15:52:23 +0200
Subject: [PATCH] Convert MoveMovieModal to TypeScript

Co-authored-by: Mark McDowall <mark@mcdowall.ca>
---
 .../src/Movie/MoveMovie/MoveMovieModal.css    |  4 +
 .../Movie/MoveMovie/MoveMovieModal.css.d.ts   |  1 +
 .../src/Movie/MoveMovie/MoveMovieModal.js     | 93 -------------------
 .../src/Movie/MoveMovie/MoveMovieModal.tsx    | 82 ++++++++++++++++
 src/NzbDrone.Core/Localization/Core/ar.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/bg.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/ca.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/cs.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/da.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/de.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/el.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/en.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/es.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/fi.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/fr.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/he.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/hi.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/hu.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/is.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/it.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/ja.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/ko.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/nl.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/pl.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/pt.json   | 10 +-
 .../Localization/Core/pt_BR.json              | 10 +-
 src/NzbDrone.Core/Localization/Core/ro.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/ru.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/sv.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/th.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/tr.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/uk.json   | 10 +-
 src/NzbDrone.Core/Localization/Core/vi.json   | 10 +-
 .../Localization/Core/zh_CN.json              | 10 +-
 34 files changed, 237 insertions(+), 243 deletions(-)
 delete mode 100644 frontend/src/Movie/MoveMovie/MoveMovieModal.js
 create mode 100644 frontend/src/Movie/MoveMovie/MoveMovieModal.tsx

diff --git a/frontend/src/Movie/MoveMovie/MoveMovieModal.css b/frontend/src/Movie/MoveMovie/MoveMovieModal.css
index c1e247a50c..c7d8b1ed1d 100644
--- a/frontend/src/Movie/MoveMovie/MoveMovieModal.css
+++ b/frontend/src/Movie/MoveMovie/MoveMovieModal.css
@@ -3,3 +3,7 @@
 
   margin-right: auto;
 }
+
+.folderRenameMessage {
+  margin-top: 20px;
+}
diff --git a/frontend/src/Movie/MoveMovie/MoveMovieModal.css.d.ts b/frontend/src/Movie/MoveMovie/MoveMovieModal.css.d.ts
index 0475f5a86d..3fa13ff663 100644
--- a/frontend/src/Movie/MoveMovie/MoveMovieModal.css.d.ts
+++ b/frontend/src/Movie/MoveMovie/MoveMovieModal.css.d.ts
@@ -2,6 +2,7 @@
 // Please do not change this file!
 interface CssExports {
   'doNotMoveButton': string;
+  'folderRenameMessage': string;
 }
 export const cssExports: CssExports;
 export default cssExports;
diff --git a/frontend/src/Movie/MoveMovie/MoveMovieModal.js b/frontend/src/Movie/MoveMovie/MoveMovieModal.js
deleted file mode 100644
index c395561bb1..0000000000
--- a/frontend/src/Movie/MoveMovie/MoveMovieModal.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Button from 'Components/Link/Button';
-import Modal from 'Components/Modal/Modal';
-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, sizes } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import styles from './MoveMovieModal.css';
-
-function MoveMovieModal(props) {
-  const {
-    originalPath,
-    destinationPath,
-    destinationRootFolder,
-    isOpen,
-    onModalClose,
-    onSavePress,
-    onMoveMoviePress
-  } = props;
-
-  if (
-    isOpen &&
-    !originalPath &&
-    !destinationPath &&
-    !destinationRootFolder
-  ) {
-    console.error('orginalPath and destinationPath OR destinationRootFolder must be provided');
-  }
-
-  return (
-    <Modal
-      isOpen={isOpen}
-      size={sizes.MEDIUM}
-      closeOnBackgroundClick={false}
-      onModalClose={onModalClose}
-    >
-      <ModalContent
-        showCloseButton={true}
-        onModalClose={onModalClose}
-      >
-        <ModalHeader>
-          {translate('MoveFiles')}
-        </ModalHeader>
-
-        <ModalBody>
-          {
-            destinationRootFolder ?
-              translate('MoveFolders1', [destinationRootFolder]) :
-              translate('MoveFolders2', [originalPath, destinationPath])
-          }
-          {
-            destinationRootFolder ?
-              <div>
-                {translate('FolderMoveRenameWarning')}
-              </div> :
-              null
-          }
-        </ModalBody>
-
-        <ModalFooter>
-          <Button
-            className={styles.doNotMoveButton}
-            onPress={onSavePress}
-          >
-            {translate('NoMoveFilesSelf')}
-          </Button>
-
-          <Button
-            kind={kinds.DANGER}
-            onPress={onMoveMoviePress}
-          >
-            {translate('YesMoveFiles')}
-          </Button>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  );
-}
-
-MoveMovieModal.propTypes = {
-  originalPath: PropTypes.string,
-  destinationPath: PropTypes.string,
-  destinationRootFolder: PropTypes.string,
-  isOpen: PropTypes.bool.isRequired,
-  onModalClose: PropTypes.func.isRequired,
-  onSavePress: PropTypes.func.isRequired,
-  onMoveMoviePress: PropTypes.func.isRequired
-};
-
-export default MoveMovieModal;
diff --git a/frontend/src/Movie/MoveMovie/MoveMovieModal.tsx b/frontend/src/Movie/MoveMovie/MoveMovieModal.tsx
new file mode 100644
index 0000000000..75d0764b4c
--- /dev/null
+++ b/frontend/src/Movie/MoveMovie/MoveMovieModal.tsx
@@ -0,0 +1,82 @@
+import React from 'react';
+import Button from 'Components/Link/Button';
+import Modal from 'Components/Modal/Modal';
+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, sizes } from 'Helpers/Props';
+import translate from 'Utilities/String/translate';
+import styles from './MoveMovieModal.css';
+
+interface MoveMovieModalProps {
+  originalPath?: string;
+  destinationPath?: string;
+  destinationRootFolder?: string;
+  isOpen: boolean;
+  onModalClose: () => void;
+  onSavePress: () => void;
+  onMoveMoviePress: () => void;
+}
+
+function MoveMovieModal({
+  originalPath,
+  destinationPath,
+  destinationRootFolder,
+  isOpen,
+  onModalClose,
+  onSavePress,
+  onMoveMoviePress,
+}: MoveMovieModalProps) {
+  if (isOpen && !originalPath && !destinationPath && !destinationRootFolder) {
+    console.error(
+      'originalPath and destinationPath OR destinationRootFolder must be provided'
+    );
+  }
+
+  return (
+    <Modal
+      isOpen={isOpen}
+      size={sizes.MEDIUM}
+      closeOnBackgroundClick={false}
+      onModalClose={onModalClose}
+    >
+      <ModalContent showCloseButton={true} onModalClose={onModalClose}>
+        <ModalHeader>{translate('MoveFiles')}</ModalHeader>
+
+        <ModalBody>
+          {destinationRootFolder
+            ? translate('MoveMovieFoldersToRootFolder', {
+                destinationRootFolder,
+              })
+            : null}
+
+          {originalPath && destinationPath
+            ? translate('MoveMovieFoldersToNewPath', {
+                originalPath,
+                destinationPath,
+              })
+            : null}
+
+          {destinationRootFolder ? (
+            <div className={styles.folderRenameMessage}>
+              {translate('MoveMovieFoldersRenameFolderWarning')}
+            </div>
+          ) : null}
+        </ModalBody>
+
+        <ModalFooter>
+          <Button className={styles.doNotMoveButton} onPress={onSavePress}>
+            {translate('MoveMovieFoldersDontMoveFiles')}
+          </Button>
+
+          <Button kind={kinds.DANGER} onPress={onMoveMoviePress}>
+            {translate('MoveMovieFoldersMoveFiles')}
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  );
+}
+
+export default MoveMovieModal;
diff --git a/src/NzbDrone.Core/Localization/Core/ar.json b/src/NzbDrone.Core/Localization/Core/ar.json
index 3b2f1d19f7..c6beb3ee5d 100644
--- a/src/NzbDrone.Core/Localization/Core/ar.json
+++ b/src/NzbDrone.Core/Localization/Core/ar.json
@@ -1,7 +1,7 @@
 {
     "YouCanAlsoSearch": "يمكنك أيضًا البحث باستخدام معرف TMDb أو معرف IMDb للفيلم. على سبيل المثال \"tmdb: 71663\"",
     "Yesterday": "في الامس",
-    "YesMoveFiles": "نعم ، انقل الملفات",
+    "MoveMovieFoldersMoveFiles": "نعم ، انقل الملفات",
     "YesCancel": "نعم إلغاء",
     "Year": "عام",
     "WouldYouLikeToRestoreBackup": "هل ترغب في استعادة النسخة الاحتياطية {0}؟",
@@ -250,7 +250,7 @@
     "NoResultsFound": "لم يتم العثور على نتائج",
     "None": "لا شيء",
     "NoMoviesExist": "لم يتم العثور على أفلام ، للبدء ، ستحتاج إلى إضافة فيلم جديد أو استيراد بعض الأفلام الموجودة.",
-    "NoMoveFilesSelf": " لا ، سأقوم بنقل الملفات بنفسي",
+    "MoveMovieFoldersDontMoveFiles": " لا ، سأقوم بنقل الملفات بنفسي",
     "NoMinimumForAnyRuntime": "لا يوجد حد أدنى لأي وقت تشغيل",
     "NoMatchFound": "لا يوجد تطابق!",
     "NoLogFiles": "لا توجد ملفات سجل",
@@ -421,7 +421,7 @@
     "Forecast": "توقعات",
     "FollowPerson": "اتبع الشخص",
     "Folders": "المجلدات",
-    "FolderMoveRenameWarning": "سيؤدي هذا أيضًا إلى إعادة تسمية مجلد الفيلم لكل تنسيق مجلد الفيلم في الإعدادات.",
+    "MoveMovieFoldersRenameFolderWarning": "سيؤدي هذا أيضًا إلى إعادة تسمية مجلد الفيلم لكل تنسيق مجلد الفيلم في الإعدادات.",
     "Folder": "مجلد",
     "FocusSearchBox": "التركيز على مربع البحث",
     "Fixed": "ثابت",
@@ -829,8 +829,8 @@
     "MovieChat": "دردشة الفيلم",
     "MovieAlreadyExcluded": "الفيلم مستبعد بالفعل",
     "Movie": "فيلم",
-    "MoveFolders2": "هل تريد نقل ملفات الأفلام من \"{0}\" إلى \"{1}\"؟",
-    "MoveFolders1": "هل تريد نقل مجلدات الفيلم إلى \"{0}\"؟",
+    "MoveMovieFoldersToNewPath": "هل تريد نقل ملفات الأفلام من \"{0}\" إلى \"{1}\"؟",
+    "MoveMovieFoldersToRootFolder": "هل تريد نقل مجلدات الفيلم إلى \"{0}\"؟",
     "MoveFiles": "نقل الملفات",
     "MountMovieHealthCheckMessage": "تم تثبيت الحامل الذي يحتوي على مسار فيلم للقراءة فقط: ",
     "MoreInfo": "مزيد من المعلومات",
diff --git a/src/NzbDrone.Core/Localization/Core/bg.json b/src/NzbDrone.Core/Localization/Core/bg.json
index 440f130858..0ed5845151 100644
--- a/src/NzbDrone.Core/Localization/Core/bg.json
+++ b/src/NzbDrone.Core/Localization/Core/bg.json
@@ -239,7 +239,7 @@
     "Fixed": "Фиксирана",
     "FocusSearchBox": "Фокусно поле за търсене",
     "Folder": "Папка",
-    "FolderMoveRenameWarning": "Това също ще преименува папката с филм във формата на папката с филм в настройките.",
+    "MoveMovieFoldersRenameFolderWarning": "Това също ще преименува папката с филм във формата на папката с филм в настройките.",
     "Folders": "Папки",
     "FollowPerson": "Следвайте човек",
     "Forecast": "Прогноза",
@@ -355,7 +355,7 @@
     "MonitorMovie": "Монитор на филм",
     "Months": "Месеци",
     "MoreInfo": "Повече информация",
-    "MoveFolders1": "Искате ли да преместите папките с филми в „{0}“?",
+    "MoveMovieFoldersToRootFolder": "Искате ли да преместите папките с филми в „{0}“?",
     "Movie": "Филм",
     "MovieAlreadyExcluded": "Филмът вече е изключен",
     "MovieChat": "Чат за филми",
@@ -662,13 +662,13 @@
     "WouldYouLikeToRestoreBackup": "Искате ли да възстановите архива {0}?",
     "Year": "Година",
     "YesCancel": "Да, Отказ",
-    "YesMoveFiles": "Да, премести файловете",
+    "MoveMovieFoldersMoveFiles": "Да, премести файловете",
     "Yesterday": "Вчера",
     "YouCanAlsoSearch": "Можете също да търсите с помощта на TMDb ID или IMDb ID на филм. напр. `tmdb: 71663`",
     "MaintenanceRelease": "Издание за поддръжка: поправки на грешки и други подобрения. Вижте История на комисиите на Github за повече подробности",
     "MissingMonitoredAndConsideredAvailable": "Липсва (Мониториран)",
     "MissingNotMonitored": "Липсва (без наблюдение)",
-    "MoveFolders2": "Искате ли да преместите филмовите файлове от „{0}“ в „{1}“?",
+    "MoveMovieFoldersToNewPath": "Искате ли да преместите филмовите файлове от „{0}“ в „{1}“?",
     "MovieDetailsPreviousMovie": "Подробности за филма: Предишен филм",
     "MovieEditor": "Редактор на филми",
     "MovieExcludedFromAutomaticAdd": "Филмът е изключен от автоматично добавяне",
@@ -829,7 +829,7 @@
     "PendingChangesDiscardChanges": "Изхвърлете промените и оставете",
     "PendingChangesStayReview": "Останете и прегледайте промените",
     "Password": "Парола",
-    "NoMoveFilesSelf": " Не, сам ще преместя досиетата",
+    "MoveMovieFoldersDontMoveFiles": " Не, сам ще преместя досиетата",
     "ShowGenres": "Показване на жанрове",
     "SuggestTranslationChange": "Предложете промяна на превода",
     "NoMoviesExist": "Не са намерени филми, за да започнете, ще искате да добавите нов филм или да импортирате някои съществуващи.",
diff --git a/src/NzbDrone.Core/Localization/Core/ca.json b/src/NzbDrone.Core/Localization/Core/ca.json
index a3d297c3f3..3ed5fa74fd 100644
--- a/src/NzbDrone.Core/Localization/Core/ca.json
+++ b/src/NzbDrone.Core/Localization/Core/ca.json
@@ -92,8 +92,8 @@
     "InteractiveImport": "Importació interactiva",
     "MaximumSize": "Mida màxima",
     "MaximumSizeHelpText": "Mida màxima per a una versió que es pot capturar en MB. Establiu a zero per a establir-lo en il·limitat",
-    "MoveFolders1": "Voleu moure les carpetes de pel·lícules a '{0}'?",
-    "MoveFolders2": "Voleu moure els fitxers de la pel·lícula de '{0}' a '{1}'?",
+    "MoveMovieFoldersToRootFolder": "Voleu moure les carpetes de pel·lícules a '{0}'?",
+    "MoveMovieFoldersToNewPath": "Voleu moure els fitxers de la pel·lícula de '{0}' a '{1}'?",
     "MovieEditor": "Editor de pel·lícules",
     "MovieFilesTotaling": "Total de fitxers de pel·lícules",
     "MovieFolderFormat": "Format de carpeta de pel·lícules",
@@ -501,7 +501,7 @@
     "FileNameTokens": "Testimonis de nom de fitxer",
     "Files": "Fitxers",
     "FocusSearchBox": "Posa el focus a la caixa de cerca",
-    "FolderMoveRenameWarning": "Això també reanomenarà la carpeta de pel·lícules segons el format de la carpeta de pel·lícules a la configuració.",
+    "MoveMovieFoldersRenameFolderWarning": "Això també reanomenarà la carpeta de pel·lícules segons el format de la carpeta de pel·lícules a la configuració.",
     "Forecast": "Previsió",
     "Formats": "Formats",
     "SupportedDownloadClientsMoreInfo": "Per a obtenir més informació sobre els clients de baixada individuals, feu clic als botons de més informació.",
@@ -629,7 +629,7 @@
     "NoLogFiles": "No hi ha fitxers de registre",
     "NoMatchFound": "No s'ha trobat cap coincidència!",
     "NoMinimumForAnyRuntime": "No hi ha mínim per a cap temps d'execució",
-    "NoMoveFilesSelf": " No, moure els fitxers jo mateix",
+    "MoveMovieFoldersDontMoveFiles": " No, moure els fitxers jo mateix",
     "NoMoviesExist": "No s'han trobat pel·lícules, per a començar, podeu afegir una pel·lícula nova o importar-ne algunes existents.",
     "None": "Cap",
     "NoResultsFound": "Sense resultats",
@@ -936,7 +936,7 @@
     "WhitelistedSubtitleTags": "Etiquetes de subtítols a la llista blanca",
     "Wiki": "Wiki",
     "WouldYouLikeToRestoreBackup": "Voleu restaurar la còpia de seguretat '{name}'?",
-    "YesMoveFiles": "Si, mou els fitxers",
+    "MoveMovieFoldersMoveFiles": "Si, mou els fitxers",
     "Yesterday": "Ahir",
     "Agenda": "Agenda",
     "InstanceName": "Nom de la instància",
diff --git a/src/NzbDrone.Core/Localization/Core/cs.json b/src/NzbDrone.Core/Localization/Core/cs.json
index 5922d51392..f475106816 100644
--- a/src/NzbDrone.Core/Localization/Core/cs.json
+++ b/src/NzbDrone.Core/Localization/Core/cs.json
@@ -251,7 +251,7 @@
     "NextExecution": "Další spuštění",
     "NoAlternativeTitles": "Žádné alternativní tituly.",
     "NoMinimumForAnyRuntime": "Žádné minimum za běhu",
-    "NoMoveFilesSelf": " Ne, přesunu soubory sám",
+    "MoveMovieFoldersDontMoveFiles": " Ne, přesunu soubory sám",
     "NoMoviesExist": "Nebyly nalezeny žádné filmy. Chcete-li začít, budete chtít přidat nový film nebo importovat některé stávající.",
     "DatabaseMigration": "Migrace databáze",
     "ImportExtraFiles": "Importujte další soubory",
@@ -588,7 +588,7 @@
     "FirstDayOfWeek": "První den v týdnu",
     "FocusSearchBox": "Zaostřovací vyhledávací pole",
     "Folder": "Složka",
-    "FolderMoveRenameWarning": "Tím se také přejmenuje složka filmu na formát složky filmu v nastavení.",
+    "MoveMovieFoldersRenameFolderWarning": "Tím se také přejmenuje složka filmu na formát složky filmu v nastavení.",
     "Folders": "Složky",
     "FollowPerson": "Sledujte osobu",
     "Forecast": "Předpověď",
@@ -687,7 +687,7 @@
     "MonitorMovie": "Monitorujte film",
     "Months": "Měsíce",
     "MoreInfo": "Více informací",
-    "MoveFolders1": "Chcete přesunout složky filmu do složky „{0}“?",
+    "MoveMovieFoldersToRootFolder": "Chcete přesunout složky filmu do složky „{0}“?",
     "Movie": "Film",
     "MovieAlreadyExcluded": "Film je již vyloučen",
     "MovieChat": "Filmový chat",
@@ -933,13 +933,13 @@
     "WouldYouLikeToRestoreBackup": "Chcete obnovit zálohu {0}?",
     "Year": "Rok",
     "YesCancel": "Ano, zrušit",
-    "YesMoveFiles": "Ano, přesuňte soubory",
+    "MoveMovieFoldersMoveFiles": "Ano, přesuňte soubory",
     "Yesterday": "Včera",
     "YouCanAlsoSearch": "Můžete také hledat pomocí ID TMDb nebo IMDb ID filmu. např. `tmdb: 71663`",
     "MaintenanceRelease": "Údržbové vydání: opravy chyb a další vylepšení. Další podrobnosti najdete v GitHub Commit History",
     "MissingMonitoredAndConsideredAvailable": "Chybí (sledováno)",
     "MissingNotMonitored": "Chybí (nesledováno)",
-    "MoveFolders2": "Chcete přesunout filmové soubory z „{0}“ do „{1}“?",
+    "MoveMovieFoldersToNewPath": "Chcete přesunout filmové soubory z „{0}“ do „{1}“?",
     "MovieEditor": "Editor filmů",
     "MovieExcludedFromAutomaticAdd": "Film je vyloučen z automatického přidání",
     "Search": "Vyhledávání",
diff --git a/src/NzbDrone.Core/Localization/Core/da.json b/src/NzbDrone.Core/Localization/Core/da.json
index ad11842ece..2e844c7a07 100644
--- a/src/NzbDrone.Core/Localization/Core/da.json
+++ b/src/NzbDrone.Core/Localization/Core/da.json
@@ -271,7 +271,7 @@
     "NoEventsFound": "Ingen begivenheder fundet",
     "NoLinks": "Ingen links",
     "NoMinimumForAnyRuntime": "Intet minimum for enhver driftstid",
-    "NoMoveFilesSelf": " Nej, jeg flytter filerne selv",
+    "MoveMovieFoldersDontMoveFiles": " Nej, jeg flytter filerne selv",
     "NoMoviesExist": "Ingen film fundet. For at komme i gang vil du tilføje en ny film eller importere nogle eksisterende.",
     "None": "Ingen",
     "NoResultsFound": "Ingen resultater fundet",
@@ -569,7 +569,7 @@
     "FilterPlaceHolder": "Søg i film",
     "Fixed": "Fast",
     "FocusSearchBox": "Fokus søgefelt",
-    "FolderMoveRenameWarning": "Dette omdøber også filmmappen i henhold til filmmappens format i indstillingerne.",
+    "MoveMovieFoldersRenameFolderWarning": "Dette omdøber også filmmappen i henhold til filmmappens format i indstillingerne.",
     "Folders": "Mapper",
     "FollowPerson": "Følg Person",
     "Forecast": "Vejrudsigt",
@@ -649,7 +649,7 @@
     "MonitorMovie": "Overvåg film",
     "Months": "Måneder",
     "MoreInfo": "Mere info",
-    "MoveFolders1": "Vil du flytte filmmapperne til '{0}'?",
+    "MoveMovieFoldersToRootFolder": "Vil du flytte filmmapperne til '{0}'?",
     "Movie": "Film",
     "MovieAlreadyExcluded": "Film allerede ekskluderet",
     "MovieChat": "Filmchat",
@@ -933,13 +933,13 @@
     "WouldYouLikeToRestoreBackup": "Vil du gendanne sikkerhedskopien »{name}«?",
     "Year": "År",
     "YesCancel": "Ja, Annuller",
-    "YesMoveFiles": "Ja, flyt filerne",
+    "MoveMovieFoldersMoveFiles": "Ja, flyt filerne",
     "Yesterday": "I går",
     "YouCanAlsoSearch": "Du kan også søge ved hjælp af TMDb ID eller IMDb ID for en film. f.eks. `tmdb: 71663`",
     "MaintenanceRelease": "Vedligeholdelsesfrigivelse: fejlrettelser og andre forbedringer. Se Github Commit History for flere detaljer",
     "MissingMonitoredAndConsideredAvailable": "Mangler (overvåges)",
     "MissingNotMonitored": "Mangler (ikke overvåget)",
-    "MoveFolders2": "Vil du flytte filmfilerne fra '{0}' til '{1}'?",
+    "MoveMovieFoldersToNewPath": "Vil du flytte filmfilerne fra '{0}' til '{1}'?",
     "MovieDetailsPreviousMovie": "Filmdetaljer: Forrige film",
     "MovieEditor": "Filmredaktør",
     "MovieExcludedFromAutomaticAdd": "Film ekskluderet fra automatisk tilføjelse",
diff --git a/src/NzbDrone.Core/Localization/Core/de.json b/src/NzbDrone.Core/Localization/Core/de.json
index f042ab0906..e8aff45e62 100644
--- a/src/NzbDrone.Core/Localization/Core/de.json
+++ b/src/NzbDrone.Core/Localization/Core/de.json
@@ -760,7 +760,7 @@
     "ChmodFolderHelpText": "Oktal, angewendet beim Importieren/Umbenennen auf Medienordner und -dateien (ohne Ausführungsbits)",
     "ChmodFolder": "chmod Ordner",
     "FileNameTokens": "Dateinamen Token",
-    "YesMoveFiles": "Ja, Dateien verschieben",
+    "MoveMovieFoldersMoveFiles": "Ja, Dateien verschieben",
     "WouldYouLikeToRestoreBackup": "Willst du das Backup '{name}' wiederherstellen?",
     "Wiki": "Wiki",
     "WhatsNew": "Was gibt's Neues?",
@@ -834,7 +834,7 @@
     "NoResultsFound": "Keine Ergebnisse gefunden",
     "None": "Keine",
     "NoMoviesExist": "Keine Filme gefunden. Zum Starten solltest du einen Film hinzufügen oder vorhandene Importieren.",
-    "NoMoveFilesSelf": " Nein, Dateien selbst verschieben",
+    "MoveMovieFoldersDontMoveFiles": " Nein, Dateien selbst verschieben",
     "NoListRecommendations": "Keine Listeneinträge oder Empfehlungen gefunden. Zum Start solltest du einen Film hinzufügen, vorhandene importieren oder eine Liste hinzufügen.",
     "NoLinks": "Keine Links",
     "NoEventsFound": "Keine Ereignisse gefunden",
@@ -846,7 +846,7 @@
     "MovieInvalidFormat": "Film: Ungütiges Format",
     "MovieFilesTotaling": "Filmdateien insgesamt",
     "MovieChat": "Filmchat",
-    "MoveFolders1": "Wilst du die Filmordner nach '{0}' verschieben ?",
+    "MoveMovieFoldersToRootFolder": "Wilst du die Filmordner nach '{0}' verschieben ?",
     "Months": "Monate",
     "MonitoredStatus": "Überwacht/Status",
     "Monday": "Montag",
@@ -876,7 +876,7 @@
     "HttpHttps": "HTTP(S)",
     "Hours": "Stunden",
     "HomePage": "Hauptseite",
-    "FolderMoveRenameWarning": "Dies wird auch den Filmordner nach dem Filmordnerformat aus den Einstellungen umbenennen.",
+    "MoveMovieFoldersRenameFolderWarning": "Dies wird auch den Filmordner nach dem Filmordnerformat aus den Einstellungen umbenennen.",
     "FeatureRequests": "Feature Anfragen",
     "FailedToLoadMovieFromAPI": "Film konnte nicht über die API geladen werden",
     "ExternalUpdater": "{appName} ist so konfiguriert, dass es einen externen Aktualisierungsmechanismus verwendet",
@@ -931,7 +931,7 @@
     "AddDelayProfile": "Verzögerungsprofil hinzufügen",
     "Add": "Hinzufügen",
     "RequiredRestrictionHelpText": "Das Release mus mindesten eines der Begriffe beinhalten ( Groß-/Kleinschreibung wird nicht beachtet )",
-    "MoveFolders2": "Bist du sicher, dass du die Filmdateien von '{0}' nach '{1}' verschieben willst ?",
+    "MoveMovieFoldersToNewPath": "Bist du sicher, dass du die Filmdateien von '{0}' nach '{1}' verschieben willst ?",
     "ImportLibrary": "Importieren",
     "ImportNotForDownloads": "Benutze dies NICHT um abgeschlossene Downloads deines Download Clients hinzuzufügen. Dies ist NUR für vorhandene organisierte Mediatheken und nicht für unsortierte Dateien.",
     "SqliteVersionCheckUpgradeRequiredMessage": "Die derzeit installierte SQLite-Version {0} wird nicht mehr unterstützt. Bitte aktualisieren Sie SQLite auf mindestens Version {1}.",
diff --git a/src/NzbDrone.Core/Localization/Core/el.json b/src/NzbDrone.Core/Localization/Core/el.json
index 9999afe3c2..8ff5b110ff 100644
--- a/src/NzbDrone.Core/Localization/Core/el.json
+++ b/src/NzbDrone.Core/Localization/Core/el.json
@@ -121,7 +121,7 @@
     "ImportListsSettingsSummary": "Εισαγωγή λιστών, εξαιρέσεις λίστας",
     "ManualImportSelectMovie": "Μη αυτόματη εισαγωγή - Επιλέξτε ταινία",
     "MoreInfo": "Περισσότερες πληροφορίες",
-    "MoveFolders1": "Θέλετε να μετακινήσετε τους φακέλους της ταινίας στο \"{0}\";",
+    "MoveMovieFoldersToRootFolder": "Θέλετε να μετακινήσετε τους φακέλους της ταινίας στο \"{0}\";",
     "MultiLanguage": "Πολλαπλών γλωσσών",
     "NoListRecommendations": "Δεν βρέθηκαν στοιχεία λίστας ή προτάσεις, για να ξεκινήσετε θα θέλετε να προσθέσετε μια νέα ταινία, να εισαγάγετε ορισμένες υπάρχουσες ή να προσθέσετε μια λίστα.",
     "PreferIndexerFlagsHelpText": "Προτεραιότητα στις κυκλοφορίες με ειδικές σημαίες",
@@ -261,7 +261,7 @@
     "NoEventsFound": "Δεν βρέθηκαν συμβάντα",
     "NoLinks": "Χωρίς συνδέσμους",
     "NoMinimumForAnyRuntime": "Χωρίς ελάχιστο για κάθε χρόνο εκτέλεσης",
-    "NoMoveFilesSelf": " Όχι, θα μετακινήσω τον εαυτό μου τα αρχεία",
+    "MoveMovieFoldersDontMoveFiles": " Όχι, θα μετακινήσω τον εαυτό μου τα αρχεία",
     "Ended": "Έληξε",
     "NoMoviesExist": "Δεν βρέθηκαν ταινίες, για να ξεκινήσετε θα θέλετε να προσθέσετε μια νέα ταινία ή να εισαγάγετε ορισμένες υπάρχουσες.",
     "NoResultsFound": "Δεν βρέθηκαν αποτελέσματα",
@@ -551,7 +551,7 @@
     "ChangeFileDateHelpText": "Αλλαγή ημερομηνίας αρχείου κατά την εισαγωγή / επανασύνδεση",
     "FileNames": "Ονόματα αρχείων",
     "FocusSearchBox": "Πλαίσιο αναζήτησης εστίασης",
-    "FolderMoveRenameWarning": "Αυτό θα μετονομάσει επίσης το φάκελο ταινίας ανά μορφή φακέλου ταινίας στις ρυθμίσεις.",
+    "MoveMovieFoldersRenameFolderWarning": "Αυτό θα μετονομάσει επίσης το φάκελο ταινίας ανά μορφή φακέλου ταινίας στις ρυθμίσεις.",
     "FollowPerson": "Ακολουθήστε το άτομο",
     "SupportedListsMoreInfo": "Για περισσότερες πληροφορίες σχετικά με τις μεμονωμένες λίστες εισαγωγής, κάντε κλικ στα κουμπιά πληροφοριών.",
     "SupportedIndexersMoreInfo": "Για περισσότερες πληροφορίες σχετικά με τους μεμονωμένους δείκτες, κάντε κλικ στα κουμπιά πληροφοριών.",
@@ -933,13 +933,13 @@
     "WouldYouLikeToRestoreBackup": "Θέλετε να επαναφέρετε το αντίγραφο ασφαλείας {0};",
     "Year": "Ετος",
     "YesCancel": "Ναι, Ακύρωση",
-    "YesMoveFiles": "Ναι, Μετακινήστε τα αρχεία",
+    "MoveMovieFoldersMoveFiles": "Ναι, Μετακινήστε τα αρχεία",
     "Yesterday": "Εχθές",
     "YouCanAlsoSearch": "Μπορείτε επίσης να πραγματοποιήσετε αναζήτηση χρησιμοποιώντας TMDb ID ή IMDb ID μιας ταινίας. π.χ. \"tmdb: 71663\"",
     "MaintenanceRelease": "Έκδοση συντήρησης: επιδιορθώσεις σφαλμάτων και άλλες βελτιώσεις. Δείτε το Github Commit History για περισσότερες λεπτομέρειες",
     "MissingMonitoredAndConsideredAvailable": "Λείπει (παρακολουθείται)",
     "MissingNotMonitored": "Λείπει (Χωρίς παρακολούθηση)",
-    "MoveFolders2": "Θέλετε να μετακινήσετε τα αρχεία ταινιών από το \"{0}\" στο \"{1}\";",
+    "MoveMovieFoldersToNewPath": "Θέλετε να μετακινήσετε τα αρχεία ταινιών από το \"{0}\" στο \"{1}\";",
     "MovieDetailsPreviousMovie": "Λεπτομέρειες ταινίας: Προηγούμενη ταινία",
     "MovieEditor": "Πρόγραμμα επεξεργασίας ταινιών",
     "MovieExcludedFromAutomaticAdd": "Η ταινία εξαιρείται από την αυτόματη προσθήκη",
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index 77a1a701a2..1d61b6775c 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -673,7 +673,6 @@
   "Fixed": "Fixed",
   "FocusSearchBox": "Focus Search Box",
   "Folder": "Folder",
-  "FolderMoveRenameWarning": "This will also rename the movie folder per the movie folder format in settings.",
   "FolderNameTokens": "Folder Name Tokens",
   "Folders": "Folders",
   "FollowPerson": "Follow Person",
@@ -1034,8 +1033,11 @@
   "MountMovieHealthCheckMessage": "Mount containing a movie path is mounted read-only: ",
   "MoveAutomatically": "Move Automatically",
   "MoveFiles": "Move Files",
-  "MoveFolders1": "Would you like to move the movie folders to '{0}' ?",
-  "MoveFolders2": "Would you like to move the movie files from '{0}' to '{1}' ?",
+  "MoveMovieFoldersDontMoveFiles": "No, I'll Move the Files Myself",
+  "MoveMovieFoldersMoveFiles": "Yes, Move the Files",
+  "MoveMovieFoldersRenameFolderWarning": "This will also rename the movie folder per the movie folder format in settings.",
+  "MoveMovieFoldersToNewPath": "Would you like to move the movie files from '{originalPath}' to '{destinationPath}'?",
+  "MoveMovieFoldersToRootFolder": "Would you like to move the movie folders to '{destinationRootFolder}'?",
   "Movie": "Movie",
   "MovieAlreadyExcluded": "Movie already Excluded",
   "MovieAndCollection": "Movie and Collection",
@@ -1129,7 +1131,6 @@
   "NoLogFiles": "No log files",
   "NoMatchFound": "No match found!",
   "NoMinimumForAnyRuntime": "No minimum for any runtime",
-  "NoMoveFilesSelf": " No, I'll Move the Files Myself",
   "NoMovieFilesToManage": "No movie files to manage.",
   "NoMovieReleaseDatesAvailable": "No release dates available on [TMDb]({url}) for this movie.",
   "NoMoviesExist": "No movies found, to get started you'll want to add a new movie or import some existing ones.",
@@ -1929,7 +1930,6 @@
   "Year": "Year",
   "Yes": "Yes",
   "YesCancel": "Yes, Cancel",
-  "YesMoveFiles": "Yes, Move the Files",
   "Yesterday": "Yesterday",
   "YesterdayAt": "Yesterday at {time}",
   "YouCanAlsoSearch": "You can also search using TMDb ID or IMDb ID of a movie. e.g. `tmdb:71663`"
diff --git a/src/NzbDrone.Core/Localization/Core/es.json b/src/NzbDrone.Core/Localization/Core/es.json
index 3e02e3b376..9b1fe1dffa 100644
--- a/src/NzbDrone.Core/Localization/Core/es.json
+++ b/src/NzbDrone.Core/Localization/Core/es.json
@@ -793,7 +793,7 @@
     "NoAlternativeTitles": "Sin títulos alternativos.",
     "NoEventsFound": "Ningún evento encontrado",
     "NoLinks": "Sin enlaces",
-    "NoMoveFilesSelf": " No, moveré los archivos yo mismo",
+    "MoveMovieFoldersDontMoveFiles": " No, moveré los archivos yo mismo",
     "NoMoviesExist": "No se encontraron películas. Para comenzar añade una nueva película o importa algunas existentes.",
     "NoResultsFound": "Ningún resultado encontrado",
     "MovieFilesTotaling": "Total de archivos de película",
@@ -856,7 +856,7 @@
     "ExternalUpdater": "{appName} está configurado para usar un mecanismo de actualización externo",
     "FailedToLoadMovieFromAPI": "No se pudo cargar la película desde la API",
     "FeatureRequests": "Peticiones de características",
-    "FolderMoveRenameWarning": "Esto también renombrará la carpeta de películas según el formato de carpeta de películas en la configuración.",
+    "MoveMovieFoldersRenameFolderWarning": "Esto también renombrará la carpeta de películas según el formato de carpeta de películas en la configuración.",
     "IMDb": "IMDb",
     "InstallLatest": "Instala el último",
     "KeepAndUnmonitorMovie": "Mantener y no monitorizar la película",
@@ -874,7 +874,7 @@
     "MinimumCustomFormatScore": "Puntuación mínima de formato personalizado",
     "MonitoredStatus": "Monitorizados/Estado",
     "Months": "Meses",
-    "MoveFolders1": "¿Te gustaría mover las carpetas de películas a '{0}'?",
+    "MoveMovieFoldersToRootFolder": "¿Te gustaría mover las carpetas de películas a '{0}'?",
     "MovieChat": "Chat de películas",
     "MovieInvalidFormat": "Película: formato no válido",
     "MultiLanguage": "Multi-idioma",
@@ -934,9 +934,9 @@
     "Weeks": "Semanas",
     "Wiki": "Wiki",
     "WouldYouLikeToRestoreBackup": "Te gustaria restaurar la copia de seguridad '{name}'?",
-    "YesMoveFiles": "Sí, mover los archivos",
+    "MoveMovieFoldersMoveFiles": "Sí, mover los archivos",
     "Yesterday": "Ayer",
-    "MoveFolders2": "¿Te gustaría mover los archivos de película de '{0}' a '{1}'?",
+    "MoveMovieFoldersToNewPath": "¿Te gustaría mover los archivos de película de '{0}' a '{1}'?",
     "SqliteVersionCheckUpgradeRequiredMessage": "La versión {0} de SQLite instalada actualmente ya no es compatible. Actualice SQLite al menos a la versión {1}.",
     "ShowCinemaRelease": "Mostrar fecha de estreno en el cine",
     "ShowReleaseDate": "Mostrar fecha de lanzamiento",
diff --git a/src/NzbDrone.Core/Localization/Core/fi.json b/src/NzbDrone.Core/Localization/Core/fi.json
index 034f7ada79..44f2a29599 100644
--- a/src/NzbDrone.Core/Localization/Core/fi.json
+++ b/src/NzbDrone.Core/Localization/Core/fi.json
@@ -50,7 +50,7 @@
     "MinimumAgeHelpText": "Vain Usenet: NZB:n vähimmäisikä minuutteina, ennen niiden kaappausta. Tämän avulla uusille julkaisuille voidaan antaa aikaa levitä Usenet-palveluntarjoajalle.",
     "MinimumFreeSpaceHelpText": "Estä tuonti, jos sen jälkeinen vapaa levytila olisi tässä määritettyä pienempi.",
     "MonitoredHelpText": "Elokuvaa etsitään ja se ladataan, jos se on saatavilla.",
-    "MoveFolders1": "Haluatko siirtää elokuvakansiot kohteeseen \"{0}\"?",
+    "MoveMovieFoldersToRootFolder": "Haluatko siirtää elokuvakansiot kohteeseen \"{0}\"?",
     "MovieChat": "Elokuvakeskustelu",
     "MultiLanguage": "Useita kieliä",
     "PosterOptions": "Julistenäkymän asetukset",
@@ -201,7 +201,7 @@
     "NoEventsFound": "Tapahtumia ei löytynyt",
     "NoLinks": "Linkkejä ei ole",
     "NoMinimumForAnyRuntime": "Ei toistoajan vähimmäiskestoa",
-    "NoMoveFilesSelf": " Ei, siirrän tiedostot itse",
+    "MoveMovieFoldersDontMoveFiles": " Ei, siirrän tiedostot itse",
     "NoMoviesExist": "Elokuvia ei löytynyt. Aloita lisäämällä uusi elokuva tai tuo joitakin olemassa olevia.",
     "NoResultsFound": "Tuloksia ei löytynyt.",
     "BranchUpdate": "{appName}in versiopäivityksiin käytettävä kehityshaara.",
@@ -555,7 +555,7 @@
     "Fixed": "Korjattu",
     "FocusSearchBox": "Kohdista hakukenttä",
     "Folder": "Kansio",
-    "FolderMoveRenameWarning": "Tämä nimeää myös elokuvakansion uudelleen asetuksissa määritettyjen nimeämissääntöjen mukaisesti.",
+    "MoveMovieFoldersRenameFolderWarning": "Tämä nimeää myös elokuvakansion uudelleen asetuksissa määritettyjen nimeämissääntöjen mukaisesti.",
     "Folders": "Kansiot",
     "FollowPerson": "Seuraa henkilöä",
     "Forecast": "Ennuste",
@@ -932,13 +932,13 @@
     "WouldYouLikeToRestoreBackup": "Haluatko palauttaa varmuuskopion \"{name}\"?",
     "Year": "Vuosi",
     "YesCancel": "Kyllä, peru",
-    "YesMoveFiles": "Kyllä, siirrä tiedostot",
+    "MoveMovieFoldersMoveFiles": "Kyllä, siirrä tiedostot",
     "Yesterday": "Eilen",
     "YouCanAlsoSearch": "Voit etsiä myös elokuvien TMDB- tai IMDb-tunnisteilla (esim. \"tmdb:71663\").",
     "MaintenanceRelease": "Huoltojulkaisu: korjauksia ja muita parannuksia. Lue lisää Githubin muutoshistoriasta.",
     "MissingMonitoredAndConsideredAvailable": "Puuttuu (valvotaan)",
     "MissingNotMonitored": "Puuttuu (valvomattomat)",
-    "MoveFolders2": "Haluatko siirtää elokuvatiedostot kansiosta {0} kansioon {1}?",
+    "MoveMovieFoldersToNewPath": "Haluatko siirtää elokuvatiedostot kansiosta {0} kansioon {1}?",
     "MovieDetailsPreviousMovie": "Elokuvan tiedot: Edellinen elokuva",
     "MovieEditor": "Elokuvien monivalinta",
     "MovieExcludedFromAutomaticAdd": "Elokuvaa ei huomioida automaattisessa lisäyksessä.",
diff --git a/src/NzbDrone.Core/Localization/Core/fr.json b/src/NzbDrone.Core/Localization/Core/fr.json
index aedcdf99ba..cf90295db7 100644
--- a/src/NzbDrone.Core/Localization/Core/fr.json
+++ b/src/NzbDrone.Core/Localization/Core/fr.json
@@ -818,7 +818,7 @@
     "FailedToLoadMovieFromAPI": "Erreur lors du chargement du film via l'API",
     "FeatureRequests": "Requêtes de nouvelles fonctionnalités",
     "FileNameTokens": "Jetons de nom de fichier",
-    "FolderMoveRenameWarning": "Ceci va également renommer le dossier du film par le format de dossier défini dans les paramètres.",
+    "MoveMovieFoldersRenameFolderWarning": "Ceci va également renommer le dossier du film par le format de dossier défini dans les paramètres.",
     "Images": "Images",
     "IMDb": "IMDb",
     "Hours": "Heures",
@@ -851,7 +851,7 @@
     "MovieFilesTotaling": "Totalisation des fichiers vidéo",
     "NextExecution": "Prochaine exécution",
     "NoEventsFound": "Aucun événement trouvé",
-    "NoMoveFilesSelf": " Non, je vais déplacer les fichiers moi-même",
+    "MoveMovieFoldersDontMoveFiles": " Non, je vais déplacer les fichiers moi-même",
     "None": "Aucun",
     "NoResultsFound": "Aucun résultat trouvé",
     "OnGrab": "Lors de la saisie",
@@ -883,7 +883,7 @@
     "MinimumCustomFormatScore": "Score minimum de format personnalisé",
     "MonitoredStatus": "Surveillé/Statut",
     "Months": "Mois",
-    "MoveFolders1": "Souhaitez-vous déplacer les dossiers de films vers «{0}» ?",
+    "MoveMovieFoldersToRootFolder": "Souhaitez-vous déplacer les dossiers de films vers «{0}» ?",
     "MovieChat": "Movie Chat",
     "MovieInvalidFormat": "Film : format non valide",
     "MultiLanguage": "Multi-langue",
@@ -943,8 +943,8 @@
     "Weeks": "Semaines",
     "Wiki": "Wiki",
     "WouldYouLikeToRestoreBackup": "Souhaitez-vous restaurer la sauvegarde « {name} » ?",
-    "YesMoveFiles": "Oui, déplacez les fichiers",
-    "MoveFolders2": "Souhaitez-vous déplacer les fichiers vidéo de «{0}» vers «{1}» ?",
+    "MoveMovieFoldersMoveFiles": "Oui, déplacez les fichiers",
+    "MoveMovieFoldersToNewPath": "Souhaitez-vous déplacer les fichiers vidéo de «{0}» vers «{1}» ?",
     "SqliteVersionCheckUpgradeRequiredMessage": "La version {0} de SQLite actuellement installée n'est plus prise en charge. Veuillez mettre à niveau SQLite vers au moins la version {1}.",
     "ShowCinemaRelease": "Afficher la date de sortie au cinéma",
     "ShowReleaseDate": "Afficher la date de sortie",
diff --git a/src/NzbDrone.Core/Localization/Core/he.json b/src/NzbDrone.Core/Localization/Core/he.json
index 154318879f..0fd64783cb 100644
--- a/src/NzbDrone.Core/Localization/Core/he.json
+++ b/src/NzbDrone.Core/Localization/Core/he.json
@@ -189,7 +189,7 @@
     "NoEventsFound": "לא נמצאו אירועים",
     "NoLinks": "אין קישורים",
     "NoMinimumForAnyRuntime": "אין מינימום לכל זמן ריצה",
-    "NoMoveFilesSelf": " לא, אני אעביר את הקבצים בעצמי",
+    "MoveMovieFoldersDontMoveFiles": " לא, אני אעביר את הקבצים בעצמי",
     "Add": "הוסף",
     "NoMoviesExist": "לא נמצאו סרטים, כדי להתחיל, תרצה להוסיף סרט חדש או לייבא סרטים קיימים.",
     "None": "אף אחד",
@@ -550,7 +550,7 @@
     "FilterPlaceHolder": "חפש סרטים",
     "Fixed": "תוקן",
     "FocusSearchBox": "תיבת חיפוש פוקוס",
-    "FolderMoveRenameWarning": "זה גם ישנה את שם תיקיית הסרט לפי פורמט תיקיית הסרט בהגדרות.",
+    "MoveMovieFoldersRenameFolderWarning": "זה גם ישנה את שם תיקיית הסרט לפי פורמט תיקיית הסרט בהגדרות.",
     "Folders": "תיקיות",
     "FollowPerson": "עקוב אחר האדם",
     "Forecast": "תַחֲזִית",
@@ -653,7 +653,7 @@
     "MonitorMovie": "צג סרט",
     "Months": "חודשים",
     "MoreInfo": "עוד מידע",
-    "MoveFolders1": "האם ברצונך להעביר את תיקיות הסרטים ל '{0}'?",
+    "MoveMovieFoldersToRootFolder": "האם ברצונך להעביר את תיקיות הסרטים ל '{0}'?",
     "Movie": "סרט",
     "MovieAlreadyExcluded": "הסרט כבר לא נכלל",
     "MovieChat": "צ'אט בסרט",
@@ -933,12 +933,12 @@
     "WouldYouLikeToRestoreBackup": "האם ברצונך לשחזר את הגיבוי {0}?",
     "Year": "שָׁנָה",
     "YesCancel": "כן, בטל",
-    "YesMoveFiles": "כן, העבר את הקבצים",
+    "MoveMovieFoldersMoveFiles": "כן, העבר את הקבצים",
     "Yesterday": "אתמול",
     "YouCanAlsoSearch": "ניתן גם לחפש באמצעות מזהה TMDb או מזהה IMDb של סרט. לְמָשָׁל 'tmdb: 71663'",
     "MaintenanceRelease": "שחרור תחזוקה: תיקוני באגים ושיפורים אחרים. לפרטים נוספים, ראה היסטוריית התחייבויות של Github",
     "MissingNotMonitored": "חסר (ללא פיקוח)",
-    "MoveFolders2": "האם ברצונך להעביר את קובצי הסרט מ- '{0}' ל '{1}'?",
+    "MoveMovieFoldersToNewPath": "האם ברצונך להעביר את קובצי הסרט מ- '{0}' ל '{1}'?",
     "MovieDetailsPreviousMovie": "פרטי הסרט: הסרט הקודם",
     "MovieEditor": "עורך סרטים",
     "MovieExcludedFromAutomaticAdd": "סרט שאינו הוסף אוטומטי",
diff --git a/src/NzbDrone.Core/Localization/Core/hi.json b/src/NzbDrone.Core/Localization/Core/hi.json
index 0555d4e0cb..32175a8929 100644
--- a/src/NzbDrone.Core/Localization/Core/hi.json
+++ b/src/NzbDrone.Core/Localization/Core/hi.json
@@ -86,7 +86,7 @@
     "ChangeFileDateHelpText": "आयात / रेस्क्यू पर फ़ाइल तिथि बदलें",
     "Filter": "फ़िल्टर",
     "FirstDayOfWeek": "सप्ताह का पहला दिन",
-    "FolderMoveRenameWarning": "यह सेटिंग्स में मूवी फ़ोल्डर प्रारूप के अनुसार मूवी फ़ोल्डर का नाम भी बदलेगा।",
+    "MoveMovieFoldersRenameFolderWarning": "यह सेटिंग्स में मूवी फ़ोल्डर प्रारूप के अनुसार मूवी फ़ोल्डर का नाम भी बदलेगा।",
     "Formats": "प्रारूप",
     "SupportedListsMoreInfo": "व्यक्तिगत आयात सूचियों की अधिक जानकारी के लिए, जानकारी बटन पर क्लिक करें।",
     "SupportedIndexersMoreInfo": "अलग-अलग इंडेक्सर्स के बारे में अधिक जानकारी के लिए, जानकारी बटन पर क्लिक करें।",
@@ -263,7 +263,7 @@
     "YesCancel": "हाँ, रद्द करें",
     "YouCanAlsoSearch": "आप किसी मूवी की TMDb ID या IMDb ID का उपयोग करके भी खोज सकते हैं। जैसे `TMDb: 71663`",
     "MissingMonitoredAndConsideredAvailable": "गुम (निगरानी)",
-    "MoveFolders2": "क्या आप फ़िल्म फ़ाइलों को '{0}' से '{1}' में ले जाना चाहेंगे?",
+    "MoveMovieFoldersToNewPath": "क्या आप फ़िल्म फ़ाइलों को '{0}' से '{1}' में ले जाना चाहेंगे?",
     "MovieExcludedFromAutomaticAdd": "मूवी स्वचालित ऐड से बहिष्कृत",
     "Search": "खोज",
     "Updates": "अपडेट",
@@ -410,7 +410,7 @@
     "NegateHelpText": "यदि जाँच की जाती है, तो कस्टम प्रारूप लागू नहीं होगा यदि यह {0} स्थिति से मेल खाता है।",
     "NoAlternativeTitles": "कोई वैकल्पिक शीर्षक नहीं।",
     "NoMinimumForAnyRuntime": "किसी रनटाइम के लिए कोई न्यूनतम नहीं",
-    "NoMoveFilesSelf": " नहीं, मैं फ़ाइलों को स्वयं स्थानांतरित करूँगा",
+    "MoveMovieFoldersDontMoveFiles": " नहीं, मैं फ़ाइलों को स्वयं स्थानांतरित करूँगा",
     "NoMoviesExist": "कोई फ़िल्म नहीं मिली, आरंभ करने के लिए आप एक नई फ़िल्म जोड़ना चाहेंगे या कुछ मौजूदा चीज़ों को आयात करेंगे।",
     "BypassProxyForLocalAddresses": "स्थानीय पते के लिए बायपास प्रॉक्सी",
     "Calendar": "पंचांग",
@@ -764,7 +764,7 @@
     "MonitorMovie": "मॉनिटर मूवी",
     "Months": "महीने",
     "MoreInfo": "और जानकारी",
-    "MoveFolders1": "क्या आप मूवी फोल्डर को '{0}' में ले जाना चाहेंगे?",
+    "MoveMovieFoldersToRootFolder": "क्या आप मूवी फोल्डर को '{0}' में ले जाना चाहेंगे?",
     "MovieAlreadyExcluded": "मूवी पहले ही बाहर कर दी गई",
     "MovieChat": "मूवी चैट",
     "MovieInfoLanguage": "मूवी की जानकारी भाषा",
@@ -937,7 +937,7 @@
     "Weeks": "हफ्तों",
     "WhitelistedSubtitleTags": "सफेदीकृत उपशीर्षक टैग",
     "WouldYouLikeToRestoreBackup": "क्या आप बैकअप {0} को पुनर्स्थापित करना चाहेंगे?",
-    "YesMoveFiles": "हाँ, फ़ाइलें स्थानांतरित करें",
+    "MoveMovieFoldersMoveFiles": "हाँ, फ़ाइलें स्थानांतरित करें",
     "Yesterday": "बिता कल",
     "MaintenanceRelease": "रखरखाव रिलीज: बग फिक्स और अन्य सुधार। अधिक जानकारी के लिए गितुब कमिट इतिहास देखें",
     "MissingNotMonitored": "अनुपलब्ध (अज्ञात)",
diff --git a/src/NzbDrone.Core/Localization/Core/hu.json b/src/NzbDrone.Core/Localization/Core/hu.json
index 671ce7110a..5cf018a729 100644
--- a/src/NzbDrone.Core/Localization/Core/hu.json
+++ b/src/NzbDrone.Core/Localization/Core/hu.json
@@ -821,7 +821,7 @@
     "FailedToLoadMovieFromAPI": "Nem sikerült betölteni a filmet az API-ból",
     "ExternalUpdater": "A {appName} egy külső frissítési mechanizmus használatára van konfigurálva",
     "ExcludeTitle": "Kizárja a következőt: {0}? Ez megakadályozza, hogy a {appName} automatikusan hozzáadja a listaszinkronizáláshoz.",
-    "FolderMoveRenameWarning": "Ezzel a filmmappa a filmmappa formátuma szerint is átnevezésre kerül a beállításokban.",
+    "MoveMovieFoldersRenameFolderWarning": "Ezzel a filmmappa a filmmappa formátuma szerint is átnevezésre kerül a beállításokban.",
     "Images": "Képek",
     "HttpHttps": "HTTP(S)",
     "Hours": "Órák",
@@ -908,7 +908,7 @@
     "NoResultsFound": "Nincs találat",
     "None": "Egyik sem",
     "NoMoviesExist": "Nem találhatóak filmek, kezdésnek adjon hozzá egy új filmet vagy importáljon már meglévőket.",
-    "NoMoveFilesSelf": " Ne, magam mozgatom át a fájlokat",
+    "MoveMovieFoldersDontMoveFiles": " Ne, magam mozgatom át a fájlokat",
     "NoListRecommendations": "Nincs elem a listában és az ajánlások között, kezdésnek adjon hozzá egy filmet, importáljon meglévőket, vagy adjon hozzá egy listát.",
     "NoLinks": "Nincsenek Linkek",
     "NoEventsFound": "Nem található események",
@@ -920,7 +920,7 @@
     "MovieInvalidFormat": "Film: Érvénytelen formátum",
     "MovieFilesTotaling": "Film fájlok összege",
     "MovieChat": "Film Chat",
-    "MoveFolders1": "Szeretné áthelyezni a film mappáját ide: '{0}'?",
+    "MoveMovieFoldersToRootFolder": "Szeretné áthelyezni a film mappáját ide: '{0}'?",
     "Months": "Hónapok",
     "MonitoredStatus": "Felügyelt/állapot",
     "Monday": "Hétfő",
@@ -939,9 +939,9 @@
     "WhatsNew": "Mi az újdonság?",
     "Weeks": "Hetek",
     "WouldYouLikeToRestoreBackup": "Szeretné visszaállítani a(z) „{name}” biztonsági másolatot?",
-    "YesMoveFiles": "Igen, helyezze át a fájlokat",
+    "MoveMovieFoldersMoveFiles": "Igen, helyezze át a fájlokat",
     "RequiredRestrictionHelpText": "A kiadásnak tartalmaznia kell legalább egy ilyen kifejezést (a kis- és nagybetűk nem számítanak)",
-    "MoveFolders2": "Szeretnéd áthelyezni a filmfájlokat a(z) „{0}” mappából a(z) „{1}” mappába?",
+    "MoveMovieFoldersToNewPath": "Szeretnéd áthelyezni a filmfájlokat a(z) „{0}” mappából a(z) „{1}” mappába?",
     "ImportNotForDownloads": "Ne használja letöltések importálására a letöltötőkliensről, ez csak a meglévő szervezett könyvtárakra vonatkozik, nem rendezetlen mappákra/fájlokra.",
     "ImportLibrary": "Könyvtár importálás",
     "SqliteVersionCheckUpgradeRequiredMessage": "A jelenleg telepített {0} SQLite verzió már nem támogatott. Kérjük, frissítse az SQLite-t legalább a (z) {1} verzióra.",
diff --git a/src/NzbDrone.Core/Localization/Core/is.json b/src/NzbDrone.Core/Localization/Core/is.json
index 4c591ae050..6aaa4ec9a7 100644
--- a/src/NzbDrone.Core/Localization/Core/is.json
+++ b/src/NzbDrone.Core/Localization/Core/is.json
@@ -56,7 +56,7 @@
     "FailedLoadingSearchResults": "Mistókst að hlaða leitarniðurstöður. Reyndu aftur.",
     "FileManagement": "Skráastjórnun",
     "Filename": "Skráarnafn",
-    "FolderMoveRenameWarning": "Þetta mun einnig endurnefna kvikmyndamöppuna eftir sniði kvikmyndamöppunnar í stillingum.",
+    "MoveMovieFoldersRenameFolderWarning": "Þetta mun einnig endurnefna kvikmyndamöppuna eftir sniði kvikmyndamöppunnar í stillingum.",
     "SupportedDownloadClientsMoreInfo": "Fyrir frekari upplýsingar um einstaka niðurhal viðskiptavini, smelltu á upplýsingatakkana.",
     "HideAdvanced": "Fela lengra komna",
     "Ignored": "Hunsað",
@@ -248,7 +248,7 @@
     "NoAlternativeTitles": "Engir aðrir titlar.",
     "NoEventsFound": "Engir viðburðir fundust",
     "NoMinimumForAnyRuntime": "Ekkert lágmark fyrir neina keyrslutíma",
-    "NoMoveFilesSelf": " Nei, ég skal færa skrárnar sjálfur",
+    "MoveMovieFoldersDontMoveFiles": " Nei, ég skal færa skrárnar sjálfur",
     "NoMoviesExist": "Engar kvikmyndir fundust, til að byrja, þá viltu bæta við nýrri kvikmynd eða flytja inn þær sem fyrir eru.",
     "None": "Enginn",
     "NoResultsFound": "Engar niðurstöður fundust",
@@ -683,7 +683,7 @@
     "MonitorMovie": "Fylgstu með kvikmynd",
     "Months": "Mánuðum",
     "MoreInfo": "Meiri upplýsingar",
-    "MoveFolders1": "Viltu færa kvikmyndamöppurnar í „{0}“?",
+    "MoveMovieFoldersToRootFolder": "Viltu færa kvikmyndamöppurnar í „{0}“?",
     "Movie": "Kvikmynd",
     "MovieAlreadyExcluded": "Kvikmynd þegar undanskilin",
     "MovieChat": "Kvikmyndaspjall",
@@ -934,12 +934,12 @@
     "WouldYouLikeToRestoreBackup": "Viltu endurheimta öryggisafritið {0}?",
     "Year": "Ár",
     "YesCancel": "Já, hætta við",
-    "YesMoveFiles": "Já, hreyfðu skrárnar",
+    "MoveMovieFoldersMoveFiles": "Já, hreyfðu skrárnar",
     "Yesterday": "Í gær",
     "YouCanAlsoSearch": "Þú getur líka leitað með því að nota TMDb auðkenni eða IMDb auðkenni kvikmyndar. t.d. `tmdb: 71663`",
     "MaintenanceRelease": "Útgáfa viðhalds: villuleiðréttingar og aðrar úrbætur. Sjá Github skuldbindingarferil fyrir frekari upplýsingar",
     "MissingNotMonitored": "Vantar (óeftirlit)",
-    "MoveFolders2": "Viltu færa kvikmyndaskrárnar frá '{0}' til '{1}'?",
+    "MoveMovieFoldersToNewPath": "Viltu færa kvikmyndaskrárnar frá '{0}' til '{1}'?",
     "MovieDetailsPreviousMovie": "Upplýsingar um kvikmynd: Fyrri kvikmynd",
     "MovieExcludedFromAutomaticAdd": "Kvikmynd útilokuð frá sjálfvirkri viðbót",
     "Search": "Leitaðu",
diff --git a/src/NzbDrone.Core/Localization/Core/it.json b/src/NzbDrone.Core/Localization/Core/it.json
index 8b547c1d78..49e93ef7f6 100644
--- a/src/NzbDrone.Core/Localization/Core/it.json
+++ b/src/NzbDrone.Core/Localization/Core/it.json
@@ -810,7 +810,7 @@
     "NoAlternativeTitles": "Nessun titolo alternativo.",
     "NoEventsFound": "Nessun evento trovato",
     "NoLinks": "Nessun Collegamento",
-    "NoMoveFilesSelf": " No, sposterò i file da solo",
+    "MoveMovieFoldersDontMoveFiles": " No, sposterò i file da solo",
     "NoMoviesExist": "Nessun film trovato, per iniziare ti consigliamo di aggiungere un nuovo film o importarne alcuni esistenti.",
     "None": "Nessuna",
     "NoResultsFound": "nessun risultato trovato",
@@ -858,7 +858,7 @@
     "ErrorRestoringBackup": "Errore durante il ripristino del backup",
     "FailedToLoadMovieFromAPI": "Impossibile caricare il film dall'API",
     "FeatureRequests": "Richieste di funzionalità",
-    "FolderMoveRenameWarning": "Questo rinominerà anche la cartella del film in base al formato della cartella del film nelle impostazioni.",
+    "MoveMovieFoldersRenameFolderWarning": "Questo rinominerà anche la cartella del film in base al formato della cartella del film nelle impostazioni.",
     "Images": "immagini",
     "IMDb": "IMDb",
     "InCinemasDate": "In data di cinema",
@@ -879,7 +879,7 @@
     "MinimumCustomFormatScore": "Punteggio formato personalizzato minimo",
     "MonitoredStatus": "Monitorato/Stato",
     "Months": "Mesi",
-    "MoveFolders1": "Spostare le cartelle dei film in \"{0}\"?",
+    "MoveMovieFoldersToRootFolder": "Spostare le cartelle dei film in \"{0}\"?",
     "MovieChat": "Movie Chat",
     "MovieInvalidFormat": "Film: formato non valido",
     "MultiLanguage": "Multi lingua",
@@ -940,8 +940,8 @@
     "Weeks": "Settimane",
     "Wiki": "Wiki",
     "WouldYouLikeToRestoreBackup": "Vuoi ripristinare il backup '{name}'?",
-    "YesMoveFiles": "Sì, sposta i file",
-    "MoveFolders2": "Spostare i file del film da \"{0}\" a \"{1}\"?",
+    "MoveMovieFoldersMoveFiles": "Sì, sposta i file",
+    "MoveMovieFoldersToNewPath": "Spostare i file del film da \"{0}\" a \"{1}\"?",
     "SqliteVersionCheckUpgradeRequiredMessage": "La versione SQLite attualmente installata {0} non è più supportata. Aggiorna SQLite almeno alla versione {1}.",
     "ShowCinemaRelease": "Mostra la data di uscita del cinema",
     "ShowReleaseDate": "Mostra data di uscita",
diff --git a/src/NzbDrone.Core/Localization/Core/ja.json b/src/NzbDrone.Core/Localization/Core/ja.json
index 64f3646734..a452be50f7 100644
--- a/src/NzbDrone.Core/Localization/Core/ja.json
+++ b/src/NzbDrone.Core/Localization/Core/ja.json
@@ -52,7 +52,7 @@
     "ExtraFileExtensionsHelpText": "インポートする追加ファイルのコンマ区切りリスト（.nfoは.nfo-origとしてインポートされます）",
     "FailedLoadingSearchResults": "検索結果の読み込みに失敗しました。もう一度お試しください。",
     "ChangeFileDateHelpText": "インポート/再スキャン時にファイルの日付を変更する",
-    "FolderMoveRenameWarning": "これにより、設定のムービーフォルダ形式に従ってムービーフォルダの名前も変更されます。",
+    "MoveMovieFoldersRenameFolderWarning": "これにより、設定のムービーフォルダ形式に従ってムービーフォルダの名前も変更されます。",
     "SupportedDownloadClientsMoreInfo": "個々のダウンロードクライアントの詳細については、情報ボタンをクリックしてください。",
     "SupportedListsMoreInfo": "個々のインポートリストの詳細については、情報ボタンをクリックしてください。",
     "SupportedIndexersMoreInfo": "個々のインデクサーの詳細については、情報ボタンをクリックしてください。",
@@ -81,7 +81,7 @@
     "UseHardlinksInsteadOfCopy": "コピーの代わりにハードリンクを使用する",
     "Wiki": "ウィキ",
     "MaintenanceRelease": "メンテナンスリリース：バグ修正およびその他の改善。詳細については、Githubのコミット履歴を参照してください",
-    "MoveFolders2": "ムービーファイルを「{0}」から「{1}」に移動しますか？",
+    "MoveMovieFoldersToNewPath": "ムービーファイルを「{0}」から「{1}」に移動しますか？",
     "Announced": "発表",
     "ApplyTags": "タグを適用する",
     "Authentication": "認証",
@@ -228,7 +228,7 @@
     "NoEventsFound": "イベントが見つかりません",
     "NoLinks": "リンクなし",
     "NoMinimumForAnyRuntime": "ランタイムの最小値はありません",
-    "NoMoveFilesSelf": " いいえ、ファイルを自分で移動します",
+    "MoveMovieFoldersDontMoveFiles": " いいえ、ファイルを自分で移動します",
     "NoMoviesExist": "映画が見つかりません。開始するには、新しい映画を追加するか、既存の映画をインポートする必要があります。",
     "NoResultsFound": "結果が見つかりません",
     "BranchUpdate": "{appName}の更新に使用するブランチ",
@@ -640,7 +640,7 @@
     "MonitorMovie": "モニタームービー",
     "Months": "月",
     "MoreInfo": "より詳しい情報",
-    "MoveFolders1": "ムービーフォルダを「{0}」に移動しますか？",
+    "MoveMovieFoldersToRootFolder": "ムービーフォルダを「{0}」に移動しますか？",
     "Movie": "映画",
     "MovieAlreadyExcluded": "映画はすでに除外されています",
     "MovieChat": "ムービーチャット",
@@ -934,7 +934,7 @@
     "WouldYouLikeToRestoreBackup": "バックアップ{0}を復元しますか？",
     "Year": "年",
     "YesCancel": "はい、キャンセル",
-    "YesMoveFiles": "はい、ファイルを移動します",
+    "MoveMovieFoldersMoveFiles": "はい、ファイルを移動します",
     "Yesterday": "昨日",
     "YouCanAlsoSearch": "映画のTMDbIDまたはIMDbIDを使用して検索することもできます。例えば`tmdb：71663`",
     "MissingMonitoredAndConsideredAvailable": "行方不明（監視済み）",
diff --git a/src/NzbDrone.Core/Localization/Core/ko.json b/src/NzbDrone.Core/Localization/Core/ko.json
index 38553247a7..d5a85351ae 100644
--- a/src/NzbDrone.Core/Localization/Core/ko.json
+++ b/src/NzbDrone.Core/Localization/Core/ko.json
@@ -231,7 +231,7 @@
     "MovieNaming": "영화 이름 지정",
     "NegateHelpText": "선택하면이 {0} 조건이 일치하면 맞춤 형식이 적용되지 않습니다.",
     "NoMinimumForAnyRuntime": "런타임에 대한 최소값 없음",
-    "NoMoveFilesSelf": " 아니요, 파일을 직접 이동하겠습니다.",
+    "MoveMovieFoldersDontMoveFiles": " 아니요, 파일을 직접 이동하겠습니다.",
     "NoMoviesExist": "영화를 찾을 수 없음 시작하려면 새 영화를 추가하거나 기존 영화를 가져와야합니다.",
     "NoResultsFound": "결과를 찾을 수 없습니다",
     "BranchUpdate": "{appName} 업데이트에 사용할 파생 버전",
@@ -549,7 +549,7 @@
     "FilterPlaceHolder": "영화 검색",
     "Fixed": "고정됨",
     "FocusSearchBox": "포커스 검색 창",
-    "FolderMoveRenameWarning": "설정에서 동영상 폴더 형식에 따라 동영상 폴더의 이름도 변경됩니다.",
+    "MoveMovieFoldersRenameFolderWarning": "설정에서 동영상 폴더 형식에 따라 동영상 폴더의 이름도 변경됩니다.",
     "Folders": "폴더",
     "FollowPerson": "사람을 따르십시오",
     "Forecast": "예보",
@@ -648,7 +648,7 @@
     "MonitoredStatus": "모니터링 됨 / 상태",
     "MonitorMovie": "영화 모니터링",
     "MoreInfo": "더많은 정보",
-    "MoveFolders1": "동영상 폴더를 '{0}'(으)로 이동 하시겠습니까?",
+    "MoveMovieFoldersToRootFolder": "동영상 폴더를 '{0}'(으)로 이동 하시겠습니까?",
     "Movie": "영화",
     "MovieAlreadyExcluded": "이미 제외된 영화",
     "MovieChat": "영화 채팅",
@@ -933,12 +933,12 @@
     "WouldYouLikeToRestoreBackup": "'{name}' 백업을 복원하시겠습니까?",
     "Year": "년",
     "YesCancel": "예, 취소합니다",
-    "YesMoveFiles": "예, 파일을 이동합니다",
+    "MoveMovieFoldersMoveFiles": "예, 파일을 이동합니다",
     "Yesterday": "어제",
     "MaintenanceRelease": "유지 관리 출시: 버그 수정 및 기타 개선. 상세 내용은 Github 커밋 내역을 참조하세요.",
     "MissingMonitoredAndConsideredAvailable": "누락 (모니터링 됨)",
     "MissingNotMonitored": "누락 (모니터링되지 않음)",
-    "MoveFolders2": "동영상 파일을 '{0}'에서 '{1}'(으)로 이동 하시겠습니까?",
+    "MoveMovieFoldersToNewPath": "동영상 파일을 '{0}'에서 '{1}'(으)로 이동 하시겠습니까?",
     "MovieDetailsPreviousMovie": "영화 정보: 이전 영화",
     "MovieEditor": "영화 편집기",
     "MovieExcludedFromAutomaticAdd": "자동 추가에서 제외된 영화",
diff --git a/src/NzbDrone.Core/Localization/Core/nl.json b/src/NzbDrone.Core/Localization/Core/nl.json
index fde307f78c..3629d54b54 100644
--- a/src/NzbDrone.Core/Localization/Core/nl.json
+++ b/src/NzbDrone.Core/Localization/Core/nl.json
@@ -755,8 +755,8 @@
     "MovieDetailsPreviousMovie": "Film Details: Vorige Film",
     "MovieDetailsNextMovie": "Film Details: Volgende Film",
     "MovieChat": "Film Chat",
-    "MoveFolders2": "Wil je de film bestanden verplaatsen van '{0}' naar '{1}'?",
-    "MoveFolders1": "Wil je de film mappen naar '{0}' verplaatsen?",
+    "MoveMovieFoldersToNewPath": "Wil je de film bestanden verplaatsen van '{0}' naar '{1}'?",
+    "MoveMovieFoldersToRootFolder": "Wil je de film mappen naar '{0}' verplaatsen?",
     "Months": "Maanden",
     "MonitoredStatus": "Bewaakt/Status",
     "Monday": "Maandag",
@@ -883,7 +883,7 @@
     "PreferAndUpgrade": "Prefereer en Waardeer Op",
     "PhysicalReleaseDate": "Fysieke Release Datum",
     "OpenThisModal": "Open deze modal",
-    "FolderMoveRenameWarning": "Dit zal ook de naam van de film map per film formaat in instellingen wijzigen.",
+    "MoveMovieFoldersRenameFolderWarning": "Dit zal ook de naam van de film map per film formaat in instellingen wijzigen.",
     "NextExecution": "Volgende uitvoering",
     "MovieFilesTotaling": "Totaal aantal filmbestanden",
     "NoEventsFound": "Geen gebeurtenissen gevonden",
@@ -899,7 +899,7 @@
     "NoResultsFound": "Geen resultaten gevonden",
     "None": "Geen",
     "NoMoviesExist": "Geen films gevonden, om te beginnen, voeg een nieuwe film toe of importeer bestaande films.",
-    "NoMoveFilesSelf": " Nee, ik verplaats de bestanden zelf",
+    "MoveMovieFoldersDontMoveFiles": " Nee, ik verplaats de bestanden zelf",
     "NoMatchFound": "Geen overeenkomst gevonden!",
     "NoListRecommendations": "Geen lijst aanbevelingen gevonden, om te beginnen, voeg een nieuwe film toe, importeer bestaande of voeg een lijst toe.",
     "NoLinks": "Geen koppelingen",
@@ -943,7 +943,7 @@
     "Weeks": "Weken",
     "Wiki": "Wiki",
     "WouldYouLikeToRestoreBackup": "Wilt u de back-up {name} herstellen?",
-    "YesMoveFiles": "Ja, verplaats de bestanden",
+    "MoveMovieFoldersMoveFiles": "Ja, verplaats de bestanden",
     "Yesterday": "Gisteren",
     "SqliteVersionCheckUpgradeRequiredMessage": "De momenteel geïnstalleerde SQLite-versie {0} wordt niet langer ondersteund. Upgrade SQLite naar minimaal versie {1}.",
     "ShowCinemaRelease": "Show Cinema-releasedatum",
diff --git a/src/NzbDrone.Core/Localization/Core/pl.json b/src/NzbDrone.Core/Localization/Core/pl.json
index 44d9c6f347..354d86a335 100644
--- a/src/NzbDrone.Core/Localization/Core/pl.json
+++ b/src/NzbDrone.Core/Localization/Core/pl.json
@@ -140,7 +140,7 @@
     "UsenetDelayTime": "Opóźnienie Usenetu: {0}",
     "WouldYouLikeToRestoreBackup": "Czy chcesz przywrócić kopię zapasową {0}?",
     "YesCancel": "Tak, anuluj",
-    "MoveFolders2": "Czy chcesz przenieść pliki filmowe z „{0}” do „{1}”?",
+    "MoveMovieFoldersToNewPath": "Czy chcesz przenieść pliki filmowe z „{0}” do „{1}”?",
     "DownloadPropersAndRepacksHelpText": "Czy automatycznie uaktualnić do Propers / Repacks",
     "DownloadPropersAndRepacksHelpTextCustomFormat": "Użyj opcji „Nie preferuj”, aby posortować wyniki według niestandardowego formatu w porównaniu z properami / przepakowaniami",
     "BackupIntervalHelpText": "Odstęp czasu między automatycznymi kopiami zapasowymi",
@@ -243,7 +243,7 @@
     "NoEventsFound": "Nie znaleziono wydarzeń",
     "NoLinks": "Brak linków",
     "NoMinimumForAnyRuntime": "Brak minimum dla dowolnego środowiska uruchomieniowego",
-    "NoMoveFilesSelf": " Nie, sam przeniosę pliki",
+    "MoveMovieFoldersDontMoveFiles": " Nie, sam przeniosę pliki",
     "NoMoviesExist": "Nie znaleziono żadnych filmów. Aby rozpocząć, musisz dodać nowy film lub zaimportować istniejące.",
     "NoResultsFound": "Nie znaleziono wyników",
     "BranchUpdate": "Gałąź do użycia do aktualizacji {appName}",
@@ -565,7 +565,7 @@
     "Fixed": "Naprawiony",
     "FocusSearchBox": "Zaznacz pole wyszukiwania",
     "Folder": "Teczka",
-    "FolderMoveRenameWarning": "Spowoduje to również zmianę nazwy folderu filmów zgodnie z formatem folderu filmów w ustawieniach.",
+    "MoveMovieFoldersRenameFolderWarning": "Spowoduje to również zmianę nazwy folderu filmów zgodnie z formatem folderu filmów w ustawieniach.",
     "Folders": "Lornetka składana",
     "Forecast": "Prognoza",
     "Formats": "Formaty",
@@ -663,7 +663,7 @@
     "MonitoredStatus": "Monitorowane / Stan",
     "MonitorMovie": "Monitoruj film",
     "MoreInfo": "Więcej informacji",
-    "MoveFolders1": "Czy chcesz przenieść foldery z filmami do „{0}”?",
+    "MoveMovieFoldersToRootFolder": "Czy chcesz przenieść foldery z filmami do „{0}”?",
     "Movie": "Film",
     "MovieAlreadyExcluded": "Film już wykluczony",
     "MovieChat": "Czat filmowy",
@@ -932,7 +932,7 @@
     "WhitelistedSubtitleTags": "Tagi napisów umieszczone na białej liście",
     "Wiki": "Wiki",
     "Year": "Rok",
-    "YesMoveFiles": "Tak, przenieś pliki",
+    "MoveMovieFoldersMoveFiles": "Tak, przenieś pliki",
     "Yesterday": "Wczoraj",
     "YouCanAlsoSearch": "Możesz również wyszukiwać za pomocą TMDb ID lub IMDb ID filmu. na przykład `tmdb: 71663`",
     "MaintenanceRelease": "Wersja konserwacyjna: poprawki błędów i inne ulepszenia. Aby uzyskać więcej informacji, zobacz historię zatwierdzeń na Github",
diff --git a/src/NzbDrone.Core/Localization/Core/pt.json b/src/NzbDrone.Core/Localization/Core/pt.json
index 5106914c58..fa02f42723 100644
--- a/src/NzbDrone.Core/Localization/Core/pt.json
+++ b/src/NzbDrone.Core/Localization/Core/pt.json
@@ -767,8 +767,8 @@
     "CustomFormatHelpText": "O {appName} pontua cada versão usando a soma das pontuações de formatos personalizados correspondentes. Se uma nova versão melhorar a pontuação, com a mesma qualidade ou melhor, o {appName} a capturará.",
     "DefaultDelayProfileMovie": "Este é o perfil padrão. Isso se aplica a todos os filmes que não têm um perfil explícito.",
     "DoNotUpgradeAutomatically": "Não atualizar automaticamente",
-    "FolderMoveRenameWarning": "Isso também renomeará a pasta do filme de acordo com o formato de pasta nas definições.",
-    "MoveFolders1": "Deseja mover as pastas de filmes para \"{0}\"?",
+    "MoveMovieFoldersRenameFolderWarning": "Isso também renomeará a pasta do filme de acordo com o formato de pasta nas definições.",
+    "MoveMovieFoldersToRootFolder": "Deseja mover as pastas de filmes para \"{0}\"?",
     "NoListRecommendations": "Não foram encontrados itens de lista ou recomendações. Para começar, adiciona um novo filme, importa alguns existentes ou adiciona uma lista.",
     "LastExecution": "Execução mais recente",
     "OnGrab": "Ao capturar",
@@ -802,7 +802,7 @@
     "NoAlternativeTitles": "Sem títulos alternativos.",
     "NoEventsFound": "Nenhum evento encontrado",
     "NoLinks": "Sem ligações",
-    "NoMoveFilesSelf": " Não, eu mesmo moverei os ficheiros",
+    "MoveMovieFoldersDontMoveFiles": " Não, eu mesmo moverei os ficheiros",
     "Presets": "Pré-sintonizações",
     "ChmodFolderHelpTextWarning": "Isso só funciona se o utilizador que executa o {appName} é o proprietário do ficheiro. É melhor garantir que o cliente de transferências defina as permissões corretamente.",
     "ChownGroupHelpText": "Nome do grupo ou gid. Use gid para sistemas de ficheiros remotos.",
@@ -943,8 +943,8 @@
     "Weeks": "Semanas",
     "Wiki": "Wiki",
     "WouldYouLikeToRestoreBackup": "Deseja restaurar a cópia de segurança {0}?",
-    "YesMoveFiles": "Sim, mova os ficheiros",
-    "MoveFolders2": "Deseja mover os ficheiros de filme de \"{0}\" para \"{1}\"?",
+    "MoveMovieFoldersMoveFiles": "Sim, mova os ficheiros",
+    "MoveMovieFoldersToNewPath": "Deseja mover os ficheiros de filme de \"{0}\" para \"{1}\"?",
     "SqliteVersionCheckUpgradeRequiredMessage": "A versão do SQLite atualmente instalada {0} não é mais suportada. Atualiza o SQLite para pelo menos a versão {1}.",
     "ShowCinemaRelease": "Mostrar data de lançamento no cinema",
     "ShowReleaseDate": "Mostrar data de lançamento",
diff --git a/src/NzbDrone.Core/Localization/Core/pt_BR.json b/src/NzbDrone.Core/Localization/Core/pt_BR.json
index b8d91bb93b..e1fd2ba678 100644
--- a/src/NzbDrone.Core/Localization/Core/pt_BR.json
+++ b/src/NzbDrone.Core/Localization/Core/pt_BR.json
@@ -98,7 +98,7 @@
     "Forecast": "Previsão",
     "FollowPerson": "Seguir pessoa",
     "Folders": "Pastas",
-    "FolderMoveRenameWarning": "Isso também renomeará a pasta do filme de acordo com o formato para pastas de filmes nas Configurações.",
+    "MoveMovieFoldersRenameFolderWarning": "Isso também renomeará a pasta do filme de acordo com o formato para pastas de filmes nas Configurações.",
     "Folder": "Pasta",
     "FocusSearchBox": "Selecionar a caixa de pesquisa",
     "Fixed": "Corrigido",
@@ -491,8 +491,8 @@
     "MovieChat": "Bate-papo sobre o filme",
     "MovieAlreadyExcluded": "Filme já excluído",
     "Movie": "Filme",
-    "MoveFolders2": "Deseja mover os arquivos de filmes de \"{0}\" para \"{1}\"?",
-    "MoveFolders1": "Deseja mover as pastas de filmes para \"{0}\"?",
+    "MoveMovieFoldersToNewPath": "Deseja mover os arquivos de filmes de \"{0}\" para \"{1}\"?",
+    "MoveMovieFoldersToRootFolder": "Deseja mover as pastas de filmes para \"{0}\"?",
     "MoveFiles": "Mover arquivos",
     "MountMovieHealthCheckMessage": "O ponto de montagem que contém um caminho de filme é montado somente para leitura: ",
     "MoreInfo": "Mais informações",
@@ -515,7 +515,7 @@
     "Wiki": "Wiki",
     "Year": "Ano",
     "YesCancel": "Sim, Cancelar",
-    "YesMoveFiles": "Sim, mova os arquivos",
+    "MoveMovieFoldersMoveFiles": "Sim, mova os arquivos",
     "YouCanAlsoSearch": "Você também pode pesquisar usando TMDb ID ou IMDb ID de um filme. Por exemplo: `tmdb: 71663`",
     "NoMatchFound": "Nenhum resultado encontrado!",
     "NoLogFiles": "Nenhum arquivo de registro",
@@ -870,7 +870,7 @@
     "NoResultsFound": "Nenhum resultado encontrado",
     "None": "Nenhum",
     "NoMoviesExist": "Nenhum filme encontrado. Para começar, adicione um novo filme ou importe alguns existentes.",
-    "NoMoveFilesSelf": " Não, eu mesmo moverei os arquivos",
+    "MoveMovieFoldersDontMoveFiles": " Não, eu mesmo moverei os arquivos",
     "NoMinimumForAnyRuntime": "Sem mínimo para qualquer duração",
     "ReplaceWithSpaceDashSpace": "Substituir com Espaço, Traço e Espaço",
     "ReplaceWithSpaceDash": "Substituir por Espaço e Traço",
diff --git a/src/NzbDrone.Core/Localization/Core/ro.json b/src/NzbDrone.Core/Localization/Core/ro.json
index 053237e6d5..5b453f87c6 100644
--- a/src/NzbDrone.Core/Localization/Core/ro.json
+++ b/src/NzbDrone.Core/Localization/Core/ro.json
@@ -292,7 +292,7 @@
     "MinutesHundredTwenty": "120 de minute: {0}",
     "MinutesNinety": "90 de minute: {0}",
     "Months": "Luni",
-    "MoveFolders1": "Doriți să mutați dosarele filmelor în „{0}”?",
+    "MoveMovieFoldersToRootFolder": "Doriți să mutați dosarele filmelor în „{0}”?",
     "MovieInvalidFormat": "Film: Format nevalid",
     "NoListRecommendations": "Nu s-au găsit elemente de listă sau recomandări, pentru a începe, va trebui să adăugați un film nou, să importați unele existente sau să adăugați o listă.",
     "NoTagsHaveBeenAddedYet": "Nu s-au adăugat încă etichete",
@@ -335,7 +335,7 @@
     "Version": "Versiune",
     "YouCanAlsoSearch": "De asemenea, puteți căuta utilizând ID-ul TMDb sau ID-ul IMDb al unui film. de exemplu. `tmdb: 71663`",
     "MissingMonitoredAndConsideredAvailable": "Lipsește (monitorizat)",
-    "MoveFolders2": "Doriți să mutați fișierele filmului din „{0}” în „{1}”?",
+    "MoveMovieFoldersToNewPath": "Doriți să mutați fișierele filmului din „{0}” în „{1}”?",
     "Result": "Rezultat",
     "DownloadPropersAndRepacksHelpTextCustomFormat": "Utilizați „Nu preferați” pentru a sorta în funcție de scorul de format personalizat peste Propers / Repacks",
     "ImportFailed": "Importul nu a reușit: {0}",
@@ -442,7 +442,7 @@
     "NoEventsFound": "Nu s-au găsit evenimente",
     "NoLinks": "Fără linkuri",
     "NoMinimumForAnyRuntime": "Niciun minim pentru orice timp de rulare",
-    "NoMoveFilesSelf": " Nu, voi muta singur dosarele",
+    "MoveMovieFoldersDontMoveFiles": " Nu, voi muta singur dosarele",
     "NoMoviesExist": "Nu s-au găsit filme, pentru a începe, va trebui să adăugați un film nou sau să importați unele existente.",
     "None": "Nici unul",
     "NoResultsFound": "Nici un rezultat gasit",
@@ -683,7 +683,7 @@
     "FilterPlaceHolder": "Căutați filme",
     "Fixed": "Fix",
     "FocusSearchBox": "Caseta de căutare Focus",
-    "FolderMoveRenameWarning": "Aceasta va redenumi și folderul filmului în funcție de formatul folderului filmului în setări.",
+    "MoveMovieFoldersRenameFolderWarning": "Aceasta va redenumi și folderul filmului în funcție de formatul folderului filmului în setări.",
     "Folders": "Dosare",
     "FollowPerson": "Urmărește persoana",
     "SupportedDownloadClientsMoreInfo": "Pentru mai multe informații despre clienții individuali de descărcare, faceți clic pe butoanele de informații.",
@@ -939,7 +939,7 @@
     "Wiki": "Wiki",
     "WouldYouLikeToRestoreBackup": "Doriți să restaurați copia de rezervă {0}?",
     "YesCancel": "Da, Anulați",
-    "YesMoveFiles": "Da, mutați fișierele",
+    "MoveMovieFoldersMoveFiles": "Da, mutați fișierele",
     "Yesterday": "Ieri",
     "MaintenanceRelease": "Versiune de întreținere: remedieri de erori și alte îmbunătățiri. Consultați Istoricul comiterilor Github pentru mai multe detalii",
     "MissingNotMonitored": "Lipsește (fără monitorizare)",
diff --git a/src/NzbDrone.Core/Localization/Core/ru.json b/src/NzbDrone.Core/Localization/Core/ru.json
index 8768d6750c..46cb4610f5 100644
--- a/src/NzbDrone.Core/Localization/Core/ru.json
+++ b/src/NzbDrone.Core/Localization/Core/ru.json
@@ -291,7 +291,7 @@
     "WhatsNew": "Что нового?",
     "Wiki": "Wiki",
     "WouldYouLikeToRestoreBackup": "Хотите восстановить резервную копию '{name}'?",
-    "YesMoveFiles": "Да, перенести файлы",
+    "MoveMovieFoldersMoveFiles": "Да, перенести файлы",
     "Logs": "Журналы",
     "ManualImport": "Ручной импорт",
     "MarkAsFailed": "Пометить как неудачный",
@@ -465,7 +465,7 @@
     "NoResultsFound": "Нет результатов",
     "None": "Ничего",
     "NoMoviesExist": "Фильмов не найдено. Для начала вам нужно добавить новый фильм или импортировать уже существующие.",
-    "NoMoveFilesSelf": " Нет, я сам перенесу файлы",
+    "MoveMovieFoldersDontMoveFiles": " Нет, я сам перенесу файлы",
     "NoMinimumForAnyRuntime": "Нет минимума для любого времени",
     "NoMatchFound": "Совпадений не найдено!",
     "NoLogFiles": "Файлов журнала нет",
@@ -519,8 +519,8 @@
     "MovieChat": "Чат по фильму",
     "MovieAlreadyExcluded": "Фильм уже добавлен в исключения",
     "Movie": "Фильм",
-    "MoveFolders2": "Желаете перенести паки с фильмами из '{0}' в '{1}' ?",
-    "MoveFolders1": "Желаете перенести папки с фильмами в '{0}' ?",
+    "MoveMovieFoldersToNewPath": "Желаете перенести паки с фильмами из '{0}' в '{1}' ?",
+    "MoveMovieFoldersToRootFolder": "Желаете перенести папки с фильмами в '{0}' ?",
     "MoveFiles": "Переместить файлы",
     "MoreInfo": "Больше информации",
     "MoreDetails": "Ещё подробности",
@@ -589,7 +589,7 @@
     "Forecast": "Прогноз",
     "FollowPerson": "Отслеживать человека",
     "Folders": "Папки",
-    "FolderMoveRenameWarning": "Папка фильма будет переименована согласно формату в настройках.",
+    "MoveMovieFoldersRenameFolderWarning": "Папка фильма будет переименована согласно формату в настройках.",
     "Folder": "Каталог",
     "Fixed": "Исправлено",
     "FirstDayOfWeek": "Первый день недели",
diff --git a/src/NzbDrone.Core/Localization/Core/sv.json b/src/NzbDrone.Core/Localization/Core/sv.json
index 07bb14e90e..22d67d6d45 100644
--- a/src/NzbDrone.Core/Localization/Core/sv.json
+++ b/src/NzbDrone.Core/Localization/Core/sv.json
@@ -427,7 +427,7 @@
     "IgnoredAddresses": "Ignorerade adresser",
     "ICalFeed": "iCal-flöde",
     "Wiki": "Wiki",
-    "YesMoveFiles": "Ja, flytta filerna",
+    "MoveMovieFoldersMoveFiles": "Ja, flytta filerna",
     "YesCancel": "Ja, avbryt",
     "RenameMovies": "Byt namn på filmer",
     "RemoveMovieAndKeepFiles": "Ta bort film och behåll filerna",
@@ -528,9 +528,9 @@
     "ShowCertification": "Visa certifiering",
     "ShowMovieInformationHelpText": "Visa filmgenrer och certifiering",
     "ShowMovieInformation": "Visa filminformation",
-    "MoveFolders1": "Skulle du vilja flytta filmmapparna till '{0}' ?",
+    "MoveMovieFoldersToRootFolder": "Skulle du vilja flytta filmmapparna till '{0}' ?",
     "MovieFiles": "Filmfiler",
-    "MoveFolders2": "Skulle du vilja flytta filmfilerna från '{0}' till '{1}' ?",
+    "MoveMovieFoldersToNewPath": "Skulle du vilja flytta filmfilerna från '{0}' till '{1}' ?",
     "EditQualityProfile": "Redigera kvalitetsprofil",
     "EditImportListExclusion": "Redigera listuteslutning",
     "EditGroups": "Redigera grupper",
@@ -552,7 +552,7 @@
     "InteractiveImport": "Interaktiv import",
     "NoMoviesExist": "Inga filmer hittades, för att komma igång lägg till en ny film eller importera några befintliga.",
     "NoMinimumForAnyRuntime": "Inget minimum för någon körtid",
-    "NoMoveFilesSelf": " Nej, jag flyttar filerna själv",
+    "MoveMovieFoldersDontMoveFiles": " Nej, jag flyttar filerna själv",
     "NoLimitForAnyRuntime": "Ingen gräns för någon körtid",
     "NoLeaveIt": "Nej, lämna det",
     "NoEventsFound": "Inga händelser hittades",
@@ -785,7 +785,7 @@
     "FileNames": "Filnamn",
     "Fixed": "Fast",
     "FocusSearchBox": "Fokus sökruta",
-    "FolderMoveRenameWarning": "Detta kommer också att byta namn på filmmappen enligt filmmappens format i inställningarna.",
+    "MoveMovieFoldersRenameFolderWarning": "Detta kommer också att byta namn på filmmappen enligt filmmappens format i inställningarna.",
     "FollowPerson": "Följ Person",
     "SupportedDownloadClientsMoreInfo": "Klicka på informationsknapparna för mer information om de enskilda nedladdningsklienterna.",
     "SupportedIndexersMoreInfo": "För mer information om de enskilda indexerarna, klicka på informationsknapparna.",
diff --git a/src/NzbDrone.Core/Localization/Core/th.json b/src/NzbDrone.Core/Localization/Core/th.json
index af6e6cf809..19709f2dba 100644
--- a/src/NzbDrone.Core/Localization/Core/th.json
+++ b/src/NzbDrone.Core/Localization/Core/th.json
@@ -73,7 +73,7 @@
     "ExtraFileExtensionsHelpText": "รายการไฟล์พิเศษที่คั่นด้วยจุลภาคที่จะนำเข้า (.nfo จะนำเข้าเป็น. nfo-orig)",
     "FailedToLoadMovieFromAPI": "ไม่สามารถโหลดภาพยนตร์จาก API",
     "ChangeFileDateHelpText": "เปลี่ยนวันที่ของไฟล์ในการนำเข้า / สแกนใหม่",
-    "FolderMoveRenameWarning": "นอกจากนี้ยังจะเปลี่ยนชื่อโฟลเดอร์ภาพยนตร์ตามรูปแบบโฟลเดอร์ภาพยนตร์ในการตั้งค่า",
+    "MoveMovieFoldersRenameFolderWarning": "นอกจากนี้ยังจะเปลี่ยนชื่อโฟลเดอร์ภาพยนตร์ตามรูปแบบโฟลเดอร์ภาพยนตร์ในการตั้งค่า",
     "FollowPerson": "ติดตามบุคคล",
     "SupportedListsMoreInfo": "สำหรับข้อมูลเพิ่มเติมเกี่ยวกับรายการนำเข้าแต่ละรายการให้คลิกที่ปุ่มข้อมูล",
     "SupportedIndexersMoreInfo": "สำหรับข้อมูลเพิ่มเติมเกี่ยวกับตัวสร้างดัชนีแต่ละตัวคลิกที่ปุ่มข้อมูล",
@@ -107,7 +107,7 @@
     "MinimumAgeHelpText": "Usenet เท่านั้น: อายุต่ำสุดเป็นนาทีของ NZB ก่อนที่จะถูกคว้า ใช้สิ่งนี้เพื่อให้เวลารุ่นใหม่เผยแพร่ไปยังผู้ให้บริการ usenet ของคุณ",
     "MinimumFreeSpaceHelpText": "ป้องกันการนำเข้าหากเหลือพื้นที่ดิสก์น้อยกว่าจำนวนนี้",
     "MonitoredHelpText": "ดาวน์โหลดภาพยนตร์ถ้ามี",
-    "MoveFolders1": "คุณต้องการย้ายโฟลเดอร์ภาพยนตร์ไปที่ \"{0}\" หรือไม่",
+    "MoveMovieFoldersToRootFolder": "คุณต้องการย้ายโฟลเดอร์ภาพยนตร์ไปที่ \"{0}\" หรือไม่",
     "MoreInfo": "ข้อมูลเพิ่มเติม",
     "MovieAlreadyExcluded": "ยกเว้นภาพยนตร์แล้ว",
     "MovieDetailsNextMovie": "รายละเอียดภาพยนตร์: ภาพยนตร์เรื่องต่อไป",
@@ -195,7 +195,7 @@
     "Year": "ปี",
     "YouCanAlsoSearch": "คุณยังสามารถค้นหาโดยใช้ TMDb ID หรือ IMDb ID ของภาพยนตร์ เช่น. `tmdb: 71663`",
     "MaintenanceRelease": "รุ่นการบำรุงรักษา: การแก้ไขข้อบกพร่องและการปรับปรุงอื่น ๆ ดู Github Commit History สำหรับรายละเอียดเพิ่มเติม",
-    "MoveFolders2": "คุณต้องการย้ายไฟล์ภาพยนตร์จาก \"{0}\" ไปที่ \"{1}\" หรือไม่",
+    "MoveMovieFoldersToNewPath": "คุณต้องการย้ายไฟล์ภาพยนตร์จาก \"{0}\" ไปที่ \"{1}\" หรือไม่",
     "MovieExcludedFromAutomaticAdd": "ภาพยนตร์ไม่รวมจากการเพิ่มอัตโนมัติ",
     "Search": "ค้นหา",
     "AddNew": "เพิ่มใหม่",
@@ -343,7 +343,7 @@
     "NextExecution": "การดำเนินการถัดไป",
     "NoAlternativeTitles": "ไม่มีชื่ออื่น",
     "NoEventsFound": "ไม่พบกิจกรรม",
-    "NoMoveFilesSelf": " ไม่ฉันจะย้ายไฟล์เอง",
+    "MoveMovieFoldersDontMoveFiles": " ไม่ฉันจะย้ายไฟล์เอง",
     "None": "ไม่มี",
     "NoResultsFound": "ไม่พบผลลัพธ์",
     "BranchUpdate": "สาขาที่จะใช้ในการอัปเดต {appName}",
@@ -937,7 +937,7 @@
     "WhitelistedSubtitleTags": "แท็กคำบรรยายที่อนุญาตพิเศษ",
     "WouldYouLikeToRestoreBackup": "คุณต้องการกู้คืนข้อมูลสำรอง {0} หรือไม่",
     "YesCancel": "ใช่ยกเลิก",
-    "YesMoveFiles": "ใช่ย้ายไฟล์",
+    "MoveMovieFoldersMoveFiles": "ใช่ย้ายไฟล์",
     "Yesterday": "เมื่อวานนี้",
     "MissingMonitoredAndConsideredAvailable": "ขาดหายไป (ตรวจสอบ)",
     "MissingNotMonitored": "ขาดหายไป (ไม่ถูกตรวจสอบ)",
diff --git a/src/NzbDrone.Core/Localization/Core/tr.json b/src/NzbDrone.Core/Localization/Core/tr.json
index 894a6fb1c0..75b8af0393 100644
--- a/src/NzbDrone.Core/Localization/Core/tr.json
+++ b/src/NzbDrone.Core/Localization/Core/tr.json
@@ -365,7 +365,7 @@
     "Wiki": "Wiki",
     "WouldYouLikeToRestoreBackup": "'{name}' yedeğini geri yüklemek ister misiniz?",
     "YesCancel": "Evet İptal",
-    "YesMoveFiles": "Evet, Dosyaları Taşı",
+    "MoveMovieFoldersMoveFiles": "Evet, Dosyaları Taşı",
     "Yesterday": "Dün",
     "YouCanAlsoSearch": "Filmin TMDb kimliğini veya IMDb kimliğini kullanarak da arama yapabilirsiniz. Örneğin. \"tmdb: 50737\"",
     "MaintenanceRelease": "Bakım Sürümü: hata düzeltmeleri ve diğer iyileştirmeler. Daha fazla ayrıntı için Github İşlem Geçmişine bakın",
@@ -470,7 +470,7 @@
     "NextExecution": "Sonraki Yürütme",
     "NoAlternativeTitles": "Alternatif başlık yok.",
     "NoLinks": "Bağlantı Yok",
-    "NoMoveFilesSelf": " Hayır, Dosyaları Kendim Taşıyacağım",
+    "MoveMovieFoldersDontMoveFiles": " Hayır, Dosyaları Kendim Taşıyacağım",
     "None": "Yok",
     "NoResultsFound": "Sonuç bulunamadı",
     "MovieFilesTotaling": "Film Dosyaları Toplamı",
@@ -739,7 +739,7 @@
     "FilterPlaceHolder": "Film ara",
     "FirstDayOfWeek": "Haftanın İlk Günü",
     "Fixed": "Düzeltilen",
-    "FolderMoveRenameWarning": "Bu aynı zamanda ayarlarda film klasörü formatına göre film klasörünü yeniden adlandıracaktır.",
+    "MoveMovieFoldersRenameFolderWarning": "Bu aynı zamanda ayarlarda film klasörü formatına göre film klasörünü yeniden adlandıracaktır.",
     "SupportedDownloadClientsMoreInfo": "Bireysel indirme istemcileri hakkında daha fazla bilgi için bilgi düğmelerine tıklayın.",
     "SupportedListsMoreInfo": "Ayrı ayrı içe aktarma listeleri hakkında daha fazla bilgi için bilgi düğmelerine tıklayın.",
     "SupportedIndexersMoreInfo": "Bireysel indeksleyiciler hakkında daha fazla bilgi için bilgi düğmelerine tıklayın.",
@@ -821,7 +821,7 @@
     "MonitoredStatus": "Takip Edilen/Durum",
     "MonitorMovie": "Filmi Takip Et",
     "Months": "Aylar",
-    "MoveFolders1": "Film klasörlerini '{0}' klasörüne taşımak ister misiniz?",
+    "MoveMovieFoldersToRootFolder": "Film klasörlerini '{0}' klasörüne taşımak ister misiniz?",
     "MovieAlreadyExcluded": "Film zaten Hariç tutuldu",
     "MovieChat": "Film Sohbeti",
     "MovieDetailsNextMovie": "Film Ayrıntıları: Sonraki Film",
@@ -943,7 +943,7 @@
     "Weeks": "Haftalar",
     "MissingMonitoredAndConsideredAvailable": "Eksik (Takip Ediliyor)",
     "MissingNotMonitored": "Eksik (Takip Edilmiyor)",
-    "MoveFolders2": "Film dosyalarını '{0}' konumundan '{1}' konumuna taşımak ister misiniz?",
+    "MoveMovieFoldersToNewPath": "Film dosyalarını '{0}' konumundan '{1}' konumuna taşımak ister misiniz?",
     "SqliteVersionCheckUpgradeRequiredMessage": "Şu anda kurulu olan SQLite sürümü {0} artık desteklenmiyor. Lütfen SQLite'ı en az {1} sürümüne yükseltin.",
     "ShowCinemaRelease": "Sinema Çıkış Tarihini Göster",
     "ShowReleaseDate": "Çıkış Tarihini Göster",
diff --git a/src/NzbDrone.Core/Localization/Core/uk.json b/src/NzbDrone.Core/Localization/Core/uk.json
index eef5500054..4176ff8ebb 100644
--- a/src/NzbDrone.Core/Localization/Core/uk.json
+++ b/src/NzbDrone.Core/Localization/Core/uk.json
@@ -308,7 +308,7 @@
     "Language": "Мова",
     "MetadataSettingsMovieSummary": "Створюйте файли метаданих, коли фільми імпортуються або оновлюються",
     "Month": "Місяць",
-    "NoMoveFilesSelf": " Ні, я сам перенесу файли",
+    "MoveMovieFoldersDontMoveFiles": " Ні, я сам перенесу файли",
     "Sunday": "Неділя",
     "Tasks": "Задачі",
     "Today": "Сьогодні",
@@ -413,7 +413,7 @@
     "AnalyseVideoFilesHelpText": "Отримайте з файлів інформацію про відео, таку як роздільна здатність, час виконання та кодек. Це вимагає, щоб {appName} читав частини файлу, що може спричинити високу дискову або мережеву активність під час сканування.",
     "ExtraFileExtensionsHelpText": "Розділений комами список додаткових файлів для імпорту (.nfo буде імпортовано як .nfo-orig)",
     "FileNameTokens": "Маркери імен файлів",
-    "FolderMoveRenameWarning": "Це також перейменує папку з фільмами відповідно до формату папки з фільмами в налаштуваннях.",
+    "MoveMovieFoldersRenameFolderWarning": "Це також перейменує папку з фільмами відповідно до формату папки з фільмами в налаштуваннях.",
     "IndexerSearchCheckNoAutomaticMessage": "Немає доступних індексаторів із увімкненим автоматичним пошуком, {appName} не надаватиме автоматичних результатів пошуку",
     "HiddenClickToShow": "Приховано, натисніть, щоб показати",
     "HomePage": "Домашня сторінка",
@@ -439,8 +439,8 @@
     "MinimumFreeSpace": "Мінімальний вільний простір",
     "MinimumLimits": "Мінімальні обмеження",
     "MovieCollectionRootFolderMissingRootHealthCheckMessage": "Відсутня коренева папка для колекції фільмів: {rootFolderInfo}",
-    "MoveFolders1": "Бажаєте перемістити папки з фільмами до \"{0}\"?",
-    "MoveFolders2": "Бажаєте перемістити файли фільму з \"{0}\" до \"{1}\"?",
+    "MoveMovieFoldersToRootFolder": "Бажаєте перемістити папки з фільмами до \"{0}\"?",
+    "MoveMovieFoldersToNewPath": "Бажаєте перемістити файли фільму з \"{0}\" до \"{1}\"?",
     "MovieFolderFormat": "Формат папки фільму",
     "MovieIndexScrollTop": "Індекс фільму: прокрутка вгору",
     "MovieInfoLanguageHelpText": "Мова, яку {appName} використовуватиме для інформації про фільм в інтерфейсі користувача",
@@ -920,7 +920,7 @@
     "WhitelistedSubtitleTags": "Теги субтитрів із білого списку",
     "Year": "Рік",
     "YesCancel": "Так, скасувати",
-    "YesMoveFiles": "Так, перемістити файли",
+    "MoveMovieFoldersMoveFiles": "Так, перемістити файли",
     "Yesterday": "Вчора",
     "ApplicationURL": "URL програми",
     "ApplicationUrlHelpText": "Зовнішня URL-адреса цієї програми, включаючи http(s)://, порт і базу URL-адрес",
diff --git a/src/NzbDrone.Core/Localization/Core/vi.json b/src/NzbDrone.Core/Localization/Core/vi.json
index 922345710b..60b653cb67 100644
--- a/src/NzbDrone.Core/Localization/Core/vi.json
+++ b/src/NzbDrone.Core/Localization/Core/vi.json
@@ -108,7 +108,7 @@
     "MonitoredHelpText": "Tải xuống phim nếu có",
     "MonitoredOnly": "Chỉ giám sát",
     "MonitoredStatus": "Theo dõi / Trạng thái",
-    "MoveFolders1": "Bạn có muốn di chuyển các thư mục phim vào '{0}' không?",
+    "MoveMovieFoldersToRootFolder": "Bạn có muốn di chuyển các thư mục phim vào '{0}' không?",
     "MovieAlreadyExcluded": "Phim đã bị loại trừ",
     "MovieChat": "Trò chuyện phim",
     "MovieDetailsNextMovie": "Chi tiết phim: Phim tiếp theo",
@@ -276,7 +276,7 @@
     "Yesterday": "Hôm qua",
     "MaintenanceRelease": "Bản phát hành bảo trì: sửa lỗi và các cải tiến khác. Xem Lịch sử cam kết Github để biết thêm chi tiết",
     "MissingMonitoredAndConsideredAvailable": "Thiếu (Theo dõi)",
-    "MoveFolders2": "Bạn có muốn di chuyển các tệp phim từ '{0}' sang '{1}' không?",
+    "MoveMovieFoldersToNewPath": "Bạn có muốn di chuyển các tệp phim từ '{0}' sang '{1}' không?",
     "MovieExcludedFromAutomaticAdd": "Phim bị loại trừ khỏi tính năng thêm tự động",
     "AvailabilityDelay": "Độ trễ sẵn có",
     "AddMovie": "Thêm phim",
@@ -407,7 +407,7 @@
     "MovieIsRecommend": "Phim được đề xuất dựa trên phần bổ sung gần đây",
     "MovieNaming": "Đặt tên phim",
     "NoMinimumForAnyRuntime": "Không có tối thiểu cho bất kỳ thời gian chạy nào",
-    "NoMoveFilesSelf": " Không, tôi sẽ tự di chuyển tệp",
+    "MoveMovieFoldersDontMoveFiles": " Không, tôi sẽ tự di chuyển tệp",
     "NoMoviesExist": "Không tìm thấy phim nào, để bắt đầu, bạn sẽ muốn thêm phim mới hoặc nhập một số phim hiện có.",
     "None": "không ai",
     "NoResultsFound": "không tìm thấy kết quả nào",
@@ -741,7 +741,7 @@
     "Fixed": "đã sửa",
     "FocusSearchBox": "Hộp Tìm kiếm Tiêu điểm",
     "Folder": "Thư mục",
-    "FolderMoveRenameWarning": "Thao tác này cũng sẽ đổi tên thư mục phim theo định dạng thư mục phim trong cài đặt.",
+    "MoveMovieFoldersRenameFolderWarning": "Thao tác này cũng sẽ đổi tên thư mục phim theo định dạng thư mục phim trong cài đặt.",
     "Folders": "Thư mục",
     "FollowPerson": "Theo dõi người",
     "Forecast": "Dự báo",
@@ -938,7 +938,7 @@
     "Wiki": "Wiki",
     "Year": "Năm",
     "YesCancel": "Có, Hủy bỏ",
-    "YesMoveFiles": "Có, di chuyển tệp",
+    "MoveMovieFoldersMoveFiles": "Có, di chuyển tệp",
     "YouCanAlsoSearch": "Bạn cũng có thể tìm kiếm bằng cách sử dụng TMDb ID hoặc IMDb ID của một bộ phim. ví dụ. `tmdb: 71663 '",
     "MissingNotMonitored": "Thiếu (Không được giám sát)",
     "MovieDetailsPreviousMovie": "Chi tiết phim: Phim trước",
diff --git a/src/NzbDrone.Core/Localization/Core/zh_CN.json b/src/NzbDrone.Core/Localization/Core/zh_CN.json
index cf01b59ecf..f307b52e55 100644
--- a/src/NzbDrone.Core/Localization/Core/zh_CN.json
+++ b/src/NzbDrone.Core/Localization/Core/zh_CN.json
@@ -545,15 +545,15 @@
     "OnLatestVersion": "已安装最新版的{appName}",
     "OnGrab": "抓取中",
     "NotMonitored": "不追踪项",
-    "NoMoveFilesSelf": " 不，我要自己移动文件",
+    "MoveMovieFoldersDontMoveFiles": " 不，我要自己移动文件",
     "NoLeaveIt": "不，就这样",
     "NamingSettings": "命名设置",
     "Name": "名称",
     "MovieIsOnImportExclusionList": "电影在导入排除列表中",
     "MovieInvalidFormat": "电影: 无效格式",
     "MovieFilesTotaling": "电影文件总计",
-    "MoveFolders2": "要将电影文件从“{0}” 移至 “{1}” 吗？",
-    "MoveFolders1": "要将电影文件夹移至 “{0}” 吗？",
+    "MoveMovieFoldersToNewPath": "要将电影文件从“{0}” 移至 “{1}” 吗？",
+    "MoveMovieFoldersToRootFolder": "要将电影文件夹移至 “{0}” 吗？",
     "MonitorMovie": "追踪电影",
     "MonitoredStatus": "已追踪/状态",
     "MonitoredOnly": "已追踪项",
@@ -610,7 +610,7 @@
     "GrabRelease": "抓取版本",
     "GoToInterp": "跳转到 {0}",
     "Genres": "类型",
-    "FolderMoveRenameWarning": "这也将根据设置中的电影文件夹格式重命名电影文件夹。",
+    "MoveMovieFoldersRenameFolderWarning": "这也将根据设置中的电影文件夹格式重命名电影文件夹。",
     "FocusSearchBox": "聚焦搜索框",
     "Fixed": "已修复",
     "FailedToLoadMovieFromAPI": "从 API 加载电影失败",
@@ -696,7 +696,7 @@
     "Qualities": "质量",
     "TagIsNotUsedAndCanBeDeleted": "标签未被使用，可删除",
     "LastUsed": "上次使用",
-    "YesMoveFiles": "是，移动文件",
+    "MoveMovieFoldersMoveFiles": "是，移动文件",
     "UpdateMechanismHelpText": "使用 {appName} 内置的更新程序或脚本",
     "SystemTimeHealthCheckMessage": "系统时间相差超过1天。在纠正时间之前，计划的任务可能无法正确运行",
     "Table": "表格",