diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 4072efde..0aed0b4e 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -2196,6 +2196,83 @@
select_storage
+
+
+
+ restore_pin
+
+
+
+
+
+
+
+ restore_read
+
+
+
+
+
+ main
+
+
+
+
+ main
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ tw_multiuser_warning_destination=restore
+ multiuser_warning
+
+
+
+
+
+ {@restore_hdr=Restore}
+
+
+
+
+ {@restore_sel_store_hdr=Select Backup from %tw_storage_display_name% (%tw_storage_free_size% MB)}
+
+
+
+
+
+
+ {@restore_sel_pack_fs=Select Package to Restore:}
+
+
+
+
+
+
+
+
+
+
+ restore_pin
+
+
@@ -6048,5 +6125,63 @@ edi
+
+
+
+
+
+
+
+ {@restore_with_pin1=PIN/Password is enabled}
+
+
+
+
+
+ {@restore_with_pin2=PIN/Password should be disabled before restore}
+
+
+
+
+ {@restore_pin=Restore While PIN/Password Enabled?}
+
+
+
+
+
+ {@restore_with_pattern1=Pattern is enabled}
+
+
+
+
+
+ {@restore_with_pattern2=Pattern should be disabled before restore}
+
+
+
+
+
+ {@restore_pattern=Restore While Pattern Enabled?}
+
+
+
+ {@continue_restore_encrypted=Continue Restore?}
+
+ restore_force
+
+
+
+
+
+ main
+
+
+
+
+
+ main
+
+
+
diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 167dd132..1f3e4949 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -782,5 +782,16 @@
Merge Snapshots?
Merging Snapshots...
Merged Snapshots
+ Restore While PIN/Password Enabled?
+ Restore While Pattern Enabled?
+ Restore While PIN Enabled?
+ Continue Restore?
+ PIN/Password is enabled
+ PIN/Password should be disabled before restore
+ PIN is enabled
+ PIN should be disabled before restore
+ Pattern is enabled
+ Pattern should be disabled before restore
+ It is recommended to reboot Android once after first boot.
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index 23e925a0..31f87950 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -2358,6 +2358,78 @@
+
+
+
+ restore_keymaster
+
+
+
+
+
+
+
+ restore_read
+
+
+
+
+
+ main
+
+
+
+
+ main
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ tw_multiuser_warning_destination=restore
+ multiuser_warning
+
+
+
+
+
+ {@restore_hdr=Restore}
+
+
+
+
+ {@restore_sel_store_hdr=Select Backup from %tw_storage_display_name% (%tw_storage_free_size% MB)}
+
+
+
+
+
+
+ {@restore_sel_pack_fs=Select Package to Restore:}
+
+
+
+
+
+
+
+
@@ -5778,5 +5850,81 @@
+
+
+
+
+
+
+
+ {@restore_with_pin_password1=PIN/Password is enabled}
+
+
+
+
+
+ {@restore_with_pin_password2=PIN/Password should be disabled before restore}
+
+
+
+
+ {@restore_pin_password=Restore While PIN/Password Enabled?}
+
+
+
+
+
+ {@restore_with_pattern1=Pattern is enabled}
+
+
+
+
+
+ {@restore_with_pattern2=Pattern should be disabled before restore}
+
+
+
+
+
+ {@restore_pattern=Restore While Pattern Enabled?}
+
+
+
+
+
+ {@restore_with_pin1=PIN is enabled}
+
+
+
+
+
+ {@restore_with_pin2=PIN should be disabled before restore}
+
+
+
+
+
+ {@restore_pin=Restore While PIN Enabled?}
+
+
+
+ {@continue_restore_encrypted=Continue Restore?}
+
+ restore_force
+
+
+
+
+
+ main
+
+
+
+
+
+ main
+
+
+
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 646bc2cd..0b819871 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -2709,6 +2709,75 @@
+
+
+
+ restore_pin
+
+
+
+
+
+
+
+ tw_back=restore
+ restore_read
+
+
+
+
+
+ main
+
+
+
+
+ main
+
+
+
+
+
+
+
+
+
+
+
+
+
+ tw_multiuser_warning_destination=restore
+ multiuser_warning
+
+
+
+
+
+
+
+ {@restore_hdr=Restore} > {@sel_backup_hdr=Select Backup}
+
+
+
+
+ %tw_storage_display_name%
+
+
+
+
+
+
+
+
@@ -6143,5 +6212,74 @@
+
+
+
+
+
+
+ {@restore_with_pin1=PIN/Password is enabled}
+
+
+
+
+ {@restore_with_pin2=PIN/Password should be disabled before restore}
+
+
+
+
+ {@restore_pin=Restore While PIN/Password Enabled?}
+
+
+
+
+ {@restore_with_pattern1=Pattern is enabled}
+
+
+
+
+ {@restore_with_pattern2=Pattern should be disabled before restore}
+
+
+
+
+ {@restore_pattern=Restore While Pattern Enabled?}
+
+
+
+
+
+ {@restore_with_pin1=PIN is enabled}
+
+
+
+
+
+ {@restore_with_pin2=PIN should be disabled before restore}
+
+
+
+
+
+ {@restore_pin=Restore While PIN Enabled?}
+
+
+
+ {@continue_restore_encrypted=Continue Restore?}
+
+ restore_force
+
+
+
+
+ main
+
+
+
+
+ main
+
+
+
diff --git a/gui/theme/watch_mdpi/ui.xml b/gui/theme/watch_mdpi/ui.xml
index 967a4757..8ec73dff 100644
--- a/gui/theme/watch_mdpi/ui.xml
+++ b/gui/theme/watch_mdpi/ui.xml
@@ -7,7 +7,7 @@
Backup Naowz
Default basic theme
preview.png
- 3
+ 4
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 9e423184..9e37463b 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1269,6 +1269,9 @@ int TWPartitionManager::Run_Restore(const string& Restore_Name) {
UnMount_Main_Partitions();
time(&rStop);
gui_msg(Msg(msg::kHighlight, "restore_completed=[RESTORE COMPLETED IN {1} SECONDS]")((int)difftime(rStop,rStart)));
+ TWPartition* Decrypt_Data = Find_Partition_By_Path("/data");
+ if (Decrypt_Data && Decrypt_Data->Is_Encrypted)
+ gui_msg(Msg(msg::kWarning, "reboot_after_restore=It is recommended to reboot Android once after first boot."));
DataManager::SetValue("tw_file_progress", "");
return true;