diff --git a/Common/File/Path.cpp b/Common/File/Path.cpp
index b6504978b2..dc6d9e92ee 100644
--- a/Common/File/Path.cpp
+++ b/Common/File/Path.cpp
@@ -251,6 +251,22 @@ bool Path::StartsWith(const Path &other) const {
 	return startsWith(path_, other.path_);
 }
 
+bool Path::StartsWithGlobal(const Path &other) const {
+	if (other.empty()) {
+		return true;
+	}
+	if (type_ != other.type_) {
+		// Bad
+		return false;
+	}
+	if (type_ == PathType::CONTENT_URI) {
+		AndroidContentURI a(path_);
+		AndroidContentURI b(other.path_);
+		return startsWith(a.GetLastPart(), b.GetLastPart());
+	}
+	return StartsWith(other);
+}
+
 const std::string &Path::ToString() const {
 	return path_;
 }
diff --git a/Common/File/Path.h b/Common/File/Path.h
index 5f2117cab2..f649a899c1 100644
--- a/Common/File/Path.h
+++ b/Common/File/Path.h
@@ -123,8 +123,12 @@ public:
 
 	bool FilePathContainsNoCase(std::string_view needle) const;
 
+	// WARNING: This can return wrong results if two ContentURI have different root paths.
 	bool StartsWith(const Path &other) const;
 
+	// This handles ContentURI with different paths "correctly".
+	bool StartsWithGlobal(const Path &other) const;
+
 	bool operator <(const Path &other) const {
 		return path_ < other.path_;
 	}
diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp
index c92bdaa11c..4230c3529d 100644
--- a/GPU/Vulkan/GPU_Vulkan.cpp
+++ b/GPU/Vulkan/GPU_Vulkan.cpp
@@ -454,7 +454,7 @@ void GPU_Vulkan::DeviceLost() {
 }
 
 void GPU_Vulkan::DeviceRestore(Draw::DrawContext *draw) {
-	GPUCommonHW::DeviceRestore(draw);
+	GPUCommonHW::DeviceRestore(draw);  // this updates draw_.
 
 	VulkanContext *vulkan = (VulkanContext *)draw_->GetNativeObject(Draw::NativeObject::CONTEXT);
 	pipelineManager_->DeviceRestore(vulkan);
diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp
index 0df3e838c0..d9e23a783b 100644
--- a/GPU/Vulkan/TextureCacheVulkan.cpp
+++ b/GPU/Vulkan/TextureCacheVulkan.cpp
@@ -230,11 +230,13 @@ void TextureCacheVulkan::DeviceLost() {
 }
 
 void TextureCacheVulkan::DeviceRestore(Draw::DrawContext *draw) {
-	VulkanContext *vulkan = (VulkanContext *)draw->GetNativeObject(Draw::NativeObject::CONTEXT);
 	draw_ = draw;
 
 	_assert_(!allocator_);
 
+	VulkanContext *vulkan = (VulkanContext *)draw->GetNativeObject(Draw::NativeObject::CONTEXT);
+	_assert_(vulkan);
+
 	samplerCache_.DeviceRestore(vulkan);
 	textureShaderCache_->DeviceRestore(draw);
 
diff --git a/UI/MemStickScreen.cpp b/UI/MemStickScreen.cpp
index 7c40c9dee4..3563de60d1 100644
--- a/UI/MemStickScreen.cpp
+++ b/UI/MemStickScreen.cpp
@@ -458,7 +458,9 @@ void MemStickScreen::update() {
 
 ConfirmMemstickMoveScreen::ConfirmMemstickMoveScreen(const Path &newMemstickFolder, bool initialSetup)
 	: newMemstickFolder_(newMemstickFolder), initialSetup_(initialSetup), progressReporter_() {
+	const Path &oldMemstickFolder = g_Config.memStickDirectory;
 	existingFilesInNewFolder_ = FolderSeemsToBeUsed(newMemstickFolder);
+	folderConflict_ = newMemstickFolder.StartsWithGlobal(oldMemstickFolder);
 	if (initialSetup_) {
 		moveData_ = false;
 	}
@@ -487,7 +489,7 @@ void ConfirmMemstickMoveScreen::CreateViews() {
 
 	root_ = new LinearLayout(ORIENT_HORIZONTAL);
 
-	Path &oldMemstickFolder = g_Config.memStickDirectory;
+	const Path &oldMemstickFolder = g_Config.memStickDirectory;
 
 	Spacer *spacerColumn = new Spacer(new LinearLayoutParams(20.0, FILL_PARENT, 0.0f));
 	ViewGroup *leftColumn = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0));
@@ -498,7 +500,7 @@ void ConfirmMemstickMoveScreen::CreateViews() {
 
 	leftColumn->Add(new TextView(ms->T("Selected PSP Data Folder"), ALIGN_LEFT, false));
 	if (!initialSetup_) {
-		leftColumn->Add(new NoticeView(NoticeLevel::WARN, ms->T("PPSSPP will restart after the change"), ""));
+		leftColumn->Add(new NoticeView(NoticeLevel::INFO, ms->T("PPSSPP will restart after the change"), ""));
 	}
 	leftColumn->Add(new TextView(newMemstickFolder_.ToVisualString(), ALIGN_LEFT, false));
 
@@ -516,6 +518,11 @@ void ConfirmMemstickMoveScreen::CreateViews() {
 			leftColumn->Add(new NoticeView(NoticeLevel::INFO, ms->T("No data will be changed"), ""));
 		}
 	}
+
+	if (folderConflict_) {
+		leftColumn->Add(new NoticeView(NoticeLevel::WARN, ms->T("The new folder is inside the previous one"), ""));
+	}
+
 	if (!error_.empty()) {
 		leftColumn->Add(new TextView(error_, ALIGN_LEFT, false));
 	}
diff --git a/UI/MemStickScreen.h b/UI/MemStickScreen.h
index e65b458335..8e14fd83bc 100644
--- a/UI/MemStickScreen.h
+++ b/UI/MemStickScreen.h
@@ -116,6 +116,8 @@ private:
 
 	Path newMemstickFolder_;
 	bool existingFilesInNewFolder_;
+	bool folderConflict_;
+
 #if PPSSPP_PLATFORM(UWP) && !defined(__LIBRETRO__)
 	bool moveData_ = false;
 #else
diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini
index 78558108e1..3aa593d3d0 100644
--- a/assets/lang/ar_AE.ini
+++ b/assets/lang/ar_AE.ini
@@ -918,6 +918,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini
index dfbef6b3f0..919fa3876f 100644
--- a/assets/lang/az_AZ.ini
+++ b/assets/lang/az_AZ.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/be_BY.ini b/assets/lang/be_BY.ini
index 0c0b9c8faf..05a3ead040 100644
--- a/assets/lang/be_BY.ini
+++ b/assets/lang/be_BY.ini
@@ -1079,6 +1079,7 @@ No data will be changed = No data will be changed
 PPSSPP will restart after the change = PPSSPP will restart after the change
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini
index b0c4084aa4..2f60165fc7 100644
--- a/assets/lang/bg_BG.ini
+++ b/assets/lang/bg_BG.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini
index c73782404c..e657eaef8d 100644
--- a/assets/lang/ca_ES.ini
+++ b/assets/lang/ca_ES.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini
index 4c0e150145..816204df61 100644
--- a/assets/lang/cz_CZ.ini
+++ b/assets/lang/cz_CZ.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini
index 299574c279..f0fd96e0c4 100644
--- a/assets/lang/da_DK.ini
+++ b/assets/lang/da_DK.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini
index 3f95f66a1b..a832701fab 100644
--- a/assets/lang/de_DE.ini
+++ b/assets/lang/de_DE.ini
@@ -905,6 +905,7 @@ PPSSPP will restart after the change = PPSSPP wird nach der Änderung neu gestar
 Skip for now = Erstmal überspringen
 Starting move... = Verschieben starten...
 That folder doesn't work as a memstick folder. = Dieser Ordner funktioniert nicht als Memstick-Ordner.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB-Zugriff über Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB-Zugriff über Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = App's private Daten benutzen
diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini
index 110733989a..e62ba227b2 100644
--- a/assets/lang/dr_ID.ini
+++ b/assets/lang/dr_ID.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini
index 4c168b8a1b..f5029def90 100644
--- a/assets/lang/en_US.ini
+++ b/assets/lang/en_US.ini
@@ -1101,6 +1101,7 @@ No data will be changed = No data will be changed
 PPSSPP will restart after the change = PPSSPP will restart after the change
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini
index b0f2ce265a..2ed2e73da3 100644
--- a/assets/lang/es_ES.ini
+++ b/assets/lang/es_ES.ini
@@ -911,6 +911,7 @@ Selected PSP Data Folder = Carpeta de datos de PSP seleccionada
 Skip for now = Omitir por ahora
 Starting move... = Moviendo...
 That folder doesn't work as a memstick folder. = Esa carpeta no funciona como una carpeta memstick.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = Acceso USB a través de Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = Acceso USB a través de Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Usar datos privados de la aplicación
diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini
index 7a94672503..c2710bd84a 100644
--- a/assets/lang/es_LA.ini
+++ b/assets/lang/es_LA.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP se reiniciará trás el cambio.
 Skip for now = Saltar por ahora
 Starting move... = Iniciando movida...
 That folder doesn't work as a memstick folder. = Esa carpeta deja de funcionar como carpeta de Memory Stick.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = Acceso USB en la carpeta Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = Acceso USB en la carpeta Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Usar datos privados de la App
diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini
index 170cbe9d9c..924fb2e898 100644
--- a/assets/lang/fa_IR.ini
+++ b/assets/lang/fa_IR.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = بعد از تغییر PPSSPP بازرا
 Skip for now = فعلا رد شوید
 Starting move... = شروع کردن جابه‌جایی...
 That folder doesn't work as a memstick folder. = این پوشه به عنوان پوشهٔ memstick کار نمی کند.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = دسترسی USB از مسیر Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = دسترسی USB از مسیر Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = استفاده از داده‌های خصوصی برنامه
diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini
index e2959f5b9c..9c21f27dfe 100644
--- a/assets/lang/fi_FI.ini
+++ b/assets/lang/fi_FI.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP käynnistyy uudelleen muutoksen j
 Skip for now = Ohita nyt
 Starting move... = Siirto alkaa...
 That folder doesn't work as a memstick folder. = Kyseinen kansio ei toimi muistikorttikansiona.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB-pääsy Android/data/org.ppsspp.ppsspp/files -kautta
 USBAccessThroughGold = USB-pääsy Android/data/org.ppsspp.ppssppgold/files -kautta
 Use App Private Data = Käytä sovelluksen yksityistä dataa
diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini
index 4f4dc53a94..1f62d87d92 100644
--- a/assets/lang/fr_FR.ini
+++ b/assets/lang/fr_FR.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP redémarrera après le changement
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini
index c0bf9e99f6..735557dd1e 100644
--- a/assets/lang/gl_ES.ini
+++ b/assets/lang/gl_ES.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini
index 1752f8ac83..ac02ee5659 100644
--- a/assets/lang/gr_EL.ini
+++ b/assets/lang/gr_EL.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini
index 13a9668591..828034e095 100644
--- a/assets/lang/he_IL.ini
+++ b/assets/lang/he_IL.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini
index 2986a7733f..74704c0c6d 100644
--- a/assets/lang/he_IL_invert.ini
+++ b/assets/lang/he_IL_invert.ini
@@ -907,6 +907,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini
index 3ebed9738d..f47f0ee3cb 100644
--- a/assets/lang/hr_HR.ini
+++ b/assets/lang/hr_HR.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini
index e0e3114ce2..2999a22b87 100644
--- a/assets/lang/hu_HU.ini
+++ b/assets/lang/hu_HU.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini
index 4131054054..d339272f73 100644
--- a/assets/lang/id_ID.ini
+++ b/assets/lang/id_ID.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP akan mulai ulang setelah perubahan
 Skip for now = Lewati untuk sekarang
 Starting move... = Mulai pindah...
 That folder doesn't work as a memstick folder. = Berkas itu tidak berfungsi sebagai berkas Memory Stick.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = Akses USB melalui Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = Akses USB melalui Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Gunakan data aplikasi pribadi
diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini
index ecf19555ce..5bb6372b83 100644
--- a/assets/lang/it_IT.ini
+++ b/assets/lang/it_IT.ini
@@ -1096,6 +1096,7 @@ PPSSPP will restart after the change = PPSSPP verrà riavviato dopo la modifica
 Skip for now = Salta per ora
 Starting move... = Inizio trasferimento...
 That folder doesn't work as a memstick folder. = Quella cartella non funziona come cartella per la memory stick.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = Accesso USB tramite Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = Accesso USB tramite Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Usa la cartella dati privata dell'app
diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini
index 71d1d62f49..aaee5f0cb1 100644
--- a/assets/lang/ja_JP.ini
+++ b/assets/lang/ja_JP.ini
@@ -1094,6 +1094,7 @@ Selected PSP Data Folder = 選択されたPSPフォルダー
 Skip for now = 今はスキップする
 Starting move... = 移動開始...
 That folder doesn't work as a memstick folder. = そのフォルダーはメモリースティックフォルダーとしては使用できません。
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB接続は Android/data/org.ppsspp.ppsspp/files を通して行う。
 USBAccessThroughGold = USB接続は Android/data/org.ppsspp.ppssppgold/files を通して行う。
 DataWillBeLostOnUninstall = 警告! PPSSPPをアンインストールすると保存データも削除されます!
diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini
index d3a3bcea8b..2577b817d8 100644
--- a/assets/lang/jv_ID.ini
+++ b/assets/lang/jv_ID.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini
index ef12e15683..b3dd2afbec 100644
--- a/assets/lang/ko_KR.ini
+++ b/assets/lang/ko_KR.ini
@@ -1078,6 +1078,7 @@ No data will be changed = 데이터가 변경되지 않습니다.
 PPSSPP will restart after the change = 변경 후 PPSSPP가 다시 시작됩니다.
 Starting move... = 이동 시작 중...
 That folder doesn't work as a memstick folder. = 해당 폴더는 메모리스틱 폴더로 작동하지 않습니다.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = Android/data/org.ppsspp.ppsspp/files를 통한 USB 접속
 USBAccessThroughGold = Android/data/org.ppsspp.ppssppgold/files를 통한 USB 접속
 Use App Private Data = 앱 개인 데이터 사용
diff --git a/assets/lang/ku_SO.ini b/assets/lang/ku_SO.ini
index 3cfb4f76ba..7baea0d205 100644
--- a/assets/lang/ku_SO.ini
+++ b/assets/lang/ku_SO.ini
@@ -1092,6 +1092,7 @@ No data will be changed = No data will be changed
 PPSSPP will restart after the change = PPSSPP will restart after the change
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini
index d54b6e93e8..1fe86d0246 100644
--- a/assets/lang/lo_LA.ini
+++ b/assets/lang/lo_LA.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini
index c18e507545..76d4889b4c 100644
--- a/assets/lang/lt-LT.ini
+++ b/assets/lang/lt-LT.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini
index 0533f9b1a5..8aed29762c 100644
--- a/assets/lang/ms_MY.ini
+++ b/assets/lang/ms_MY.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini
index f1c59d2dd1..626cc65972 100644
--- a/assets/lang/nl_NL.ini
+++ b/assets/lang/nl_NL.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini
index e8c642ecff..88a3aa25c9 100644
--- a/assets/lang/no_NO.ini
+++ b/assets/lang/no_NO.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini
index 7e23673775..0a089dd608 100644
--- a/assets/lang/pl_PL.ini
+++ b/assets/lang/pl_PL.ini
@@ -914,6 +914,7 @@ PPSSPP will restart after the change = Po zmianie nastąpi reset PPSSPP
 Skip for now = Na razie pomiń
 Starting move... = Rozpoczynam przenoszenie...
 That folder doesn't work as a memstick folder. = Ten folder nie działa jako folder kary pamięci.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = Dostęp do USB poprzez Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = Dostęþ do USB poprzez Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Użyj prywatnych danych aplikacji
diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini
index 9be3968a01..8fc55548ca 100644
--- a/assets/lang/pt_BR.ini
+++ b/assets/lang/pt_BR.ini
@@ -1102,6 +1102,7 @@ No data will be changed = Nenhum dado será mudado
 PPSSPP will restart after the change = O PPSSPP reiniciará após a mudança
 Starting move... = Iniciando a movimentação...
 That folder doesn't work as a memstick folder. = Essa pasta não funciona como um cartão de memória.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = Acesso ao USB através do Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = Acesso ao USB através do Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use os Dados Privados do App
diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini
index 6c2707d2e7..e8b24d734c 100644
--- a/assets/lang/pt_PT.ini
+++ b/assets/lang/pt_PT.ini
@@ -1121,6 +1121,7 @@ No data will be changed = Nenhum dado será mudado
 PPSSPP will restart after the change = O PPSSPP reiniciará após a mudança
 Starting move... = A iniciar a movimentação...
 That folder doesn't work as a memstick folder. = Não é possível usar esta pasta como um cartão de memória.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = Acesso ao USB através de Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = Acesso ao USB através de Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use os dados privados da aplicação
diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini
index 0ef210bda4..5fb586075c 100644
--- a/assets/lang/ro_RO.ini
+++ b/assets/lang/ro_RO.ini
@@ -911,6 +911,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini
index 32233041ce..679d34af3f 100644
--- a/assets/lang/ru_RU.ini
+++ b/assets/lang/ru_RU.ini
@@ -1096,6 +1096,7 @@ No data will be changed = Данные не будут изменены
 PPSSPP will restart after the change = PPSSPP перезапустится после этих изменений
 Starting move... = Начинаем перенос...
 That folder doesn't work as a memstick folder. = Эта папка не будет работать как папка для карты памяти.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = Доступ к USB через Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = Доступ к USB через Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Использовать приватные данные приложения
diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini
index 1feb4e3455..fdce2dc374 100644
--- a/assets/lang/sv_SE.ini
+++ b/assets/lang/sv_SE.ini
@@ -1096,6 +1096,7 @@ PPSSPP will restart after the change = PPSSPP kommer att starta om efter ändrin
 Skip for now = Skippa för tillfället
 Starting move... = Startar flytt...
 That folder doesn't work as a memstick folder. = Den mappen funkar inte som PSP-data-mapp.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB-åtkomst genom Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB-åtkomst genom Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Använd "App Private Data"
diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini
index ef5e41b571..62141d9adc 100644
--- a/assets/lang/tg_PH.ini
+++ b/assets/lang/tg_PH.ini
@@ -911,6 +911,7 @@ PPSSPP will restart after the change = Magsisimula muli ang PPSSPP pagkatapos ng
 Skip for now = Laktawan muna
 Starting move... = Sinisimulan ang paglipat...
 That folder doesn't work as a memstick folder. = Ang folder na iyon ay hindi gumagana bilang isang memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access sa Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access sa Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Gamitin ang Pribadong Data ng App
diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini
index fcac27d4bc..55a1123954 100644
--- a/assets/lang/th_TH.ini
+++ b/assets/lang/th_TH.ini
@@ -934,6 +934,7 @@ Selected PSP Data Folder = โฟลเดอร์ข้อมูล PSP ที
 Skip for now = ข้ามไปก่อน
 Starting move... = กำลังเริ่มการย้าย...
 That folder doesn't work as a memstick folder. = โฟลเดอร์นั้นไม่สามารถนำมาใช้เป็นโฟลเดอร์แหล่งที่เก็บข้อมูลได้
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = การเข้าถึงข้อมูล ผ่านใน Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = การเข้าถึงข้อมูล ผ่านใน Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = ใช้แหล่งเก็บข้อมูลแอพแบบส่วนบุคคล
diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini
index 75ad698417..2600a66be9 100644
--- a/assets/lang/tr_TR.ini
+++ b/assets/lang/tr_TR.ini
@@ -912,6 +912,7 @@ PPSSPP will restart after the change = PPSSPP değişiklikten sonra yeniden baş
 Skip for now = Şimdilik atla
 Starting move... = Taşıma başlıyor...
 That folder doesn't work as a memstick folder. = Bu klasör bir hafıza kartı klasörü olarak çalışmaz.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = Android/data/org.ppsspp.ppsspp/files üzerinden USB erişimi
 USBAccessThroughGold = Android/data/org.ppsspp.ppssppgold/files üzerinden USB erişimi
 Use App Private Data = Uygulama Gizli Verisini Kullan
diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini
index 5277f0b98f..c4be20c1a5 100644
--- a/assets/lang/uk_UA.ini
+++ b/assets/lang/uk_UA.ini
@@ -909,6 +909,7 @@ PPSSPP will restart after the change = PPSSPP перезапуститься п
 Skip for now = Пропустити поки що
 Starting move... = Починаємо переміщювати...
 That folder doesn't work as a memstick folder. = Ця папка не працює як папка Memstick.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = Доступ USB через Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = доступ USB через Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Використовувати особисті дані програми
diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini
index b7cf7b8bcd..f13315542b 100644
--- a/assets/lang/vi_VN.ini
+++ b/assets/lang/vi_VN.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = PPSSPP will restart after the change
 Skip for now = Skip for now
 Starting move... = Starting move...
 That folder doesn't work as a memstick folder. = That folder doesn't work as a memstick folder.
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = USB access through Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = USB access through Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = Use App Private Data
diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini
index 4bd6e568d3..01567c9de1 100644
--- a/assets/lang/zh_CN.ini
+++ b/assets/lang/zh_CN.ini
@@ -910,6 +910,7 @@ PPSSPP will restart after the change = 此项设置更改需要PPSSPP重启。
 Skip for now = 我想跳过
 Starting move... = 开始移动…
 That folder doesn't work as a memstick folder. = 您选择的文件夹无法作为记忆棒路径。
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = 查找、备份数据时，目录为Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = 查找、备份数据时，目录为Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = 仅在APP内部权限目录存档
diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini
index 0281cf9587..77563cb43d 100644
--- a/assets/lang/zh_TW.ini
+++ b/assets/lang/zh_TW.ini
@@ -1095,6 +1095,7 @@ No data will be changed = 沒有要變更的資料
 PPSSPP will restart after the change = PPSSPP 將在完成變更後重新啟動
 Starting move... = 開始移動…
 That folder doesn't work as a memstick folder. = 這個資料夾無法作為記憶棒資料夾正常運作
+The new folder is inside the previous one = The new folder is inside the previous one
 USBAccessThrough = 透過 USB 存取 Android/data/org.ppsspp.ppsspp/files
 USBAccessThroughGold = 透過 USB 存取 Android/data/org.ppsspp.ppssppgold/files
 Use App Private Data = 使用應用程式私人資料夾