Memstick: Show a warning if you pick a folder inside the previous one (common mistake)

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_;
 }

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_;
 	}

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);

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);
 

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));
 	}

UI/MemStickScreen.h

@@ -116,6 +116,8 @@ private:
 
 	Path newMemstickFolder_;
 	bool existingFilesInNewFolder_;
+	bool folderConflict_;
+
 #if PPSSPP_PLATFORM(UWP) && !defined(__LIBRETRO__)
 	bool moveData_ = false;
 #else

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

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

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

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

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

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

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

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

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

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

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

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

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 = استفاده از داده‌های خصوصی برنامه

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

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

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

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

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

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

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

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

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

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

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をアンインストールすると保存データも削除されます!

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

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 = 앱 개인 데이터 사용

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

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

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

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

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

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

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

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

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

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

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 = Использовать приватные данные приложения

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"

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

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 = ใช้แหล่งเก็บข้อมูลแอพแบบส่วนบุคคล

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

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 = Використовувати особисті дані програми

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

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内部权限目录存档

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 = 使用應用程式私人資料夾