diff --git a/Android.mk b/Android.mk
index 442d2cff..db3bb221 100755
--- a/Android.mk
+++ b/Android.mk
@@ -62,7 +62,6 @@ LOCAL_SRC_FILES := \
     find_file.cpp \
     infomanager.cpp \
     data.cpp \
-    kernel_module_loader.cpp \
     partition.cpp \
     partitionmanager.cpp \
     progresstracking.cpp \
@@ -108,7 +107,6 @@ LOCAL_C_INCLUDES += \
     bionic \
     system/extras \
     system/core/adb \
-    system/core/libmodprobe/include \
     system/core/libsparse \
     external/zlib \
     system/core/libziparchive/include \
@@ -129,7 +127,7 @@ LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/minuitwrp/include \
     $(LOCAL_PATH)/twinstall/include
 
-LOCAL_STATIC_LIBRARIES += libguitwrp libmodprobe
+LOCAL_STATIC_LIBRARIES += libguitwrp
 LOCAL_SHARED_LIBRARIES += libz libc libcutils libstdc++ libtar libblkid libminuitwrp libmtdutils libtwadbbu 
 LOCAL_SHARED_LIBRARIES += libbootloader_message libcrecovery libtwrpdigest libc++ libaosprecovery libcrypto libbase 
 LOCAL_SHARED_LIBRARIES += libziparchive libselinux libdl_android.bootstrap
@@ -307,6 +305,9 @@ ifneq ($(TW_ADDITIONAL_APEX_FILES),)
     LOCAL_CFLAGS += -DTW_ADDITIONAL_APEX_FILES=$(TW_ADDITIONAL_APEX_FILES)
 endif
 ifneq ($(TW_LOAD_VENDOR_MODULES),)
+    LOCAL_SRC_FILES += kernel_module_loader.cpp
+    LOCAL_C_INCLUDES += system/core/libmodprobe/include
+    LOCAL_STATIC_LIBRARIES += libmodprobe
     LOCAL_CFLAGS += -DTW_LOAD_VENDOR_MODULES=$(TW_LOAD_VENDOR_MODULES)
 endif
 ifeq ($(TW_INCLUDE_CRYPTO), true)
@@ -407,6 +408,12 @@ endif
 ifneq ($(TARGET_OTA_ASSERT_DEVICE),)
     LOCAL_CFLAGS += -DTARGET_OTA_ASSERT_DEVICE='"$(TARGET_OTA_ASSERT_DEVICE)"'
 endif
+ifneq ($(TW_BACKUP_EXCLUSIONS),)
+	LOCAL_CFLAGS += -DTW_BACKUP_EXCLUSIONS='"$(TW_BACKUP_EXCLUSIONS)"'
+endif
+ifeq ($(TW_INCLUDE_FASTBOOTD), true)
+    LOCAL_CFLAGS += -DTW_INCLUDE_FASTBOOTD
+endif
 ifeq ($(TW_EXCLUDE_TWRPAPP), true)
     LOCAL_CFLAGS += -DTW_EXCLUDE_TWRPAPP
 endif
@@ -416,6 +423,7 @@ LOCAL_C_INCLUDES += system/vold \
 TWRP_REQUIRED_MODULES += \
     relink_libraries \
     relink_binaries \
+    relink_vendor_hw_binaries \
     twrp_ramdisk \
     bc \
     dump_image \
@@ -446,8 +454,7 @@ TWRP_REQUIRED_MODULES += \
     me.twrp.twrpapp.apk \
     privapp-permissions-twrpapp.xml \
     adbd_system_api_recovery \
-    libsync.recovery \
-    libmodprobe
+    libsync.recovery
 
 ifneq ($(TW_EXCLUDE_TZDATA), true)
 TWRP_REQUIRED_MODULES += \
@@ -512,7 +519,7 @@ endif
 ifeq ($(BOARD_HAS_NO_REAL_SDCARD),)
     TWRP_REQUIRED_MODULES += sgdisk
 endif
-ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true)
+ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS),)
     TWRP_REQUIRED_MODULES += openaes openaes_license
 endif
 ifeq ($(TW_INCLUDE_DUMLOCK), true)
@@ -552,11 +559,17 @@ ifeq ($(TW_INCLUDE_NTFS_3G),true)
         mkfs.ntfs
 endif
 ifeq ($(TARGET_USERIMAGES_USE_F2FS), true)
-    TWRP_REQUIRED_MODULES += sload.f2fs \
+    TWRP_REQUIRED_MODULES += sload_f2fs \
         libfs_mgr \
         fs_mgr \
         libinit
 endif
+ifneq ($(TW_LOAD_VENDOR_MODULES),)
+    TWRP_REQUIRED_MODULES += libmodprobe
+endif
+ifeq ($(TW_INCLUDE_PYTHON),true)
+    TWRP_REQUIRED_MODULES += python3_twrp
+endif
 
 TWRP_REQUIRED_MODULES += file_contexts_text
 
@@ -566,12 +579,6 @@ endif
 
 LOCAL_REQUIRED_MODULES += $(TWRP_REQUIRED_MODULES)
 
-TW_THEME_VERSION := $(shell grep TW_THEME_VERSION bootable/recovery/variables.h | cut -d ' ' -f 3)
-
-LOCAL_POST_INSTALL_CMD += \
-    sed -i "s/{themeversion}/$(TW_THEME_VERSION)/" $(TARGET_RECOVERY_ROOT_OUT)/twres/splash.xml; \
-    sed -i "s/{themeversion}/$(TW_THEME_VERSION)/" $(TARGET_RECOVERY_ROOT_OUT)/twres/ui.xml;
-
 include $(BUILD_EXECUTABLE)
 
 # Symlink for file_contexts
diff --git a/data.cpp b/data.cpp
index 011adf61..955c17fd 100755
--- a/data.cpp
+++ b/data.cpp
@@ -719,6 +719,10 @@ void DataManager::SetDefaultValues()
 	printf("TW_HAS_EDL_MODE := true\n");
 	mConst.SetValue(TW_EDL_MODE, "1");
 #endif
+#ifdef TW_INCLUDE_FASTBOOTD
+	printf("TW_INCLUDE_FASTBOOTD := true\n");
+	mConst.SetValue(TW_FASTBOOT_MODE, "1");
+#endif
 #ifdef PRODUCT_USE_DYNAMIC_PARTITIONS
 	printf("PRODUCT_USE_DYNAMIC_PARTITIONS := true\n");
 	mConst.SetValue(TW_FASTBOOT_MODE, "1");
@@ -814,11 +818,10 @@ void DataManager::SetDefaultValues()
 	mData.SetValue("tw_sleep", "5");
 	mData.SetValue("tw_enable_fastboot", "0");
 
-
 	if (android::base::GetBoolProperty("ro.virtual_ab.enabled", false))
-		mConst.SetValue("tw_virtual_ab.enabled", "1");
+		mConst.SetValue(TW_VIRTUAL_AB_ENABLED, "1");
 	else
-		mConst.SetValue("tw_virtual_ab.enabled", "0");
+		mConst.SetValue(TW_VIRTUAL_AB_ENABLED, "0");
 	// Brightness handling
 	string findbright;
 #ifdef TW_BRIGHTNESS_PATH
diff --git a/gui/action.cpp b/gui/action.cpp
index 819e4ad8..d5b8c8f4 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -1801,9 +1801,9 @@ int GUIAction::flashimage(std::string arg __unused)
 		string current_slot = PartitionManager.Get_Active_Slot_Display();
 		bool pre_op_status = PartitionManager.Flash_Image(path, filename);
 
-		PartitionManager.Set_Active_Slot(current_slot == "A" ? "B" : "A");
+		PartitionManager.Override_Active_Slot(current_slot == "A" ? "B" : "A");
 		op_status = (int) !(pre_op_status && PartitionManager.Flash_Image(path, filename));
-		PartitionManager.Set_Active_Slot(current_slot);
+		PartitionManager.Override_Active_Slot(current_slot);
 
 		DataManager::SetValue("tw_flash_both_slots", 0);
 		flag = false;
@@ -2360,4 +2360,4 @@ int GUIAction::mergesnapshots(string arg __unused) {
 	}
 	operation_end(op_status);
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/gui/libguitwrp_defaults.go b/gui/libguitwrp_defaults.go
index 4c64f50f..290be250 100644
--- a/gui/libguitwrp_defaults.go
+++ b/gui/libguitwrp_defaults.go
@@ -4,6 +4,7 @@ import (
 	"android/soong/android"
 	"android/soong/cc"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"path"
 	"strconv"
@@ -64,6 +65,111 @@ func copyThemeResources(ctx android.BaseContext, dirs []string, files []string)
 		fileDest := twRes + path.Base(file)
 		copyFile(fileToCopy, fileDest)
 	}
+	data, err := ioutil.ReadFile(recoveryDir + "variables.h")
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	version := "0"
+	for _, line := range strings.Split(string(data), "\n") {
+		if strings.Contains(line, "TW_THEME_VERSION") {
+			version = strings.Split(line, " ")[2]
+		}
+	}
+
+	_props := [3]string{"TW_CUSTOM_BATTERY_POS", "TW_CUSTOM_CPU_POS", "TW_CUSTOM_CLOCK_POS" }
+	props := [3]string{"0", "0", "0"}
+	for i, item := range _props {
+		if getMakeVars(ctx, item) != "" {
+			props[i] = strings.Trim(getMakeVars(ctx, item), "\"")
+		}
+	}
+
+	_files := [2]string{"splash.xml", "ui.xml"}
+	for _, i := range _files {
+		var fontsize int = 0
+		var width int = 0
+
+		data, err = ioutil.ReadFile(twRes + i)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+
+		newFile := strings.Replace(string(data), "{themeversion}", version, -1)
+
+		// Custom position for status bar items - start
+		if i == "ui.xml" {
+
+			for _, line := range strings.Split(string(data), "\n") {
+		                if strings.Contains(line, "name=\"font_m\"") {
+		                      fontsize, err = strconv.Atoi(strings.Split(line, "\"")[5])
+		                       if err != nil {
+		                               fmt.Println(err)
+		                               return
+		                       }
+				}
+				if strings.Contains(line, "resolution") {
+					width, err = strconv.Atoi(strings.Split(line, "\"")[1])
+					if err != nil {
+						fmt.Println(err)
+						return
+					}
+				}
+		        }
+
+			var cpusize int = (fontsize * 5) + (width/100)
+			var clocksize int = (fontsize * 4) + (width/100)
+			var batterysize int = (fontsize * 6) - (width/100)
+			var pos_clock_24 string = props[2]
+			for j := 0; j < len(props); j++ {
+				if props[j] == "left" {
+					props[j] = strconv.Itoa(width/50)
+					if _props[j] == "TW_CUSTOM_CLOCK_POS" {
+						pos_clock_24 = props[j]
+					}
+				} else if props[j] == "center" {
+					if _props[j] == "TW_CUSTOM_BATTERY_POS" {
+						props[j] = strconv.Itoa( (width/2) - (batterysize*43/100) )
+					} else if _props[j] == "TW_CUSTOM_CLOCK_POS" {
+						pos := (width/2) - (clocksize*45/100)
+						props[j] = strconv.Itoa(pos)
+						pos_clock_24 = strconv.Itoa( pos * 31/30 )
+					} else if _props[j] == "TW_CUSTOM_CPU_POS" {
+						props[j] = strconv.Itoa( (width/2) - (cpusize*41/100) )
+					}
+				} else if props[j] == "right" {
+					if _props[j] == "TW_CUSTOM_BATTERY_POS" {
+						props[j] = strconv.Itoa( width - batterysize )
+					} else if _props[j] == "TW_CUSTOM_CLOCK_POS" {
+						props[j] = strconv.Itoa(width - clocksize)
+						pos_clock_24 = props[j]
+					} else if _props[j] == "TW_CUSTOM_CPU_POS" {
+						props[j] = strconv.Itoa( width - cpusize )
+					}
+				}
+			}
+
+			alignProp := "%status_topalign_header_y%"
+			if strings.Trim(getMakeVars(ctx, "TW_STATUS_ICONS_ALIGN"), "\"") == "center" || strings.Trim(getMakeVars(ctx, "TW_STATUS_ICONS_ALIGN"), "\"") == "2" {
+				alignProp = "%status_centeralign_header_y%"
+			} else if strings.Trim(getMakeVars(ctx, "TW_STATUS_ICONS_ALIGN"), "\"") == "bottom" || strings.Trim(getMakeVars(ctx, "TW_STATUS_ICONS_ALIGN"), "\"") == "3" {
+				alignProp = "%status_bottomalign_header_y%"
+			}
+			newFile = strings.Replace(newFile, "{battery_pos}", props[0], -1)
+			newFile = strings.Replace(newFile, "{cpu_pos}", props[1], -1)
+			newFile = strings.Replace(newFile, "{clock_12_pos}", props[2], -1)
+			newFile = strings.Replace(newFile, "{clock_24_pos}", pos_clock_24, -1)
+			newFile = strings.Replace(newFile, "{statusicons_align}", alignProp, -1)
+		}
+		// Custom position for status bar items - end
+
+		err = ioutil.WriteFile(twRes + i, []byte(newFile), 0)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+	}
 }
 
 func copyCustomTheme(ctx android.BaseContext, customTheme string) {
diff --git a/gui/rapidxml.hpp b/gui/rapidxml.hpp
index 33a88601..f47807d3 100644
--- a/gui/rapidxml.hpp
+++ b/gui/rapidxml.hpp
@@ -1390,7 +1390,15 @@ namespace rapidxml
             
             // Parse BOM, if any
             parse_bom<Flags>(text);
-            
+
+            // Abort if it's ABX format
+            if (text[0] == Ch('A') &&
+                text[1] == Ch('B') &&
+                text[2] == Ch('X')) {
+                RAPIDXML_PARSE_ERROR("ABX Format Unsupported by RapidXML", text);
+                return;
+            }
+
             // Parse children
             while (1)
             {
diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml
index 3da15527..c64d11e5 100755
--- a/gui/theme/common/landscape.xml
+++ b/gui/theme/common/landscape.xml
@@ -3857,7 +3857,7 @@
 					</actions>
 				</listitem>
 				<listitem name="{@unmap_super_devices=Unmap Super Devices}">
-					<condition var1="tw_virtual_ab.enabled" op="=" var2="1"/>
+					<condition var1="tw_is_super" op="=" var2="1"/>
 					<actions>
 						<action function="set">tw_back=advanced</action>
 						<action function="set">tw_action=unmapsuperdevices</action>
diff --git a/gui/theme/common/languages/cz.xml b/gui/theme/common/languages/cz.xml
index e15b2a72..5194704c 100644
--- a/gui/theme/common/languages/cz.xml
+++ b/gui/theme/common/languages/cz.xml
@@ -1,31 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
+
 <language>
-	<display>Czech</display>
+	<display>Čeština</display>
+	
 	<resources>
 		<!-- Font overrides - only change these if your language requires special characters -->
 		<resource name="font_l" type="fontoverride" filename="RobotoCondensed-Regular.ttf" scale="90" />
 		<resource name="font_m" type="fontoverride" filename="RobotoCondensed-Regular.ttf" scale="90" />
 		<resource name="font_s" type="fontoverride" filename="RobotoCondensed-Regular.ttf" scale="90" />
 		<resource name="fixed" type="fontoverride" filename="DroidSansMono.ttf" scale="100" />
-
+    
+		<!-- Partition display names -->
 		<string name="system">Systém</string>
-		<string name="system_image">Obraz systému</string>
-		<string name="vendor">Dodavatel</string>
-		<string name="vendor_image">Obrázek dodavatela</string>
+		<string name="system_image">Systém</string>
+		<string name="vendor">Vendor</string>
+		<string name="vendor_image">Vendor</string>
 		<string name="boot">Boot</string>
 		<string name="recovery">Recovery</string>
 		<string name="cache">Cache</string>
 		<string name="data">Data</string>
+		<string name="data_backup">Data (bez úložiště)</string>
 		<string name="sdcard">SD karta</string>
 		<string name="internal">Interní úložiště</string>
 		<string name="microsd">Mikro SD karta</string>
 		<string name="usbotg">USB OTG</string>
 		<string name="android_secure">Android Secure</string>
 		<string name="dalvik">Dalvik / ART Cache</string>
+		<!-- This is a rarely used partition on a Micro SD card for a very old app2sd system -->
 		<string name="sdext">SD-EXT</string>
-		<string name="adopted_data">Přijaté data</string>
-		<string name="adopted_storage">Přijaté úložiště</string>
+		<string name="adopted_data">Připojená data</string>
+		<string name="adopted_storage">Připojené úložiště</string>
+		<string name="autostorage">Úložiště</string>
+
+		<!-- GUI XML strings -->
 		<string name="twrp_header">Team Win Recovery Project</string>
 		<string name="twrp_watch_header">TWRP %tw_version%</string>
 		<string name="cpu_temp">CPU: %tw_cpu_temp% °C</string>
@@ -43,6 +50,7 @@
 		<string name="tab_screen">OBRAZOVKA</string>
 		<string name="tab_vibration">VIBRACE</string>
 		<string name="tab_language">JAZYK</string>
+
 		<string name="install_btn">Instalovat</string>
 		<string name="wipe_btn">Vymazat</string>
 		<string name="backup_btn">Zálohovat</string>
@@ -54,10 +62,10 @@
 		<string name="files_btn">Soubory</string>
 		<string name="copy_log_btn">Kopírovat log</string>
 		<string name="select_type_hdr">Vyberte typ</string>
-		<string name="install_zip_hdr">Instalovat Zip</string>
-		<string name="install_zip_btn">Instalovat Zip</string>
-		<string name="install_image_hdr">Instalovat obraz</string>
-		<string name="install_image_btn">Instalovat obraz</string>
+		<string name="install_zip_hdr">Instalovat ZIP</string>
+		<string name="install_zip_btn">Instalovat ZIP</string>
+		<string name="install_image_hdr">Instalovat IMG</string>
+		<string name="install_image_btn">Instalovat IMG</string>
 		<string name="install_select_file_hdr">Vybrat soubor</string>
 		<string name="file_selector_folders_hdr">Složky</string>
 		<string name="select_file_from_storage">Vyberte soubor z: %tw_storage_display_name% (%tw_storage_free_size% MB)</string>
@@ -70,43 +78,58 @@
 		<string name="zip_queue_count_s">Soubor %tw_zip_queue_count% z 10:</string>
 		<string name="zip_warn1">Tato operace může nainstalovat nekompatibilní</string>
 		<string name="zip_warn2">software a znefunkčnit zařízení.</string>
-		<string name="zip_back_cancel">Stlačte Nazpět pro zrušení přidání zip.</string>
+		<string name="zip_back_cancel">Stlačte Nazpět pro zrušení přidání ZIPu.</string>
 		<string name="zip_back_clear">Stlačte Nazpět pro vyčištění seznamu.</string>
 		<string name="folder">Adresář:</string>
 		<string name="file">Soubor:</string>
-		<string name="zip_sig_chk">Verifikace podpisu zip</string>
+		<string name="zip_sig_chk">Verifikace podpisu ZIPu</string>
 		<string name="inject_twrp_chk">Vložit TWRP po instalaci</string>
+		<string name="install_reboot_chk">Po dokončení instalace restartovat</string>
 		<string name="options_hdr">Nastavení</string>
-		<string name="confirm_flash_hdr">Potvrdit flash</string>
+		<string name="confirm_flash_hdr">Potvrdit instalaci</string>
 		<string name="zip_queue">Řada:</string>
 		<string name="options">Nastavení:</string>
 		<string name="swipe_confirm">   Potvrdit</string>
-		<string name="zip_add_btn">Přidat víc Zip</string>
-		<string name="zip_clear_btn">Vyčistit seznam Zip</string>
-		<string name="install_zip_count_hdr">Nainstaluj Zip %tw_zip_index% z %tw_zip_queue_count%</string>
-		<string name="installing_zip_xml">Instalace Zip: %tw_file%</string>
+		<string name="zip_add_btn">Přidat víc ZIPů</string>
+		<string name="zip_clear_btn">Vyčistit seznam ZIPů</string>
+		<string name="install_zip_count_hdr">Instalace ZIPu %tw_zip_index% z %tw_zip_queue_count%</string>
+		<string name="installing_zip_xml">Instalace ZIPu: %tw_file%</string>
 		<string name="failed">Neúspěšné</string>
 		<string name="successful">Úspěšné</string>
 		<string name="install_failed">Instalace selhala</string>
 		<string name="install_successful">Instalace se podařila</string>
 		<string name="wipe_cache_dalvik_btn">Vymazat cache/dalvik</string>
+		<string name="wipe_dalvik_btn">Vymazat Dalvik</string>
 		<string name="reboot_system_btn">Restartovat systém</string>
 		<string name="install_sel_target">Vyberte cílový oddíl</string>
 		<string name="flash_image_select">Vyberte cílový oddíl pro zápis obrazu:</string>
 		<string name="target_partition">Cílový oddíl:</string>
-		<string name="flashing_image">Zapisování obrazu...</string>
-		<string name="image_flashed">Obraz zapsaný</string>
-		<string name="wipe_cache_dalvik_confirm">Smazat cache &amp; dalvik?</string>
+		<string name="flashing_image">Zapisování IMG...</string>
+		<string name="image_flashed">IMG zapsaný</string>
+		<string name="wipe_cache_dalvik_confirm">Smazat cache &amp; dalvik?</string>	
+		<string name="wipe_dalvik_confirm">Vymazat Dalvik?</string>
 		<string name="wiping_cache_dalvik">Mazání cache &amp; dalvik...</string>
 		<string name="wipe_cache_dalvik_complete">Vymazání cache &amp; dalvik dokončeno</string>
+		<string name="wipe_dalvik_complete">Vymazaní Dalvik hotovo</string>
 		<string name="swipe_wipe">Potáhnout pro vymazání</string>
 		<string name="swipe_wipe_s">   Vymazání</string>
-		<string name="no_os1">Není nainstalovaný OS! Jste si</string>
-		<string name="no_osrb">si jistý, že chcete restart?</string>
+		<string name="no_os1">Není nainstalovaný OS! Jste</string>
+		<string name="no_osrb">si jistý, že chcete restartovat?</string>
 		<string name="no_ospo">si jistý, že chcete vypnout zařízení?</string>
 		<string name="rebooting">Restartování...</string>
-		<string name="swipe_reboot">Potáhnout pro restart</string>
+		<string name="swipe_reboot">Potáhnout pro restartování</string>
 		<string name="swipe_reboot_s">   Restart</string>
+		<string name="reboot_install_app1">Přejete si nainstalovat apku Official TWRP App?</string>
+		<string name="reboot_install_app2">Aplikace může zkontrolovat nové verze TWRP.</string>
+		<string name="reboot_install_app_hdr">Instalovat TWRP apku?</string>
+		<string name="reboot_install_app_prompt_install">Vyzvat k instalaci TWRP apky, pokud není nainstalována</string>
+		<string name="reboot_install_app_system">Nainstalovat jako systémovou aplikaci</string>
+		<string name="reboot_installing_app">Instalace aplikace...</string>
+		<string name="swipe_to_install_app">Potáhnout pro instalaci TWRP apky</string>
+		<string name="uninstall_twrp_system_app">Odinstalovat TWRP apku ze systému</string>
+		<string name="uninstall_twrp_system_app_complete">TWRP apka odinstalována</string>
+		<string name="uninstall_twrp_system_app_confirm">Odinstalovat TWRP apku ze systému?</string>
+		<string name="uninstalling_twrp_system_app">Odinstalovávání TWRP apky ze systému...</string>
 		<string name="swipe_flash">Potáhnout pro potvrzení zápisu</string>
 		<string name="confirm_action">Potvrdit akci</string>
 		<string name="back_cancel">Pro zrušení stlačte tlačítko nazpět.</string>
@@ -115,17 +138,18 @@
 		<string name="factory_reset_hdr">Tovární nastavení</string>
 		<string name="factory_reset_btn">Tovární nastavení</string>
 		<string name="factory_reset1">Vymazat Data, Cache a Dalvik</string>
-		<string name="factory_reset2">(nezahrnuje vnitřní paměť)</string>
+		<string name="factory_reset2">(nezahrnuje vnitřní úložiště)</string>
 		<string name="factory_reset3">Většinou je</string>
 		<string name="factory_reset4">potřebné jen vymazaní.</string>
+		<string name="factory_reset5">(nezahrnuje uživatelé/zámek obrazovky)</string>
 		<string name="factory_resetting">Tovární nastavení...</string>
 		<string name="advanced_wipe_hdr">Rozšířené vymazání</string>
 		<string name="advanced_wipe_btn">Rozšířené vymazání</string>
 		<string name="wipe_enc_confirm">Vymazat šifrovaní z Data?</string>
 		<string name="formatting_data">Formátuji Data...</string>
-		<string name="swipe_format_data">Swipe pro volbu Formátovat Data</string>
+		<string name="swipe_format_data">Potáhnout pro volbu Formátovat Data</string>
 		<string name="swipe_format_data_s">   Formátovat Data</string>
-		<string name="factory_reset_complete">Tovární nastavení ukončené</string>
+		<string name="factory_reset_complete">Tovární nastavení dokončeno</string>
 		<string name="sel_part_hdr">Vyberte oddíly</string>
 		<string name="wipe_sel_confirm">Vymazat vybraný(é) oddíl(y)?</string>
 		<string name="wiping_part">Vymazávání oddílu(ů)...</string>
@@ -136,23 +160,24 @@
 		<string name="format_data_btn">Formátovat Data</string>
 		<string name="format_data_ptr1">Formátování Data vymaže všechny aplikace,</string>
 		<string name="format_data_ptr2">zálohy, fotky, videa, hudbu</string>
-		<string name="format_data_ptr3">a vymaže enkrypci vnitřní paměťi.</string>
-		<string name="format_data_adopted">Zahrnuje adoptovanou paměť</string>
+		<string name="format_data_ptr3">a odstraní šifrovaní úložiště.</string>
+		<string name="format_data_adopted">Zahrnuje připojenou paměť</string>
 		<string name="format_data_lcp1">Formátování Data vymaže všechny aplikace, zálohy, fotografie, videa, hudbu</string>
-		<string name="format_data_lcp2">a vymaže enkrypci vnitřní paměťi.</string>
+		<string name="format_data_lcp2">a odstraní šifrovaní úložiště.</string>
 		<string name="format_data_wtc1">Formátování Data vymaže všechny aplikace,</string>
 		<string name="format_data_wtc2">zálohy a hudbu. Tento proces je nevratný.</string>
 		<string name="format_data_undo">Toto je nevratné.</string>
 		<string name="format_data_complete">Formátování Data je hotové</string>
+		<!-- Translator note: the word "yes" must remain English! -->
 		<string name="yes_continue">Napiš \"yes\" pro pokračování. Stlač nazpět pro zrušení.</string>
 		<string name="part_opt_hdr">Možnosti pro: %tw_partition_name%</string>
 		<string name="sel_act_hdr">Vyber akci</string>
 		<string name="file_sys_opt">Nastavení souborového systému</string>
 		<string name="partition">Oddíly: %tw_partition_name%</string>
-		<string name="part_mount_point">Mount point: %tw_partition_mount_point%</string>
+		<string name="part_mount_point">Připojit část: %tw_partition_mount_point%</string>
 		<string name="part_curr_fs">Souborový systém: %tw_partition_file_system%</string>
-		<string name="part_prosent_yes">Přítomný: Ano</string>
-		<string name="part_prosent_no">Přítomný: Ne</string>
+		<string name="part_present_yes">Současný: Ano</string>
+		<string name="part_present_no">Současný: Ne</string>
 		<string name="part_removable_yes">Vyměnitelný: Ano</string>
 		<string name="part_removable_no">Vyměnitelný: Ne</string>
 		<string name="part_size">Velikost: %tw_partition_size%MB</string>
@@ -170,7 +195,7 @@
 		<string name="repair_btn_s">Oprava</string>
 		<string name="repair_confirm">Opravit %tw_partition_name%?</string>
 		<string name="repairing">Opravování...</string>
-		<string name="repair_complete">Oprava ukončená</string>
+		<string name="repair_complete">Oprava dokončena</string>
 		<string name="swipe_repair">Potáhnout pro opravu</string>
 		<string name="swipe_repair_s">   Oprava</string>
 		<string name="change_fs_btn">Změnit souborový systém</string>
@@ -196,11 +221,17 @@
 		<string name="name">Název:</string>
 		<string name="sel_part_backup">Vybrat oddíly do zálohy:</string>
 		<string name="storage">Paměť:</string>
-		<string name="enc_disabled">zakázané - pro povolení zadejte heslo</string>
-		<string name="enc_enabled">povolené</string>
+		<string name="enc_disabled">zakázáno - pro povolení zadejte heslo</string>
+		<string name="enc_enabled">povoleno</string>
 		<string name="enable_backup_comp_chk">Povolit kompresi</string>
 		<string name="skip_digest_backup_chk" version="2">Vynechat generovaní Digest během zálohy</string>
-		<string name="disable_backup_space_chk">Nekontrolovat volné místo</string>
+		<string name="disable_backup_space_chk" version="2">Nekontrolovat volné místo</string>
+		<string name="skip_digest_zip_chk">Přeskočit Digest kontrolu před instalováním ZIPu</string>
+		<string name="current_boot_slot">Aktuální slot: %tw_active_slot%</string>
+		<string name="boot_slot_a">Slot A</string>
+		<string name="boot_slot_b">Slot B</string>
+		<string name="changing_boot_slot">Změna spouštěcího slotu</string>
+		<string name="changing_boot_slot_complete">Změna spouštěcího slotu hotova</string>
 		<string name="refresh_sizes_btn">Obnovit velikosti</string>
 		<string name="swipe_backup">Potáhnout pro zálohu</string>
 		<string name="append_date_btn">Připojit datum</string>
@@ -210,17 +241,17 @@
 		<string name="enter_pass2">Zopakujte heslo:</string>
 		<string name="pass_not_match">Hesla se nezhodují!</string>
 		<string name="partitions">Oddíly:</string>
-		<string name="disabled">Zakázané</string>
-		<string name="enabled">Povolené</string>
+		<string name="disabled">Zakázáno</string>
+		<string name="enabled">Povoleno</string>
 		<string name="backup_name_hdr">Pojmenování zálohy</string>
-		<string name="progress">Příběh:</string>
+		<string name="progress">Průběh:</string>
 		<string name="backup_complete">Zálohovaní je dokončeno</string>
 		<string name="restore_hdr">Obnova</string>
 		<string name="sel_backup_hdr">Vyberte zálohu</string>
 		<string name="restore_sel_store_hdr">Vyberte zálohu z %tw_storage_display_name% (%tw_storage_free_size% MB)</string>
 		<string name="restore_sel_pack_fs">Vyberte balíček pro obnovu:</string>
 		<string name="restore_enc_backup_hdr">Šifrovaná záloha</string>
-		<string name="restore_dec_fail">Heslo je nesprávne, zkuste to znova!</string>
+		<string name="restore_dec_fail">Heslo není správné, zkuste to znova!</string>
 		<string name="del_backup_btn">Smazat zálohu</string>
 		<string name="del_backup_confirm">Smazat zálohu?</string>
 		<string name="del_backup_confirm2">Toto je nevratné!</string>
@@ -239,7 +270,7 @@
 		<string name="rename_backup_hdr">Přejmenovat zálohu</string>
 		<string name="rename_backup_confirm">Přejmenovat zálohu?</string>
 		<string name="rename_backup_confirm2">Toto je nevratné!</string>
-		<string name="renaming_backup">Přejmenovávaní zálohy...</string>
+		<string name="renaming_backup">Přejmenovávání zálohy...</string>
 		<string name="rename_backup_complete">Přejmenování zálohy dokončeno</string>
 		<string name="swipe_to_rename">Potáhnutím přejmenovat</string>
 		<string name="swipe_rename">   Přejmenovat</string>
@@ -248,12 +279,12 @@
 		<string name="mount_sel_part">Vybrat oddíly pro připojení:</string>
 		<string name="mount_sys_ro_chk">Připojit oddíly v režimu čtení</string>
 		<string name="mount_sys_ro_s_chk">Připojit systém v režimu na čtení</string>
-		<string name="decrypt_data_btn">Dekryptovat Data</string>
+		<string name="decrypt_data_btn">Dešifrovat Data</string>
 		<string name="disable_mtp_btn">Zakázat MTP</string>
 		<string name="enable_mtp_btn">Povolit MTP</string>
-		<string name="mount_usb_storage_btn">Připoj. ukl. prostor USB</string>
-		<string name="usb_storage_hdr">Ukládací prostor USB</string>
-		<string name="usb_stor_mnt1">Ukládací prostor USB připojený</string>
+		<string name="mount_usb_storage_btn">Připoj. ulož. prostor USB</string>
+		<string name="usb_storage_hdr">Uložný prostor USB</string>
+		<string name="usb_stor_mnt1">Uložný prostor USB připojen</string>
 		<string name="usb_stor_mnt2">Ujistěte se, že jste zařízení odebrali</string>
 		<string name="usb_stor_mnt3">z počítače před odpojením!</string>
 		<string name="unmount_btn">Odpojit</string>
@@ -262,7 +293,7 @@
 		<string name="rb_recovery_btn">Recovery</string>
 		<string name="rb_bootloader_btn">Bootloader</string>
 		<string name="rb_download_btn">Stáhnout</string>
-		<string name="rb_edl_btn">EDL</string>
+		<string name="rb_edl_btn">Edl</string>
 		<string name="turning_off">Vypínání...</string>
 		<string name="swipe_power_off">Potáhnout pro vypnutí</string>
 		<string name="swipe_power_off_s">Vypnout</string>
@@ -270,13 +301,13 @@
 		<string name="sys_ro_keep">Ponechat Systém v režimu na čtení?</string>
 		<string name="sys_rop1">TWRP může ponechat váš systémový oddíl nezměněný</string>
 		<string name="sys_rop2">což zjednoduší instalaci oficiálních aktualizací.</string>
-		<string name="sys_rop3">TWRP nezabrání tuctové ROMky</string>
+		<string name="sys_rop3">TWRP nezabrání tovární ROMce</string>
 		<string name="sys_rop4">přepsat TWRP a nebude nabízet rootování zařízení.</string>
-		<string name="sys_rop5">Instalovaní Zip nebo operace přes adb můžu stále</string>
+		<string name="sys_rop5">Instalovaní ZIPu nebo operace přes ADB mohou stále</string>
 		<string name="sys_rop6">modifikovat systémový oddíl.</string>
 		<string name="sys_rol1">TWRP může ponechat váš systémový oddíl nezměněný což zjednoduší instalaci oficiálních aktualizací.</string>
-		<string name="sys_rol2">TWRP nezabrání tuctové ROMce přepsat TWRP a nebude nabízet rootování zařízení.</string>
-		<string name="sys_rol3">Instalování Zip nebo operace přes adb můžou stále modifikovat systémový oddíl.</string>
+		<string name="sys_rol2">TWRP nezabrání tovární ROMce přepsat TWRP a nebude nabízet rootování zařízení.</string>
+		<string name="sys_rol3">Instalování ZIPu nebo operace přes ADB mohou stále modifikovat systémový oddíl.</string>
 		<string name="sys_ro_never_show_chk">Nikdy víc nezobrazovat tuto obrazovku po startu</string>
 		<string name="sys_ro_keep_ro_btn">Ponechat v režimu na čtení</string>
 		<string name="swipe_allow_mod">Potáhnout pro povolení změn</string>
@@ -286,9 +317,10 @@
 		<string name="settings_gen_s_hdr">Všeobecné</string>
 		<string name="settings_gen_btn">Všeobecné</string>
 		<string name="use_rmrf_chk">Použít rm -rf namísto naformátování</string>
+		<string name="auto_reflashtwrp_chk">Automaticky obnovit TWRP po instalaci ROM</string>
 		<string name="use24clock_chk">Používat 24-hodin</string>
 		<string name="rev_navbar_chk">Převrácené uspořádaní lišty</string>
-		<string name="simact_chk">Simulovat akce pro testovaní téma</string>
+		<string name="simact_chk">Simulovat akce pro testovaní tématu</string>
 		<string name="simfail_chk">Simulovat neúspěchy akcí</string>
 		<string name="ctr_navbar_rdo">Centrovat tlačítka navigace</string>
 		<string name="lft_navbar_rdo">Zarovnat tlačítka navigace vlevo</string>
@@ -297,10 +329,13 @@
 		<string name="settings_tz_btn">Časové pásmo</string>
 		<string name="settings_screen_btn">Obrazovka</string>
 		<string name="settings_screen_bright_btn">Jas obrazovky</string>
+		<string name="vibration_disabled">Vibrace jsou pro toto zařízení deaktivovány</string>
 		<string name="settings_vibration_btn">Vibrovat</string>
 		<string name="settings_language_btn">Jazyk</string>
 		<string name="time_zone_hdr">Časové pásmo</string>
 		<string name="sel_tz_list">Vyberte časové pásmo:</string>
+		<!-- Translator note: if it does not make sense to translate the locations or if it makes more sense,
+				feel free to change the location listed or drop the location entirely and just call it UTC -6 -->
 		<string name="utcm11">(UTC -11) Samoa, Midwayské ostrovy</string>
 		<string name="utcm10">(UTC -10) Havaj</string>
 		<string name="utcm9">(UTC -9) Aljaška</string>
@@ -313,7 +348,7 @@
 		<string name="utcm2">(UTC -2) Středoatlantický čas</string>
 		<string name="utcm1">(UTC -1) Azory, Cape Verde</string>
 		<string name="utc0">(UTC  0) Greenwichský čas, Londýn, Dublin, Lisabon</string>
-		<string name="utcp1">(UTC +1) Stredoevropský čas, Praha, Berlín, Brusel, Paříž</string>
+		<string name="utcp1">(UTC +1) Středoevropský čas, Praha, Berlín, Brusel, Paříž</string>
 		<string name="utcp2">(UTC +2) Atény, Istanbul, Minsk, Káhira</string>
 		<string name="utcp3">(UTC +3) Moskva, Bagdád, Teherán</string>
 		<string name="utcp4">(UTC +4) Abu Dhabi, Tbilisi, Muscat</string>
@@ -344,10 +379,10 @@
 		<string name="screen_bright_slider">Jas: %tw_brightness_pct%%</string>
 		<string name="screen_bright_na">Nastavení jasu nedostupné</string>
 		<string name="vibration_hdr">Vibrovat</string>
-		<string name="button_vibration_hdr">Vibrovat při stláčení</string>
+		<string name="button_vibration_hdr">Vibrovat při stlačení</string>
 		<string name="kb_vibration_hdr">Vibrovat při psaní</string>
 		<string name="act_vibration_hdr">Vibrovat při akci</string>
-		<string name="button_vibration">Vibrovat při stláčení:</string>
+		<string name="button_vibration">Vibrovat při stlačení:</string>
 		<string name="kb_vibration">Vibrovat při psaní:</string>
 		<string name="act_vibration">Vibrovat při akci:</string>
 		<string name="select_language">Výběr jazyka:</string>
@@ -355,14 +390,15 @@
 		<string name="set_language_btn">Nastavit jazyk</string>
 		<string name="advanced_hdr">Rozšířené</string>
 		<string name="copy_log_confirm">Kopírovat log na SD kartu?</string>
-		<string name="copying_log">Kopírování logu na SD kartu...</string>
-		<string name="copy_log_complete">Kopírování logu dokončeno</string>
+		<string name="copying_log" version="2">Kopírování logu na SD kartu...</string>
+		<string name="copy_log_complete" version="2">Kopírování logu dokončeno</string>
+		<string name="fix_context_btn">Oprava kontextů</string>
 		<string name="part_sd_btn">Rozdělit SD kartu</string>
 		<string name="part_sd_s_btn">SD karta</string>
 		<string name="file_manager_btn">Souborový manažer</string>
 		<string name="language_hdr">Jazyk</string>
 		<string name="terminal_btn">Terminál</string>
-		<string name="reload_theme_btn">Načítat téma</string>
+		<string name="reload_theme_btn">Načíst téma</string>
 		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">Vložit TWRP</string>
 		<string name="inject_twrp_confirm">Znova vložit TWRP?</string>
@@ -371,7 +407,7 @@
 		<string name="swipe_to_confirm">Potáhnout pro potvrzení</string>
 		<string name="part_sd_hdr">Rozdělit SD kartu</string>
 		<string name="invalid_partsd_sel">Musíte zvolit odstranitelné zařízení</string>
-		<string name="part_sd_lose">Přijdete o všechny soubory na vložené SD kartě!</string>
+		<string name="part_sd_lose">Příjdete o všechny soubory na vložené SD kartě!</string>
 		<string name="part_sd_undo">Toto je nevratná akce!</string>
 		<string name="part_sd_ext_sz">Velikost EXT:</string>
 		<string name="part_sd_swap_sz">Velikost Swap:</string>
@@ -380,18 +416,18 @@
 		<string name="file_system">Souborový systém:</string>
 		<string name="swipe_part_sd">Potáhnutím rozdělit</string>
 		<string name="swipe_part_sd_s">Rozdělení</string>
-		<string name="partitioning_sd">Dělím SD kartu...</string>
+		<string name="partitioning_sd">Rozdělování SD karty...</string>
 		<string name="partitioning_sd2">Toto potrvá několik minut.</string>
-		<string name="part_sd_complete">Rozdělení kompletní</string>
+		<string name="part_sd_complete">Rozdělení dokončeno</string>
 		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">Onbovit původní boot</string>
-		<string name="dumlock_restore_confirm">Obnovit původní obraz boot?</string>
-		<string name="dumlock_restoring">Obnovování původního bootu...</string>
-		<string name="dumlock_restore_complete">Obnova původního bootu dokončená</string>
-		<string name="dumlock_reflash_btn">Přepsání recovery</string>
-		<string name="dumlock_reflash_confirm">Přepsat recovery při startu?</string>
-		<string name="dumlock_reflashing">Přepisování recovery při startu...</string>
-		<string name="dumlock_reflash_complete">Přepsání recovery při startu dokončeno</string>
+		<string name="dumlock_restore_btn">Onbovit původní Boot</string>
+		<string name="dumlock_restore_confirm">Obnovit původní Boot?</string>
+		<string name="dumlock_restoring">Obnovování původního Bootu...</string>
+		<string name="dumlock_restore_complete">Obnova původního Bootu dokončená</string>
+		<string name="dumlock_reflash_btn">Přepsání Recovery</string>
+		<string name="dumlock_reflash_confirm">Přepsat Recovery při startu?</string>
+		<string name="dumlock_reflashing">Přepisování Recovery při startu...</string>
+		<string name="dumlock_reflash_complete">Přepsání Recovery při startu dokončeno</string>
 		<string name="dumlock_install_btn">Instalovat HTC Dumlock</string>
 		<string name="dumlock_install_confirm">Instalovat soubory HTC Dumlock do ROM?</string>
 		<string name="dumlock_installing">Instalace HTC Dumlock...</string>
@@ -403,8 +439,8 @@
 		<string name="fm_type_folder">Adresář</string>
 		<string name="fm_type_file">Soubor</string>
 		<string name="fm_choose_act">Zvolte akci</string>
-		<string name="fm_selected">Zvolené %tw_fm_type%:</string>
-		<string name="fm_copy_btn">Kopíruj</string>
+		<string name="fm_selected">Zvoleno %tw_fm_type%:</string>
+		<string name="fm_copy_btn">Kopírovat</string>
 		<string name="fm_copy_file_btn">Kopírovat soubor</string>
 		<string name="fm_copy_folder_btn">Kopírovat adresář</string>
 		<string name="fm_copying">Kopírování</string>
@@ -424,27 +460,84 @@
 		<string name="fm_rename_hdr">Přejmenovat</string>
 		<string name="fm_set_perms_hdr">Nastavit práva</string>
 		<string name="fm_perms">Práva:</string>
-		<string name="fm_complete">Operace na souboru dokončená</string>
+		<string name="fm_complete">Operace se souborem dokončena</string>
+ 		<string name="fm_open_terminal_btn">Zde otevřít Terminal</string>
+		<string name="fm_edit_file">Upravit soubor</string>
 		<string name="decrypt_data_hdr">Dešifrovat data</string>
 		<string name="decrypt_data_enter_pass">Zadejte heslo.</string>
+		<string name="decrypt_data_failed">Heslo selhalo, zkuste to znovu!</string>
+		<string name="decrypt_data_failed_pattern">Vzor selhal, zkuste to znovu!</string>
 		<string name="decrypt_data_enter_pattern">Zadejte vzor.</string>
 		<string name="decrypt_data_trying">Pokus o dešifrování</string>
+		<string name="decrypt_data_vold_os_missing">Chybí soubory nutné pro dešifrování: {1}</string>
 		<string name="term_hdr">Příkaz terminálu</string>
 		<string name="term_s_hdr">Terminál</string>
 		<string name="term_kill_btn">ZABÍT</string>
 		<string name="term_sel_folder_hdr">Navigovat do počátečního adresáře</string>
 		<string name="adb_sideload_hdr">ADB Sideload</string>
-		<string name="sideload_wipe_dalvik_chk">Vymazat dalvik cache</string>
-		<string name="sideload_wipe_cache_chk">Vymazat cache</string>
+		<string name="sideload_wipe_dalvik_chk">Vymazat Dalvik Cache</string>
+		<string name="sideload_wipe_cache_chk">Vymazat Cache</string>
 		<string name="swipe_to_sideload">Potáhnout pro spuštění sideload</string>
 		<string name="swipe_sideload">   Start</string>
 		<string name="sideload_confirm">ADB Sideload</string>
 		<string name="sideload_usage">Použití: adb sideload název.zip</string>
-		<string name="sideload_complete">ADB Sideload dokončený</string>
+		<string name="sideload_complete">ADB Sideload dokončeno</string>
+		<string name="fix_contexts_hdr">Oprava kontextů</string>
+		<string name="fix_contexts_note1">Poznámka: Oprava kontextů je zřídka nutná.</string>
+		<string name="fix_contexts_note2">Oprava SELinux kontextů může způsobit</string>
+		<string name="fix_contexts_note3">problémy se správným spuštěním zařízení.</string>
+		<string name="swipe_fix_contexts">   Oprava kontextů</string>
+		<string name="swipe_to_fix_contexts">Potáhnout pro opravu kontextů</string>
+		<string name="fixing_contexts">Oprava kontextů...</string>
+		<string name="fix_contexts_complete">Oprava kontextů hotova</string>
 		<string name="reboot_hdr">Restart</string>
 		<string name="install_cancel">Neinstalovat</string>
 		<string name="sel_storage_list">Vyberte úložiště</string>
 		<string name="ok_btn">OK</string>
+		<string name="install_twrp_ramdisk">Instalovat Recovery Ramdisk</string>
+		<string name="install_kernel">Instalovat Kernel</string>
+		<string name="repack_kernel_confirm">Instalovat Kernel?</string>
+		<string name="repack_kernel_confirm_hdr">Instalovat Kernel</string>
+		<string name="repack_ramdisk_confirm">Instalovat Recovery?</string>
+		<string name="repack_ramdisk_confirm_hdr">Instalovat Recovery</string>
+		<string name="repack_backup_first">Nejprve zálohujte existující IMG</string>
+		<string name="repack">Přebalit</string>
+		<string name="swipe_to_install">Potáhnout pro potvrzení instalace</string>
+		<string name="installing">Instalování...</string>
+		<string name="install_complete">Instalace hotova</string>
+		<string name="unpack_error">Chyba při rozbalování IMG.</string>
+		<string name="repack_error">Chyba při přebalení IMG.</string>
+		<string name="modified_ramdisk_error">soubory ramdisku byly upraveny, nelze vytvořit ramdisk pro instalaci, spusťte twrp fastboot a zkuste tuto možnost znovu nebo použijte možnost Instalovat Recovery Ramdisk.</string>
+		<string name="create_ramdisk_error">Nepodařilo se vytvořit ramdisk k instalováním.</string>
+		<string name="unpacking_image">Rozbalování {1}...</string>
+		<string name="repacking_image">Přebalování {1}...</string>
+		<string name="repack_image_hdr">Vybrat IMG</string>
+		<string name="repack_overwrite_warning">Pokud bylo zařízení dříve rootováno, pak byl root přepsán a bude nutné jej znovu nainstalovat.</string>
+		<string name="reflash_twrp">Instalace aktualního TWRP</string>
+		<string name="reflash_twrp_confirm">Instalovat aktualní TWRP?</string>
+		<string name="reflashing_twrp">Instalování TWRP...</string>
+		<string name="reflash_twrp_complete">Instalace TWRP dokončena</string>
+		<string name="fix_recovery_loop">Opravit Recovery bootloop</string>
+		<string name="fix_recovery_loop_confirm">Opravit Recovery bootloop?</string>
+		<string name="fixing_recovery_loop">Oprava Recovery bootloopu...</string>
+		<string name="fix_recovery_loop_complete">Oprava Recovery bootloopu hotova</string>
+		<string name="fixing_recovery_loop_patch">Záplatování Kernelu...</string>
+		<string name="fix_recovery_loop_patch_error">Chyba záplatování Kernelu.</string>
+		<string name="decrypt_users">Dešifrování uživatelů</string>
+		<string name="decrypt_users_selection">Zvolte ID uživatele pro dešifrování</string>
+		<string name="select_user">Vyberte uživatele</string>
+		<string name="backup_storage_undecrypt_warning">Záloha nezahrnuje některé soubory uživatele {1}, protože uživatel není dešifrován.</string>
+		<string name="decrypting_user_fbe">Pokus o dešifrování FBE uživatele {1}...</string>
+		<string name="decrypt_user_success_fbe">Dešifrování uživatele {1} hotovo</string>
+		<string name="decrypt_user_fail_fbe">Dešifrování uživatele {1} se nezdařilo</string>
+		<string name="decrypt_data_enter_pass_fbe">Zadejte heslo pro uživatele [%tw_crypto_user_id%]</string>
+		<string name="decrypt_data_enter_pattern_fbe">Zadejte vzor pro uživatele [%tw_crypto_user_id%]</string>
+		<string name="multiuser_warning1">Nebyli dešifrováni všichni uživatelé!</string>
+		<string name="multiuser_warning2">Operace Záloha/Obnova mohou selhat!</string>
+		<string name="multiuser_warning_accept">Přesto pokračovat</string>
+		<string name="multiuser_warning_hdr">Multiuživatel varování</string>
+
+		<!-- Various console messages - these consist of user displayed messages, oftentimes errors -->
 		<string name="no_kernel_selinux">Kernel nemá podporu pro čtení obsahu SELinux.</string>
 		<string name="full_selinux">Plná podpora SELinux.</string>
 		<string name="no_selinux">Bez podpory SELinux (chybí libselinux).</string>
@@ -453,14 +546,15 @@
 		<string name="decrypt_success">Úspešně dešifrované s přednastaveným heslem.</string>
 		<string name="unable_to_decrypt">Nelze dešifrovat s přednastaveným heslem. Možná budete muset naformátovat Data.</string>
 		<string name="generating_digest1" version="2">Generuje se Digest</string>
+		<!-- Message displayed during a backup if we are generating an Digest, ideally, leave the leading " * " to help align and separate this text from other console text -->
 		<string name="generating_digest2" version="2"> *Generuje se Digest...</string>
-		<string name="digest_created" version="2"> *Digest vygenerované.</string>
+		<string name="digest_created" version="2"> *Digest vygenerován.</string>
 		<string name="digest_error" version="2"> * chyba Digest!</string>
 		<string name="digest_compute_error" version="2"> * chyba při výpočtu Digest.</string>
 		<string name="current_date">(Aktuální datum)</string>
-		<string name="auto_generate">(Generovat automaticky)</string>
+		<string name="auto_generate">(Vytvořit automaticky)</string>
 		<string name="unable_to_locate_partition">Nelze najít oddíl \'{1}\' pro výpočet zálohy.</string>
-		<string name="no_partition_selected">Žádné oddíly vybrané na zálohování.</string>
+		<string name="no_partition_selected">Nejsou vybrány žádné oddíly na zálohování.</string>
 		<string name="total_partitions_backup"> * Počet oddílů označených na zálohování: {1}</string>
 		<string name="total_backup_size"> * Konečná velikost zálohy: {1}MB</string>
 		<string name="available_space"> * Zůstatek místa: {1}MB</string>
@@ -475,25 +569,29 @@
 		<string name="backup_completed">[ZÁLOHA DOKONČENÁ ZA {1} SEKUND]</string>
 		<string name="restore_started">[ZAČÁTEK OBNOVY]</string>
 		<string name="restore_folder">Obnovit adresář: \'{1}\'</string>
+		<!-- {1} is the partition display name and {2} is the number of seconds -->
+	    <string name="restore_part_done">[{1} hotovo ({2} sekund)]</string>
 		<string name="verifying_digest" version="2">Kontrolování Digest</string>
 		<string name="skip_digest" version="2">Vynechání kontroly Digest na základě uživatelského nastavení.</string>
 		<string name="calc_restore">Počítání detailů obnovy...</string>
 		<string name="restore_read_only">Nelze obnovit {1} -- připojené jen na čtení.</string>
 		<string name="restore_unable_locate">Nelze najít oddíl \'{1}\' pro obnovu.</string>
-		<string name="no_part_restore">Žádné oddíly nebyly vybrané pro obnovu.</string>
+		<string name="no_part_restore">Žádné oddíly nebyly vybrány pro obnovu.</string>
 		<string name="restore_part_count">Obnova {1} oddílů...</string>
-		<string name="total_restore_size">Velikost obnovy je spolu {1}MB</string>
+		<string name="total_restore_size">Celková velikost obnovy je {1}MB</string>
 		<string name="updating_system_details">Obnovování detailů systému</string>
 		<string name="restore_completed">[OBNOVA DOKONČENÁ ZA {1} SEKUND]</string>
-		<string name="error_opening_strerr">Chyba při otvírání: \'{1}\' ({2})</string>
+		<!-- {1} is the path we could not open, {2} is strerror output -->
+		<string name="error_opening_strerr">Chyba při otevírání: \'{1}\' ({2})</string>
 		<string name="unable_locate_part_backup_name">Nelze najít oddíl podle názvu zálohy: \'{1}\'</string>
 		<string name="unable_find_part_path">Nelze najít oddíl na cestě \'{1}\'</string>
 		<string name="update_part_details">Obnova detailů oddílů...</string>
 		<string name="update_part_details_done">...hotovo</string>
-		<string name="wiping_dalvik">Vymazávání adresářů dalvik cache...</string>
+		<string name="wiping_dalvik">Vymazávání adresářů Dalvik Cache...</string>
 		<string name="cleaned">Vyčištěné: {1}...</string>
-		<string name="dalvik_done">-- Vyčištění adresáře Dalvik cache bylo dokončeno!</string>
-		<string name="no_andsec">Žádné zabezpečené android oddíly nebyly nalezeny.</string>
+		<string name="cache_dalvik_done">-- Vymazání Dalvik Cache adresáře hotovo!</string>
+		<string name="dalvik_done">-- Vyčištění adresáře Dalvik Cache bylo dokončeno!</string>
+		<string name="no_andsec">Žádné Android Secure oddíly nebyly nalezeny.</string>
 		<string name="unable_to_locate">{1} nelze najít.</string>
 		<string name="wiping_datamedia">Vymazávání interního úložiště -- /data/media...</string>
 		<string name="unable_to_mount">{1} nelze připojit</string>
@@ -501,11 +599,12 @@
 		<string name="unable_to_mount_storage">Nelze připojit úložiště</string>
 		<string name="fail_decrypt">Nelze dešifrovat data.</string>
 		<string name="no_crypto_support">Tato verze byla zkompilovaná bez podpory šifrování.</string>
-		<string name="decrypt_success_dev">Data byly úspěšne dešifrované, nový block device: \'{1}\'</string>
+		<string name="decrypt_success_dev">Data byla úspěšně dešifrována, nový blok zařízení: \'{1}\'</string>
+		<string name="decrypt_success_nodev">Data byla úspěšně dešifrována</string>
 		<string name="done">Hotovo.</string>
-		<string name="start_partition_sd">Dělení SD karty...</string>
+		<string name="start_partition_sd">Rozdělování SD karty...</string>
 		<string name="partition_sd_locate">Nelze najít zařízení na rozdělení.</string>
-		<string name="ext_swap_size">Velikost EXT + Swap je větší jako velikost SD karty.</string>
+		<string name="ext_swap_size">Velikost EXT + Swap je větší než velikost SD karty.</string>
 		<string name="remove_part_table">Vymazávání tabulky rozdělení...</string>
 		<string name="unable_rm_part">Nelze vymazat tabulku rozdělení.</string>
 		<string name="create_part">Vytváření oddílu {1}...</string>
@@ -516,29 +615,32 @@
 		<string name="mtp_already_enabled">MTP je už povolené</string>
 		<string name="mtp_fail">Nelze povolit MTP</string>
 		<string name="no_mtp">Podpora MTP není zahrnutá</string>
-		<string name="image_flash_start">[ZÁPIS OBRAZU SPUŠTĚNÝ]</string>
-		<string name="img_to_flash">Obraz na zápis: \'{1}\'</string>
+		<string name="image_flash_start">[ZÁPIS IMG SPUŠTĚN]</string>
+		<string name="img_to_flash">IMG na zápis: \'{1}\'</string>
 		<string name="flash_unable_locate">Nelze najít oddíl \'{1}\' pro zápis.</string>
 		<string name="no_part_flash">Na zápis nebyly zvolené žádné oddíly.</string>
-		<string name="too_many_flash">Na zápis je zvolených příliš mnoho oddílů.</string>
+		<string name="too_many_flash">Na zápis je zvoleno příliš mnoho oddílů.</string>
 		<string name="invalid_flash">Zvolený oddíl je nesprávný pro zápis.</string>
-		<string name="flash_done">[ZÁPIS OBRAZU DOKONČENÝ]</string>
+		<string name="flash_done">[ZÁPIS IMG DOKONČEN]</string>
 		<string name="wiping">Mazání {1}</string>
 		<string name="repair_not_exist">{1} neexistuje! Oprava nemožná!</string>
 		<string name="repairing_using">Oprava {1} pomocí {2}...</string>
 		<string name="unable_repair">Nelze opravit {1}.</string>
 		<string name="mount_data_footer">Nelze připojit /data a nelze najít parametry šifrování.</string>
+		<!-- {1} is the folder name that we could not create, {2} is strerror output -->
 		<string name="create_folder_strerr">Adresář \'{1}\' nelze vytvořit ({2}).</string>
+		<!-- {1} is the folder name that we could not mount, {2} is strerror output -->
 		<string name="fail_mount">Nelze připojit \'{1}\' ({2})</string>
+		<!-- {1} is the folder name that we could not unmount, {2} is strerror output -->
 		<string name="fail_unmount">Nelze odpojit \'{1}\' ({2})</string>
 		<string name="cannot_resize">Nelze natáhnout {1}.</string>
 		<string name="repair_resize">Opravování {1} před natáhnutím.</string>
 		<string name="unable_resize">Nelze natáhnout {1}.</string>
 		<string name="no_digest_found" version="2">Soubor Digest se nenašel pro \'{1}\'. Prosím zvolte Vypnout kontrolu Digest během obnovy.</string>
 		<string name="digest_fail_match" version="2">Digest neodpovídá souboru \'{1}\'.</string>
-		<string name="digest_matched" version="2">Digest matched for '{1}'.</string>
-		<string name="fail_decrypt_tar">Nelze dešifrovat soubor tar \'{1}\'</string>
-		<string name="format_data_msg">Měli by jste restartovat recovery aby jste mohli znova používat /data.</string>
+		<string name="digest_matched" version="2">Digest pasuje k '{1}'.</string>
+		<string name="fail_decrypt_tar">Nelze dešifrovat soubor TAR \'{1}\'</string>
+		<string name="format_data_msg">Měli by jste restartovat Recovery aby jste mohli znova používat /data.</string>
 		<string name="format_data_err">Nelze formátovat pro zrušení šifrování.</string>
 		<string name="formatting_using">Formátování {1} použitím {2}...</string>
 		<string name="unable_to_wipe">Nelze vymazat {1}.</string>
@@ -546,13 +648,14 @@
 		<string name="remove_all">Vymazání všech souborů v \'{1}\'</string>
 		<string name="wiping_data">Vymazaní Data bez vymazání /data/media...</string>
 		<string name="backing_up">Zálohování {1}...</string>
+		<string name="backup_storage_warning">Záloha {1} nezahrnuje žádné soubory interního úložiště, jako jsou obrázky, hudba nebo stažené soubory.</string>
 		<string name="backing">Zálohování</string>
 		<string name="backup_size">Velikost zálohy pro \'{1}\' je 0 bajtů.</string>
-		<string name="datamedia_fs_restore">UPOZORNĚNÍ: Tato záloha /data byla vytvořená pomocí systému souborů {1}! Záloha nebude bootovat pokud se nezmění nazpět na {1}.</string>
+		<string name="datamedia_fs_restore">UPOZORNĚNÍ: Tato záloha /data byla vytvořená pomocí systému souborů {1}! Záloha nebude spustitelná pokud se nezmění nazpět na {1}.</string>
 		<string name="restoring">Obnovování {1}...</string>
 		<string name="restoring_hdr">Obnovování</string>
 		<string name="recreate_folder_err">Nelze vytvořit adresář {1}.</string>
-		<string name="img_size_err">Velikost obrazu je větší než cílové zařízení</string>
+		<string name="img_size_err">Velikost IMG je větší než cílové zařízení</string>
 		<string name="flashing">Zapisování {1}...</string>
 		<string name="backup_folder_set">Adresář záloh nastavený na: \'{1}\'</string>
 		<string name="locate_backup_err">Zálohu \'{1}\' nelze najít</string>
@@ -570,65 +673,125 @@
 		<string name="running_command">Spouštění příkazu</string>
 		<string name="sideload">ADB Sideload</string>
 		<string name="start_sideload">Spouštění funkce ADB sideload...</string>
-		<string name="need_new_adb">pro použití sideload na toto zařízení potřebujete ADB 1.0.32 nebo novší.</string>
-		<string name="no_pwd">Heslo nebylo poskytnuté.</string>
+		<string name="need_new_adb">pro použití sideload na tomto zařízení potřebujete ADB 1.0.32 nebo novější.</string>
+		<string name="no_pwd">Heslo nebylo poskytnuto.</string>
 		<string name="done_ors">Vykonávání skriptu dokončeno</string>
-		<string name="injecttwrp">Vkládání TWRP do obrazu boot...</string>
-		<string name="zip_err">Chyba při instalaci zip souboru \'{1}\'</string>
-		<string name="installing_zip">Instalace zip souboru \'{1}\'</string>
+		<string name="injecttwrp">Vkládání TWRP do boot.img...</string>
+		<string name="zip_err">Chyba při instalaci ZIP souboru \'{1}\'</string>
+		<string name="installing_zip">Instalace ZIP souboru \'{1}\'</string>
 		<string name="select_backup_opt">Nastavení možností zálohy:</string>
-		<string name="comprossion_on">Komprese zapnutá</string>
-		<string name="digest_off" version="2">Generovaní Digest vypnuté</string>
+		<string name="compression_on">Komprese je zapnutá</string>
+		<string name="digest_off" version="2">Vytváření Digest vypnuté</string>
 		<string name="backup_fail">Zálohování selhalo</string>
 		<string name="backup_clean">Zálohování selhalo. Čistění adresáře záloh.</string>
-		<string name="running_recovery_commands">Spouštění příkazů recovery</string>
-		<string name="recovery_commands_complete">Příkazy recovery dokončeno</string>
+		<string name="running_recovery_commands">Spouštění příkazů Recovery</string>
+		<string name="recovery_commands_complete">Příkazy Recovery dokončeny</string>
 		<string name="running_ors">Spouštění OpenRecoveryScript</string>
-		<string name="ors_complete">OpenRecoveryScript dokončený</string>
-		<string name="no_updater_binary">Nelze nájít \'{1}\' v souboru zip.</string>
+		<string name="ors_complete">OpenRecoveryScript dokončen</string>
 		<string name="check_for_digest" version="2">Kontrola Digest souboru...</string>
+		<string name="invalid_zip_format">Neplatný formát ZIP souboru!</string>
 		<string name="fail_sysmap">Nelze namapovat soubor \'{1}\'</string>
-		<string name="verify_zip_sig">Ověřování podpisu zip souboru...</string>
-		<string name="verify_zip_fail">Ověřování podpisu zip souboru selhalo!</string>
-		<string name="verify_zip_done">Podpis souboru zip úspešně ověřený.</string>
-		<string name="zip_corrupt">Soubor zip je poškozený!</string>
+		<string name="verify_zip_sig">Ověřování podpisu ZIP souboru...</string>
+		<string name="verify_zip_fail">Ověřování podpisu ZIP souboru selhalo!</string>
+		<string name="verify_zip_done">Podpis souboru ZIP úspešně ověřen.</string>
+		<string name="zip_corrupt">Soubor ZIP je poškozený!</string>
 		<string name="no_digest" version="2">Vynechání kontroly Digest: soubor s Digest nenalezen</string>
-		<string name="digest_fail" version="2">Digest nesedí</string>
-		<string name="digest_match" version="2">Digest sedí</string>
+		<string name="digest_fail" version="2">Digest nesouhlasí</string>
+		<string name="digest_match" version="2">Digest souhlasí</string>
 		<string name="pid_signal">Proces {1} skončil se signálem: {2}</string>
 		<string name="pid_error">Proces {1} skončil s CHYBOU: {2}</string>
 		<string name="install_dumlock">Instalování HTC Dumlock do systému...</string>
-		<string name="dumlock_restore">Obnovování původního bootu...</string>
-		<string name="dumlock_reflash">Zapisování recovery do bootu...</string>
-		<string name="run_script">Běh skriptu {1}...</string>
-		<string name="rename_stock">Přejmenovaný tuctový recovery soubor v /systém pro zabránění přepsání TWRP tuctovou ROM.</string>
+		<string name="dumlock_restore">Obnovování původního Bootu...</string>
+		<string name="dumlock_reflash">Zapisování Recovery do Bootu...</string>
+		<string name="run_script">Provádění skriptu {1}...</string>
+		<string name="rename_stock">Přejmenování souboru s tovární Recovery v /systém pro zabránění přepsání TWRP tovární ROM.</string>
 		<string name="split_backup">Rozdělení zálohy do více archívů...</string>
 		<string name="backup_error">Chyba při vytváření zálohy.</string>
 		<string name="restore_error">Chyba během procesu obnovy.</string>
 		<string name="split_thread">Rozdělení ID vlákna {1} do archívu {2}</string>
+		<!-- These 2 items are saved in the data manager instead of resource manager, so %llu, etc is correct instead of {1} -->
 		<string name="file_progress">%llu z %llu souborů, %i%%</string>
 		<string name="size_progress">%lluMB z %lluMB, %i%%</string>
-		<string name="decrypt_cmd">Pokus o dešifrování datového oddílu přez příkazový řádek.</string>
+		<string name="decrypt_cmd" version="2">Pokus o dešifrování datového oddílu přes příkazový řádek.</string>
 		<string name="base_pkg_err">Nepodařilo se načíst základní balíčky.</string>
 		<string name="simulating">Simulování akcí...</string>
 		<string name="backup_cancel">Zálohování přerušeno</string>
 		<string name="config_twrp">Konfigurování TWRP...</string>
 		<string name="config_twrp_err">Nelze konfigurovat TWRP s tímto jádrem.</string>
 		<string name="copy_log">Recovery log zkopírovaný do {1}.</string>
-		<string name="max_queue">Dosažený maximální počet zip v seznamu!</string>
-		<string name="min_queue">Dosažený minimální počet zip v seznamu!</string>
+		<string name="max_queue">Dosažený maximální počet ZIPů v seznamu!</string>
+		<string name="min_queue">Dosažený minimální počet ZIPů v seznamu!</string>
 		<string name="screenshot_saved">Snímek obrazovky byl uložen do {1}</string>
 		<string name="screenshot_err">Nelze udělat snímek obrazovky!</string>
-		<string name="zip_wipe_cache">Jeden nebo víc zip souborů vyžádalo smazaní cache -- Vymazání cache nyní.</string>
-		<string name="and_sec_wipe_err">Nelze vymazat android secure</string>
-		<string name="dalvik_wipe_err">Nelze vymazat dalvik</string>
-		<string name="auto_gen">(Generovat automaticky)</string>
+		<string name="zip_wipe_cache">Jeden nebo více ZIP souborů vyžádalo smazaní Cache -- Vymazat Cache nyní.</string>
+		<string name="and_sec_wipe_err">Nelze vymazat Android Secure</string>
+		<string name="dalvik_wipe_err">Nelze vymazat Dalvik</string>
+		<string name="auto_gen">(Vytvořit automaticky)</string>
 		<string name="curr_date">(Aktuální datum)</string>
 		<string name="backup_name_len">Název zálohy je příliš dlouhý.</string>
 		<string name="backup_name_invalid">Název zálohy \'{1}\' obsahuje neplatný znak: \'{1}\'</string>
 		<string name="no_real_sdcard">Toto zařízení nemá skutečnou SD kartu! Přerušuji!</string>
 		<string name="cancel_sideload">Ruším ADB sideload...</string>
 		<string name="change_fs_err">Chyba při změně souborového systému.</string>
-		<string name="theme_ver_err">Téma vlastní verze nesedí s verzí TWRP. Použije se tuctové téma.</string>
+		<string name="theme_ver_err">Téma vlastní verze nesedí s verzí TWRP. Použije se výchozí téma.</string>
+		<string name="up_a_level">(O úroveň výš)</string>
+		<string name="install_reboot" version="2">Restartování do %tw_sleep% sekund(s)</string>
+		<string name="adbbackup_error">Chyba při ADB zálohování. Ukončuji..."</string>
+		<string name="adbbackup_control_error">Nelze zapisovat na ovládací kanál ADB</string>
+		<string name="twrp_adbbu_option">--nutné pro povolení TWRP ADB zálohování</string>
+		<string name="partition_not_found">cesta: {1} nebyl nalezen v seznamu oddílů</string>
+		<string name="copy_kernel_log">Log kernelu zkopírován do {1}</string>
+		<string name="copy_logcat">Zkopírován logcat do {1}</string>
+		<string name="include_kernel_log">Zahrnout Log kernelu</string>
+		<string name="include_logcat">Zahrnout Logcat</string>
+		<string name="sha2_chk">Pro hashování použijte SHA2</string>
+		<string name="unable_set_boot_slot">Chyba při změně spouštěcího slotu bootloaderu na {1}</string>
+		<string name="unmount_sys_install">Opojit Systém před instalací ZIPu</string>
+		<string name="unmount_system">Odpojování Systému...</string>
+		<string name="unmount_system_err">Odpojení Systému se nezdařilo</string>
+		<string name="flash_ab_inactive">Instalace A/B ZIPu do neaktivního slotu: {1}</string>
+		<string name="flash_ab_reboot">Chcete-li instalovat další ZIPy, restartujte TWRP a přepněte na aktualizovaný slot.</string>
+		<string name="flash_ab_both_slots">Instalace do obou slotů</string>
+		<string name="ozip_decrypt_decryption">Spouštění Ozip dešifrování...</string>
+		<string name="ozip_decrypt_finish">Ozip dešifrování dokončeno!</string>
+		<string name="fastboot_button">Fastboot</string>
+		<string name="enable_adb">Povolit ADB</string>
+		<string name="enable_fastboot">Povolit Fastboot</string>
+		<string name="fastboot_console_msg">Přepínání do Fastboot režimu...</string>
+		<string name="data_media_fbe_msg">TWRP znovu nevytvoří /data/media na zařízení FBE. Restartujte do své rom a vytvořte /data/media</string>
+		<!-- Android Rescue Party trigger -->
+		<string name="rescue_party0">Spouštění záchrany (Android Rescue Party)! Možné řešení? Buď:</string>
+		<string name="rescue_party1"> 1. Smazat Cache, a/nebo</string>
+		<string name="rescue_party2"> 2. Formátovat Data, a/nebo</string>
+		<string name="rescue_party3"> 3. Čistá instalace ROM.</string>
+		<string name="rescue_party4">Hlášeny problem je: </string>
+		<string name="restore_system_context">Nelze získat výchozí kontext pro {1} -- Android se nemusí spustit.</string>
+		<string name="change_twrp_folder_after_process">TWRP složka změněna na</string>
+		<string name="change_twrp_folder_btn">Změna TWRP složky</string>
+		<string name="change_twrp_folder_on_process">Měnění TWRP složky</string>
+		<string name="tw_folder_exists">Složka s tímto názvem již existuje!</string>
+		<string name="unmap_super_devices">Zrušit mapování super zařízení</string>
+		<string name="unmap_super_devices_confirm">Zrušit mapování všech super zařízení?</string>
+		<string name="unmapping_super_devices">Rušení mapování super zařízení...</string>
+		<string name="unmap_super_devices_complete">Zrušena mapování všech super zařízení</string>
+		<string name="remove_dynamic_groups">Rušení mapování super zařízení...</string>
+		<string name="remove_dynamic_groups_complete">Zrušena mapování všech super zařízení</string>
+		<string name="remove_dynamic_groups_confirm">Zrušit mapování všech super zařízení?</string>
+		<string name="mount_vab_partitions">Zařízení se super oddílem se mohou připojit až po obnovení restartem.</string>
+		<string name="merge_snapshots_confirm">Sloučit snímky?</string>
+		<string name="merges_snapshots">Sloučit snímky</string>
+		<string name="merging_snapshots">Slučování snímků...</string>
+		<string name="merging_snapshots_complete">Sloučené snímky</string>
+		<string name="restore_pattern">Obnovit, přesto že je vzor povolen?</string>
+		<string name="restore_pin">Obnovit, přesto že je kód PIN povolen?</string>
+		<string name="restore_pin_password">Obnovit, přesto že je kód PIN/heslo povoleno?</string>
+		<string name="continue_restore_encrypted">Pokračovat v obnovení?</string>
+		<string name="restore_with_pattern1">Vzor je povolen</string>
+		<string name="restore_with_pattern2">Vzor by měl být před obnovením vypnut</string>
+		<string name="restore_with_pin1">Kód PIN je povolen</string>
+		<string name="restore_with_pin2">PIN by měl být před obnovením vypnut</string>
+		<string name="restore_with_pin_password1">PIN/heslo je povoleno</string>
+		<string name="restore_with_pin_password2">PIN/heslo by mělo být před obnovením vypnuto</string>
+		<string name="reboot_after_restore">Po prvním spuštění se doporučuje jednou restartovat Android.</string>
 	</resources>
 </language>
diff --git a/gui/theme/common/languages/pl.xml b/gui/theme/common/languages/pl.xml
index 697a7c41..469b0372 100644
--- a/gui/theme/common/languages/pl.xml
+++ b/gui/theme/common/languages/pl.xml
@@ -19,6 +19,7 @@
 		<string name="recovery">Recovery</string>
 		<string name="cache">Cache</string>
 		<string name="data">Data</string>
+		<string name="data_backup">Data (bez pamięci wewn.)</string>
 		<string name="sdcard">Karta SD</string>
 		<string name="internal">Pamięć Wewnętrzna</string>
 		<string name="microsd">Karta Micro SD</string>
@@ -29,6 +30,7 @@
 		<string name="sdext">SD-EXT</string>
 		<string name="adopted_data">Adopted Data</string>
 		<string name="adopted_storage">Adopted Storage</string>
+		<string name="autostorage">Pamięć</string>
 
 		<!-- GUI XML strings -->
 		<string name="twrp_header">Projekt Team Win Recovery</string>
@@ -97,6 +99,7 @@
 		<string name="install_failed">Instalacja nieudana</string>
 		<string name="install_successful">Instalacja zakończona pomyślnie</string>
 		<string name="wipe_cache_dalvik_btn">Wyczyść Cache/Dalvik</string>
+		<string name="wipe_dalvik_btn">Wyczyść Dalvik</string>
 		<string name="reboot_system_btn">Uruchom System</string>
 		<string name="install_sel_target">Wybierz partycję docelową</string>
 		<string name="flash_image_select">Wybierz partycję do zainstalowania obrazu:</string>
@@ -104,8 +107,10 @@
 		<string name="flashing_image">Instalowanie obrazu...</string>
 		<string name="image_flashed">Obraz zainstalowany</string>
 		<string name="wipe_cache_dalvik_confirm">Wyczyścić Cache &amp; Dalvik?</string>
+		<string name="wipe_dalvik_confirm">Wyczyścić Dalvik?</string>
 		<string name="wiping_cache_dalvik">Czyszczenie Cache &amp; Dalvik...</string>
 		<string name="wipe_cache_dalvik_complete">Czyszczenie Cache &amp; Dalvik zakończone</string>
+		<string name="wipe_dalvik_complete">Czyszczenie Dalvik zakończone</string>
 		<string name="swipe_wipe">Przesuń, aby wyczyścić</string>
 		<string name="swipe_wipe_s">   Wyczyść</string>
 		<string name="no_os1">Brak zainstalowanego systemu! Jesteś</string>
@@ -114,6 +119,17 @@
 		<string name="rebooting">Restartowanie...</string>
 		<string name="swipe_reboot">Przesuń, aby zrestartować</string>
 		<string name="swipe_reboot_s">   Zrestartuj</string>
+		<string name="reboot_install_app_hdr">Zainstaluj aplikację TWRP</string>
+		<string name="reboot_install_app1">Czy chcesz zainstalować oficjalną aplikację TWRP?</string>
+		<string name="reboot_install_app2">Aplikacja może sprawdzać dostępność nowych wydań TWRP.</string>
+		<string name="reboot_install_app_prompt_install">Informuj o możliwości instalacji aplikacji TWRP, jeśli jej nie zainstalowano</string>
+		<string name="reboot_install_app_system">Zainstaluj jako systemową</string>
+		<string name="reboot_installing_app">Instalowanie aplikacji...</string>
+		<string name="swipe_to_install_app">Przesuń, aby zainstalować aplikację TWRP</string>
+		<string name="uninstall_twrp_system_app">Odinstaluj aplikację TWRP z systemu</string>
+		<string name="uninstall_twrp_system_app_confirm">Odinstalować aplikację TWRP z systemu?</string>
+		<string name="uninstalling_twrp_system_app">Dezinstalacja aplikacji TWRP z systemu...</string>
+		<string name="uninstall_twrp_system_app_complete">Dezinstalacja aplikacji TWRP ukończona</string>
 		<string name="swipe_flash">Przesuń, aby zainstalować</string>
 		<string name="confirm_action">Potwierdź czynność</string>
 		<string name="back_cancel">Naciśnij wstecz, aby anulować.</string>
@@ -125,6 +141,7 @@
 		<string name="factory_reset2">(nie czyści pamięci wewnętrznej)</string>
 		<string name="factory_reset3">W większości przypadków jest to</string>
 		<string name="factory_reset4">jedyne czyszczenie jakiego potrzebujesz.</string>
+		<string name="factory_reset5">(nie czyści użytkowników/ekranu blokady)</string>
 		<string name="factory_resetting">Przywracanie ustawień fabrycznych...</string>
 		<string name="advanced_wipe_hdr">Zaawansowane czyszczenie</string>
 		<string name="advanced_wipe_btn">Zaaw. czyszczenie</string>
@@ -208,7 +225,13 @@
 		<string name="enc_enabled">włączone</string>
 		<string name="enable_backup_comp_chk">Włącz kompresję</string>
 		<string name="skip_digest_backup_chk" version="2">Pomiń generowanie Digest kopii zapasowej</string>
-		<string name="disable_backup_space_chk">Wyłącz sprawdzanie wolnego miejsca</string>
+		<string name="disable_backup_space_chk" version="2">Wyłącz sprawdzanie wolnego miejsca</string>
+		<string name="skip_digest_zip_chk">Pomiń sprawdzanie Digest przed instalacją pliku zip</string>
+		<string name="current_boot_slot">Obecny slot: %tw_active_slot%</string>
+		<string name="boot_slot_a">Slot A</string>
+		<string name="boot_slot_b">Slot B</string>
+		<string name="changing_boot_slot">Zmiana slotu uruchamiania</string>
+		<string name="changing_boot_slot_complete">Zmiana slotu uruchamiania ukończona</string>
 		<string name="refresh_sizes_btn">Odśwież rozmiary</string>
 		<string name="swipe_backup">Przesuń, aby wykonać kopię</string>
 		<string name="append_date_btn">Dodaj datę</string>
@@ -294,6 +317,7 @@
 		<string name="settings_gen_s_hdr">Główne</string>
 		<string name="settings_gen_btn">Główne</string>
 		<string name="use_rmrf_chk">Używaj rm -rf zamiast formatowania</string>
+		<string name="auto_reflashtwrp_chk">Automatycznie wgrywaj TWRP po wgraniu ROM-u</string>
 		<string name="use24clock_chk">Użyj 24-godzinnego zegara</string>
 		<string name="rev_navbar_chk">Odwrócony układ paska nawigacji</string>
 		<string name="simact_chk">Symuluj akcje do testowania motywów</string>
@@ -305,6 +329,7 @@
 		<string name="settings_tz_btn">Strefa czasowa</string>
 		<string name="settings_screen_btn">Ekran</string>
 		<string name="settings_screen_bright_btn">Jasność ekranu</string>
+		<string name="vibration_disabled">Wibracje są wyłączone na tym urządzeniu</string>
 		<string name="settings_vibration_btn">Wibracje</string>
 		<string name="settings_language_btn">Język</string>
 		<string name="time_zone_hdr">Strefa czasowa</string>
@@ -365,8 +390,8 @@
 		<string name="set_language_btn">Wybierz język</string>
 		<string name="advanced_hdr">Zaawansowane</string>
 		<string name="copy_log_confirm">Skopiować log na kartę SD?</string>
-		<string name="copying_log">Kopiowanie pliku log na kartę SD...</string>
-		<string name="copy_log_complete">Kopiowanie pliku log zakończone</string>
+		<string name="copying_log" version="2">Kopiowanie pliku log na kartę SD...</string>
+		<string name="copy_log_complete" version="2">Kopiowanie pliku log zakończone</string>
 		<string name="fix_context_btn">Uprawnienia</string>
 		<string name="part_sd_btn">Partycjonowanie</string>
 		<string name="part_sd_s_btn">Karta SD</string>
@@ -436,12 +461,15 @@
 		<string name="fm_set_perms_hdr">Ustaw uprawnienia</string>
 		<string name="fm_perms">Uprawnienia:</string>
 		<string name="fm_complete">Działanie na plikach zakończone</string>
+		<string name="fm_open_terminal_btn">Otwórz tu terminal</string>
+		<string name="fm_edit_file">Edytuj plik</string>
 		<string name="decrypt_data_hdr">Deszyfrowanie danych</string>
 		<string name="decrypt_data_enter_pass">Wprowadź hasło.</string>
 		<string name="decrypt_data_failed">Hasło nieprawidłowe, spróbuj ponownie!</string>
 		<string name="decrypt_data_failed_pattern">Wzór nieprawidłowy, spróbuj ponownie!</string>
 		<string name="decrypt_data_enter_pattern">Wprowadź wzór.</string>
 		<string name="decrypt_data_trying">Próbuję rozszyfrować</string>
+		<string name="decrypt_data_vold_os_missing">Brakuje plików niezbędnych do zdeszyfrowania vold: {1}</string>
 		<string name="term_hdr">Polecenia Terminala</string>
 		<string name="term_s_hdr">Terminal</string>
 		<string name="term_kill_btn">ZABIJ</string>
@@ -466,6 +494,48 @@
 		<string name="install_cancel">Nie instaluj</string>
 		<string name="sel_storage_list">Wybierz pamięć</string>
 		<string name="ok_btn">OK</string>
+		<string name="install_twrp_ramdisk">Instaluj Ramdisk Recovery</string>
+		<string name="install_kernel">Instaluj Kernel</string>
+		<string name="repack_kernel_confirm_hdr">Instalacja Kernel</string>
+		<string name="repack_ramdisk_confirm_hdr">Instalacja Recovery</string>
+		<string name="repack_kernel_confirm">Zainstalować Kernel?</string>
+		<string name="repack_ramdisk_confirm">Zainstalować Recovery?</string>
+		<string name="repack_backup_first">Najpierw wykonaj kopię obecnego obrazu</string>
+		<string name="repack">Przepakuj</string>
+		<string name="swipe_to_install">Przesuń, aby zainstalować</string>
+		<string name="installing">Instalacja...</string>
+		<string name="install_complete">Instalacja ukończona</string>
+		<string name="unpack_error">Błąd przy rozpakowywaniu obrazu.</string>
+		<string name="repack_error">Błąd przy przepakowywaniu obrazu.</string>
+		<string name="modified_ramdisk_error">pliki ramdisku zostały zmodyfikowane, nie można utworzyć ramdisku do wgrania, uruchom twrp w trybie fastboot i ponów tę operację lub użyj opcji Instaluj Ramdisk Recovery.</string>
+		<string name="create_ramdisk_error">nie udało się utworzyć ramdisku do wgrania.</string>
+		<string name="unpacking_image">Rozpakowywanie {1}...</string>
+		<string name="repacking_image">Przepakowywanie {1}...</string>
+		<string name="repack_image_hdr">Wybierz obraz</string>
+		<string name="repack_overwrite_warning">Jeśli urządzenie zostało przedtem zrootowane, root zniknie i trzeba będzie zainstalować go ponownie.</string>
+		<string name="reflash_twrp">Wgraj Obecne TWRP</string>
+		<string name="reflash_twrp_confirm">Wgrać obecne TWRP?</string>
+		<string name="reflashing_twrp">Wgrywanie TWRP...</string>
+		<string name="reflash_twrp_complete">Ukończono wgrywanie TWRP</string>
+		<string name="fix_recovery_loop">Napraw Bootloop Recovery</string>
+		<string name="fix_recovery_loop_confirm">Naprawić bootloop recovery?</string>
+		<string name="fixing_recovery_loop">Naprawianie bootloopa Recovery...</string>
+		<string name="fix_recovery_loop_complete">Ukończono naprawianie bootloopa Recovery</string>
+		<string name="fixing_recovery_loop_patch">Patchowanie kernela...</string>
+		<string name="fix_recovery_loop_patch_error">Błąd przy patchowaniu kernela.</string>
+		<string name="decrypt_users">Deszyfruj użytkowników</string>
+		<string name="decrypt_users_selection">Wybierz ID użytkownika do zdeszyfrowania</string>
+		<string name="select_user">Wybierz użytkownika</string>
+		<string name="backup_storage_undecrypt_warning">Kopia zapasowa nie będzie zawierać pewnych plików użytkownika {1}, ponieważ nie jest on odszyfrowany.</string>
+		<string name="decrypting_user_fbe">Próba zdeszyfrowania FBE dla użytkownika {1}...</string>
+		<string name="decrypt_user_success_fbe">Pomyślnie zdeszyfrowano użytkownika {1}</string>
+		<string name="decrypt_user_fail_fbe">Nie udało się zdeszyfrować użytkownika {1}</string>
+		<string name="decrypt_data_enter_pass_fbe">Wprowadź hasło dla użytkownika [%tw_crypto_user_id%]</string>
+		<string name="decrypt_data_enter_pattern_fbe">Wprowadź wzór dla użytkownika [%tw_crypto_user_id%]</string>
+		<string name="multiuser_warning1">Nie wszyscy użytkownicy są zdeszyfrowani!</string>
+		<string name="multiuser_warning2">Operacje tworzenia kopii zapasowej lub jej przywrócenia mogą się nie powieść!</string>
+		<string name="multiuser_warning_accept">Kontynuuj mimo to</string>
+		<string name="multiuser_warning_hdr">Ostrzeżenie dot. wielu użytkowników</string>
 
 		<!-- Various console messages - these consist of user displayed messages, oftentimes errors -->
 		<string name="no_kernel_selinux">Kernel nie posiada obsługi odczytu uprawnień SELinux.</string>
@@ -519,6 +589,7 @@
 		<string name="update_part_details_done">...ukończono</string>
 		<string name="wiping_dalvik">Czyszczenie katalogów Dalvik Cache...</string>
 		<string name="cleaned">Wyczyszczono: {1}...</string>
+		<string name="cache_dalvik_done">-- Czyszczenie katalogów Dalvik Cache zakończone!</string>
 		<string name="dalvik_done">-- Czyszczenie Dalvik Cache zakończone!</string>
 		<string name="no_andsec">Nie znaleziono partycji android_secure.</string>
 		<string name="unable_to_locate">Nie można zlokalizować {1}.</string>
@@ -529,6 +600,7 @@
 		<string name="fail_decrypt">Niepowodzenie rozszyfrowywania danych.</string>
 		<string name="no_crypto_support">Brak obsługi crypto w tej kompilacji.</string>
 		<string name="decrypt_success_dev">Dane pomyślnie rozszyfrowane, nowe urządzenie blokowe: '{1}'</string>
+		<string name="decrypt_success_nodev">Dane pomyślnie rozszyfrowane</string>
 		<string name="done">Ukończono.</string>
 		<string name="start_partition_sd">Partycjonowanie Karty SD...</string>
 		<string name="partition_sd_locate">Nie można zlokalizować urządzenia do partycjonowania.</string>
@@ -568,7 +640,7 @@
 		<string name="digest_fail_match" version="2">Digest nie pasuje do '{1}'.</string>
 		<string name="digest_matched" version="2">Digest matched for '{1}'.</string>
 		<string name="fail_decrypt_tar">Nie udało się odszyfrować pliku tar '{1}'</string>
-		<string name="format_data_msg">Może być konieczne ponowne uruchomienie recovery, aby móc ponownie użyć /date.</string>
+		<string name="format_data_msg">Może być konieczne ponowne uruchomienie recovery, aby móc ponownie użyć /data.</string>
 		<string name="format_data_err">Nie można sformatować, aby usunąć szyfrowanie.</string>
 		<string name="formatting_using">Formatowanie {1} przy użyciu {2}...</string>
 		<string name="unable_to_wipe">Nie można wyczyścić {1}.</string>
@@ -576,6 +648,7 @@
 		<string name="remove_all">Usuwanie wszystkich plików w '{1}'</string>
 		<string name="wiping_data">Czyszczenie Data bez /data/media ...</string>
 		<string name="backing_up">Tworzenie kopii zapasowej {1}...</string>
+		<string name="backup_storage_warning">Kopie zapasowe {1} nie zawierają plików z pamięci wewnętrznej, takich jak zdjęcia czy pobrane elementy.</string>
 		<string name="backing">Tworzenie kopii zapasowej</string>
 		<string name="backup_size">Rozmiar kopii zapasowej '{1}' to 0 bajtów.</string>
 		<string name="datamedia_fs_restore">UWAGA: Ta kopia /data została wykonana w sytemie plików {1}! Kopia może się nie uruchomić jeśli nie wrócisz do {1}.</string>
@@ -617,6 +690,7 @@
 		<string name="ors_complete">Ukończono Skrypt OpenRecovery</string>
 		<string name="no_updater_binary">Nie można znaleźć '{1}' w pliku zip.</string>
 		<string name="check_for_digest" version="2">Sprawdzanie pliku Digest...</string>
+		<string name="invalid_zip_format">Nieprawidłowy format pliku zip!</string>
 		<string name="fail_sysmap">Nieudane mapowanie pliku '{1}'</string>
 		<string name="verify_zip_sig">Weryfikowanie sygnatury pliku zip...</string>
 		<string name="verify_zip_fail">Niewłaściwa sygnatura pliku zip!</string>
@@ -639,7 +713,7 @@
 		<!-- These 2 items are saved in the data manager instead of resource manager, so %llu, etc is correct instead of {1} -->
 		<string name="file_progress">%llu z %llu plików, %i%%</string>
 		<string name="size_progress">%lluMB z %lluMB, %i%%</string>
-		<string name="decrypt_cmd">Próba odszyfrowania partycji danych poprzez linię poleceń.</string>
+		<string name="decrypt_cmd" version="2">Próba odszyfrowania partycji danych poprzez linię poleceń.</string>
 		<string name="base_pkg_err">Nie udało się załadować pakietów podstawowych.</string>
 		<string name="simulating">Symulowanie działań...</string>
 		<string name="backup_cancel">Anulowano wykonywanie kopii zapasowej</string>
@@ -662,6 +736,63 @@
 		<string name="change_fs_err">Niepowodzenie zmiany systemu plików.</string>
 		<string name="theme_ver_err">Wersja niestandardowego motywu nie zgadza się z wersją TWRP. Użyto domyślnego motywu.</string>
 		<string name="up_a_level">(Cofnij)</string>
-		<string name="install_reboot">Ponowne uruchomienie za 5 sekund</string>
+		<string name="install_reboot" version="2">Ponowne uruchomienie za %tw_sleep% sekund</string>
+		<string name="adbbackup_error">Błąd z ADB Backup. Kończenie..."</string>
+		<string name="adbbackup_control_error">Nie można zapisać do kanału kontroli adb</string>
+		<string name="twrp_adbbu_option">parametr --twrp jest wymagany, aby włączyć kopię zapasową adb twrp</string>
+		<string name="partition_not_found">ścieżka: {1} nieznaleziona na liście partycji</string>
+		<string name="copy_kernel_log">Skopiowano log kernela do {1}</string>
+		<string name="copy_logcat">Skopiowano logcat do {1}</string>
+		<string name="include_kernel_log">Skopiuj log kernela</string>
+		<string name="include_logcat">Skopiuj logcat</string>
+		<string name="sha2_chk">Użyj SHA2 do haszowania</string>
+		<string name="unable_set_boot_slot">Błąd przy zmienianiu slotu bootowania bootloadera na {1}</string>
+		<string name="unmount_sys_install">Odmontuj /system przed instalacją pliku ZIP</string>
+		<string name="unmount_system">Odmontowywanie /system...</string>
+		<string name="unmount_system_err">Błąd przy odmontowywaniu /system</string>
+		<string name="flash_ab_inactive">Wgrywanie pliku zip A/B do nieaktywnego slotu: {1}</string>
+		<string name="flash_ab_reboot">Aby wgrać dodatkowe pliki zip, uruchom ponownie recovery w celu przejścia na zaktualizowany slot.</string>
+		<string name="flash_ab_both_slots">Wgraj na oba sloty</string>
+		<string name="ozip_decrypt_decryption">Rozpoczynanie deszyfrowania Ozip...</string>
+		<string name="ozip_decrypt_finish">Deszyfrowanie Ozip zakończone!</string>
+		<string name="fastboot_button">Fastboot</string>
+		<string name="enable_adb">Włącz ADB</string>
+		<string name="enable_fastboot">Włącz Fastboot</string>
+		<string name="fastboot_console_msg">Jesteś w trybie Fastboot...</string>
+		<string name="data_media_fbe_msg">TWRP nie utworzy ponownie katalogu /data/media na urządzeniu z FBE. Uruchom swój ROM, aby utworzyć /data/media</string>
+		<!-- Android Rescue Party trigger -->
+		<string name="rescue_party0">Wywołano Android Rescue Party! Co może pomóc? Spróbuj:</string>
+		<string name="rescue_party1"> 1. wyczyścić cache i/lub</string>
+		<string name="rescue_party2"> 2. sformatować partycję /data i/lub</string>
+		<string name="rescue_party3"> 3. wgrać ROM z czyszczeniem danych.</string>
+		<string name="rescue_party4">Zgłoszony problem: </string>
+		<string name="restore_system_context">Nie można uzyskać domyślnego kontekstu dla {1} -- Android może się nie uruchomić.</string>
+		<string name="change_twrp_folder_btn">Zmień folder TWRP</string>
+		<string name="change_twrp_folder_on_process">Zmienianie folderu TWRP</string>
+		<string name="change_twrp_folder_after_process">Folder TWRP zmieniony na</string>
+		<string name="tw_folder_exists">Folder o tej nazwie już istnieje!</string>
+		<string name="unmap_super_devices">Odmapuj urządzenia Super</string>
+		<string name="unmap_super_devices_confirm">Odmapować wszystkie urządzenia Super?</string>
+		<string name="unmapping_super_devices">Odmapowanie urządzeń Super...</string>
+		<string name="unmap_super_devices_complete">Odmapowano wszystkie urządzenia Super</string>
+		<string name="remove_dynamic_groups_confirm">Odmapować wszystkie urządzenia Super?</string>
+		<string name="remove_dynamic_groups">Odmapowywanie urządzeń Super...</string>
+		<string name="remove_dynamic_groups_complete">Odmapowano wszystkie urządzenia Super</string>
+		<string name="mount_vab_partitions">Urządzenia na partycji /super mogą nie zostać zamontowane do momentu ponownego uruchomienia recovery.</string>
+		<string name="merges_snapshots">Połącz migawki</string>
+		<string name="merge_snapshots_confirm">Połączyć migawki?</string>
+		<string name="merging_snapshots">Łączenie migawek...</string>
+		<string name="merging_snapshots_complete">Złączono migawki</string>
+		<string name="restore_pin_password">Przywrócić z włączonym PIN-em/hasłem?</string>
+		<string name="restore_pattern">Przywrócić z włączonym wzorem?</string>
+		<string name="restore_pin">Przywrócić z włączonym PIN-em?</string>
+		<string name="continue_restore_encrypted">Kontynuować przywracanie?</string>
+		<string name="restore_with_pin_password1">Włączony PIN/hasło</string>
+		<string name="restore_with_pin_password2">PIN/hasło powinny być wyłączone przed rozpoczęciem przywracania</string>
+		<string name="restore_with_pin1">PIN jest włączony</string>
+		<string name="restore_with_pin2">PIN powinien być wyłączony przed rozpoczęciem przywracania</string>
+		<string name="restore_with_pattern1">Wzór jest włączony</string>
+		<string name="restore_with_pattern2">Wzór powinien być wyłączony przed rozpoczęciem przywracania</string>
+		<string name="reboot_after_restore">Po pierwszym uruchomieniu Androida zaleca się jednorazowo ponownie uruchomić urządzenie.</string>
 	</resources>
 </language>
diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml
index efe1285a..019acf55 100755
--- a/gui/theme/common/portrait.xml
+++ b/gui/theme/common/portrait.xml
@@ -3980,7 +3980,7 @@
 					</actions>
 				</listitem>
 				<listitem name="{@unmap_super_devices=Unmap Super Devices}">
-					<condition var1="tw_virtual_ab.enabled" op="=" var2="1"/>
+					<condition var1="tw_is_super" op="=" var2="1"/>
 					<actions>
 						<action function="set">tw_back=advanced</action>
 						<action function="set">tw_action=unmapsuperdevices</action>
diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index c32fc1b8..ce84443d 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -4467,7 +4467,7 @@
 					</actions>
 				</listitem>
 				<listitem name="{@unmap_super_devices=Unmap Super Devices}">
-					<condition var1="tw_virtual_ab.enabled" op="=" var2="1"/>
+					<condition var1="tw_is_super" op="=" var2="1"/>
 					<actions>
 						<action function="set">tw_back=advanced</action>
 						<action function="set">tw_action=unmapsuperdevices</action>
diff --git a/gui/theme/extra-languages/languages/zh_TW.xml b/gui/theme/extra-languages/languages/zh_TW.xml
index df120d49..05463d73 100644
--- a/gui/theme/extra-languages/languages/zh_TW.xml
+++ b/gui/theme/extra-languages/languages/zh_TW.xml
@@ -12,25 +12,25 @@
 
 		<!-- Partition display names -->
 		<string name="system">System</string>
-		<string name="system_image">System 鏡像</string>
+		<string name="system_image">System 映像</string>
 		<string name="vendor">Vendor</string>
-		<string name="vendor_image">Vendor 鏡像</string>
+		<string name="vendor_image">Vendor 映像</string>
 		<string name="boot">Boot</string>
 		<string name="recovery">Recovery</string>
 		<string name="cache">Cache</string>
 		<string name="data">Data</string>
-		<string name="data_backup">Data（不包含存儲）</string>
+		<string name="data_backup">Data（不包含儲存空間）</string>
 		<string name="sdcard">SDCard</string>
-		<string name="internal">內置存儲</string>
+		<string name="internal">內建儲存空間</string>
 		<string name="microsd">SD 卡</string>
-		<string name="usbotg">外置 U 盤</string>
+		<string name="usbotg">外接式隨身碟</string>
 		<string name="android_secure">Android Secure</string>
 		<string name="dalvik">Dalvik / ART Cache</string>
 		<!-- This is a rarely used partition on a Micro SD card for a very old app2sd system -->
 		<string name="sdext">SD-EXT</string>
 		<string name="adopted_data">Adopted Data</string>
-		<string name="adopted_storage">Adopted 存儲</string>
-		<string name="autostorage">存儲</string>
+		<string name="adopted_storage">內部儲存（延伸）空間</string>
+		<string name="autostorage">儲存空間</string>
 
 		<!-- GUI XML strings -->
 		<string name="twrp_header">Team Win Recovery Project</string>
@@ -43,12 +43,12 @@
 		<string name="sort_by_name_only">名稱</string>
 		<string name="sort_by_date_only">日期</string>
 		<string name="sort_by_size_only">大小</string>
-		<string name="tab_general">常規</string>
+		<string name="tab_general">一般</string>
 		<string name="tab_options">選項</string>
 		<string name="tab_backup">備份</string>
 		<string name="tab_time_zone">時區</string>
 		<string name="tab_screen">螢幕</string>
-		<string name="tab_vibration">振動</string>
+		<string name="tab_vibration">震動</string>
 		<string name="tab_language">語言</string>
 
 		<string name="install_btn">安裝</string>
@@ -56,41 +56,41 @@
 		<string name="backup_btn">備份</string>
 		<string name="restore_btn">恢復</string>
 		<string name="mount_btn">掛載</string>
-		<string name="settings_btn">設置</string>
-		<string name="advanced_btn">高級</string>
-		<string name="reboot_btn">重啟</string>
+		<string name="settings_btn">設定</string>
+		<string name="advanced_btn">進階</string>
+		<string name="reboot_btn">重新啟動</string>
 		<string name="files_btn">檔案</string>
-		<string name="copy_log_btn">導出日誌</string>
+		<string name="copy_log_btn">匯出日誌</string>
 		<string name="select_type_hdr">選擇類型</string>
-		<string name="install_zip_hdr">安裝 Zip 刷機包</string>
+		<string name="install_zip_hdr">安裝 ZIP 刷機包</string>
 		<string name="install_zip_btn">安裝刷機包</string>
-		<string name="install_image_hdr">刷入 Image 鏡像</string>
-		<string name="install_image_btn">刷入鏡像</string>
+		<string name="install_image_hdr">刷入 Image 映像</string>
+		<string name="install_image_btn">刷入映像</string>
 		<string name="install_select_file_hdr">選擇檔案</string>
 		<string name="file_selector_folders_hdr">目錄</string>
 		<string name="select_file_from_storage">從 %tw_storage_display_name% (%tw_storage_free_size% MB) 中選擇檔案</string>
 		<string name="adb_sideload_btn">ADB Sideload</string>
 		<string name="install_hdr">安裝</string>
-		<string name="select_storage_hdr">存儲位置</string>
-		<string name="select_storage_btn">存儲位置</string>
+		<string name="select_storage_hdr">儲存位置</string>
+		<string name="select_storage_btn">儲存位置</string>
 		<string name="queue_hdr">佇列</string>
 		<string name="zip_queue_count">已選 %tw_zip_queue_count% 個檔案（最多 10 個）</string>
 		<string name="zip_queue_count_s">已選 %tw_zip_queue_count% 個，最多 10 個：</string>
-		<string name="zip_warn1">此操作可能會刷入不相容的固件，</string>
-		<string name="zip_warn2">致使您的設備變磚。</string>
-		<string name="zip_back_cancel">按返回按鈕取消添加此刷機包。</string>
+		<string name="zip_warn1">此操作可能會刷入不相容的韌體，</string>
+		<string name="zip_warn2">導致您的設備變磚。</string>
+		<string name="zip_back_cancel">按返回按鈕取消增加此刷機包。</string>
 		<string name="zip_back_clear">按返回按鈕清除刷機包刷入佇列。</string>
 		<string name="folder">目錄：</string>
 		<string name="file">檔案：</string>
 		<string name="zip_sig_chk">Zip 刷機包簽名校驗</string>
 		<string name="inject_twrp_chk">安裝完成後注入 TWRP</string>
-		<string name="install_reboot_chk">安裝完成後重啟</string>
+		<string name="install_reboot_chk">安裝完成後重新開機</string>
 		<string name="options_hdr">選項</string>
 		<string name="confirm_flash_hdr">確認刷入</string>
 		<string name="zip_queue">佇列：</string>
 		<string name="options">選項：</string>
 		<string name="swipe_confirm">   確認</string>
-		<string name="zip_add_btn">添加更多刷機包</string>
+		<string name="zip_add_btn">增加更多刷機包</string>
 		<string name="zip_clear_btn">清除刷機佇列</string>
 		<string name="install_zip_count_hdr">正在刷入第 %tw_zip_index% 個，共 %tw_zip_queue_count% 個</string>
 		<string name="installing_zip_xml">正在安裝: %tw_file%</string>
@@ -100,12 +100,12 @@
 		<string name="install_successful">安裝成功</string>
 		<string name="wipe_cache_dalvik_btn">清除 Cache/Dalvik</string>
 		<string name="wipe_dalvik_btn">清除 Dalvik</string>
-		<string name="reboot_system_btn">重啟系統</string>
-		<string name="install_sel_target">選擇目標分區</string>
-		<string name="flash_image_select">選擇要刷入鏡像的分區：</string>
-		<string name="target_partition">目標分區：</string>
-		<string name="flashing_image">正在刷入鏡像…</string>
-		<string name="image_flashed">鏡像已刷入。</string>
+		<string name="reboot_system_btn">重新開機至系統</string>
+		<string name="install_sel_target">選擇目標分割區</string>
+		<string name="flash_image_select">選擇要刷入映像的分割區：</string>
+		<string name="target_partition">目標分割區：</string>
+		<string name="flashing_image">正在刷入映像…</string>
+		<string name="image_flashed">映像已刷入。</string>
 		<string name="wipe_cache_dalvik_confirm">是否清除 Cache 和 Dalvik？</string>
 		<string name="wipe_dalvik_confirm">是否清除 Dalvik？</string>
 		<string name="wiping_cache_dalvik">正在清除 Cache 和 Dalvik…</string>
@@ -114,66 +114,66 @@
 		<string name="swipe_wipe">滑動滑塊確認清除</string>
 		<string name="swipe_wipe_s">   清除</string>
 		<string name="no_os1">沒有安裝任何系統！</string>
-		<string name="no_osrb">您確定要重啟？</string>
+		<string name="no_osrb">您確定要重新開機？</string>
 		<string name="no_ospo">您確定要關機？</string>
-		<string name="rebooting">正在重啟…</string>
-		<string name="swipe_reboot">滑動滑塊確認重啟</string>
-		<string name="swipe_reboot_s">   重啟</string>
-		<string name="reboot_install_app_hdr">安裝 TWRP 應用？</string>
-		<string name="reboot_install_app1">您希望安裝官方 TWRP 應用嗎？</string>
+		<string name="rebooting">正在重新開機…</string>
+		<string name="swipe_reboot">滑動滑塊確認重新開機</string>
+		<string name="swipe_reboot_s">   重新開機</string>
+		<string name="reboot_install_app_hdr">安裝 TWRP 應用程式？</string>
+		<string name="reboot_install_app1">您希望安裝官方 TWRP 應用程式嗎？</string>
 		<string name="reboot_install_app2">該應用可幫您檢查 TWRP 的最新版本。</string>
-		<string name="reboot_install_app_prompt_install">如果 TWRP 應用未安裝時提示我</string>
-		<string name="reboot_install_app_system">安裝為系統應用</string>
-		<string name="reboot_installing_app">正在安裝應用…</string>
-		<string name="swipe_to_install_app">滑動滑塊確認安裝</string>
-		<string name="uninstall_twrp_system_app">卸載 TWRP 應用</string>
-		<string name="uninstall_twrp_system_app_confirm">確認卸載 TWRP 應用？</string>
-		<string name="uninstalling_twrp_system_app">正在卸載 TWRP 應用…</string>
-		<string name="uninstall_twrp_system_app_complete">卸載 TWRP 應用完成</string>
-		<string name="swipe_flash">滑動滑塊確認刷入</string>
+		<string name="reboot_install_app_prompt_install">如果 TWRP 應用程式未安裝時提示我</string>
+		<string name="reboot_install_app_system">安裝為系統應用程式</string>
+		<string name="reboot_installing_app">正在安裝應用程式…</string>
+		<string name="swipe_to_install_app">滑動滑塊以確認安裝</string>
+		<string name="uninstall_twrp_system_app">解除安裝 TWRP 應用程式</string>
+		<string name="uninstall_twrp_system_app_confirm">確認解除安裝 TWRP 應用程式？</string>
+		<string name="uninstalling_twrp_system_app">正在解除安裝 TWRP 應用程式…</string>
+		<string name="uninstall_twrp_system_app_complete">解除安裝 TWRP 應用程式完成</string>
+		<string name="swipe_flash">滑動滑塊以確認刷入</string>
 		<string name="confirm_action">確認操作</string>
 		<string name="back_cancel">按返回按鈕取消。</string>
 		<string name="cancel_btn">取消</string>
 		<string name="wipe_hdr">清除</string>
-		<string name="factory_reset_hdr">恢復出廠設置（雙清）</string>
+		<string name="factory_reset_hdr">恢復出廠設定（雙清）</string>
 		<string name="factory_reset_btn">恢復出廠</string>
-		<string name="factory_reset1">這將會清空 Data、Cache 分區和 Dalvik 緩存</string>
-		<string name="factory_reset2">（不會清除內置存儲/sdcard）</string>
+		<string name="factory_reset1">這將會清空 Data、Cache 分割區和 Dalvik 快取</string>
+		<string name="factory_reset2">（不會清除內建儲存空間 /sdcard）</string>
 		<string name="factory_reset3">在大多數情況下，您只需要</string>
 		<string name="factory_reset4">執行此操作即可。</string>
-		<string name="factory_reset5">（不包括用戶/鎖屏）</string>
-		<string name="factory_resetting">正在恢復出廠設置…</string>
-		<string name="advanced_wipe_hdr">高級清除選項</string>
-		<string name="advanced_wipe_btn">高級清除</string>
-		<string name="wipe_enc_confirm">是否清除 Data 分區加密？</string>
-		<string name="formatting_data">正在格式化 Data 分區…</string>
+		<string name="factory_reset5">（不包括使用者/鎖定螢幕）</string>
+		<string name="factory_resetting">正在恢復出廠設定…</string>
+		<string name="advanced_wipe_hdr">進階清除選項</string>
+		<string name="advanced_wipe_btn">進階清除</string>
+		<string name="wipe_enc_confirm">是否清除 Data 分割區加密？</string>
+		<string name="formatting_data">正在格式化 Data 分割區…</string>
 		<string name="swipe_format_data">滑動滑塊確認格式化</string>
-		<string name="swipe_format_data_s">   格式化 Data 分區</string>
+		<string name="swipe_format_data_s">   格式化 Data 分割區</string>
 		<string name="factory_reset_complete">恢復出廠完成</string>
-		<string name="sel_part_hdr">選擇分區</string>
-		<string name="wipe_sel_confirm">是否清除所選的分區？</string>
-		<string name="wiping_part">正在清除分區…</string>
+		<string name="sel_part_hdr">選擇分割區</string>
+		<string name="wipe_sel_confirm">是否清除所選的分割區？</string>
+		<string name="wiping_part">正在清除分割區…</string>
 		<string name="wipe_complete">清除完成</string>
-		<string name="sel_part_wipe">選擇要清除的分區：</string>
-		<string name="invalid_part_sel">無效的分區</string>
-		<string name="format_data_hdr">格式化 Data 分區</string>
-		<string name="format_data_btn">格式化 Data 分區</string>
-		<string name="format_data_ptr1">格式化 Data 分區將會清空您安裝的所有</string>
-		<string name="format_data_ptr2">軟體、備份、图片、媒體，</string>
-		<string name="format_data_ptr3">以及對內置存儲所做的加密等。</string>
-		<string name="format_data_adopted">也包括 Adopted 存儲</string>
-		<string name="format_data_lcp1">格式化 Data 分區將會清空您安裝的所有軟體、備份、圖片、媒體，</string>
-		<string name="format_data_lcp2">以及對內置存儲所做的加密等。</string>
-		<string name="format_data_wtc1">格式化 Data 分區會清除您的所有軟體</string>
-		<string name="format_data_wtc2">備份和媒體數據，無法撤銷。</string>
+		<string name="sel_part_wipe">選擇要清除的分割區：</string>
+		<string name="invalid_part_sel">無效的分割區</string>
+		<string name="format_data_hdr">格式化 Data 分割區</string>
+		<string name="format_data_btn">格式化 Data 分割區</string>
+		<string name="format_data_ptr1">格式化 Data 分割區將會清空您安裝的所有</string>
+		<string name="format_data_ptr2">軟體、備份、圖片、媒體，</string>
+		<string name="format_data_ptr3">以及對內建儲存空間所做的加密等。</string>
+		<string name="format_data_adopted">也包括 內部儲存（延伸）空間</string>
+		<string name="format_data_lcp1">格式化 Data 分割區將會清空您安裝的所有軟體、備份、圖片、媒體，</string>
+		<string name="format_data_lcp2">以及對內建儲存空間所做的加密等。</string>
+		<string name="format_data_wtc1">格式化 Data 分割區會清除您的所有軟體</string>
+		<string name="format_data_wtc2">備份和媒體數據，無法取消。</string>
 		<string name="format_data_undo">執行此操作後將無法恢復。</string>
-		<string name="format_data_complete">格式化 Data 分區完成</string>
+		<string name="format_data_complete">格式化 Data 分割區完成</string>
 		<!-- Translator note: the word "yes" must remain English! -->
 		<string name="yes_continue">輸入 yes 繼續，按返回按鈕取消。</string>
-		<string name="part_opt_hdr">分區名: %tw_partition_name%</string>
+		<string name="part_opt_hdr">分割區名: %tw_partition_name%</string>
 		<string name="sel_act_hdr">選擇操作</string>
 		<string name="file_sys_opt">檔案系統選項</string>
-		<string name="partition">分區: %tw_partition_name%</string>
+		<string name="partition">分割區: %tw_partition_name%</string>
 		<string name="part_mount_point">掛載位置: %tw_partition_mount_point%</string>
 		<string name="part_curr_fs">檔案系統: %tw_partition_file_system%</string>
 		<string name="part_present_yes">當前：是</string>
@@ -182,7 +182,7 @@
 		<string name="part_removable_no">可移除：否</string>
 		<string name="part_size">大小: %tw_partition_size%MB</string>
 		<string name="part_used">已用: %tw_partition_used%MB</string>
-		<string name="part_free">空閒: %tw_partition_free%MB</string>
+		<string name="part_free">可用: %tw_partition_free%MB</string>
 		<string name="part_backup_size">備份大小: %tw_partition_backup_size%MB</string>
 		<string name="resize_btn">調整檔案系統</string>
 		<string name="resize_btn_s">調整</string>
@@ -200,9 +200,9 @@
 		<string name="swipe_repair_s">   修復</string>
 		<string name="change_fs_btn">更改檔案系統</string>
 		<string name="change_fs_btn_s">更改</string>
-		<string name="change_fs_for_hdr">要更改的分區: %tw_partition_name%</string>
-		<string name="change_fs_for_hdr_s">分區: %tw_partition_name%&gt;選擇檔案系統</string>
-		<string name="change_fs_warn1">一些固件或內核可能不支持</string>
+		<string name="change_fs_for_hdr">要更改的分割區: %tw_partition_name%</string>
+		<string name="change_fs_for_hdr_s">分割區: %tw_partition_name%&gt;選擇檔案系統</string>
+		<string name="change_fs_warn1">一些韌體或 Kernel 可能不支援</string>
 		<string name="change_fs_warn2">某些檔案系統，請謹慎！</string>
 		<string name="change_fs_confirm">是否更改 %tw_partition_name% 為：</string>
 		<string name="formatting">正在格式化…</string>
@@ -213,19 +213,19 @@
 		<string name="wipe_enc_btn">清除加密</string>
 		<string name="swipe_factory_reset">滑動滑塊確認恢復出廠</string>
 		<string name="repair_change_btn">修復或更改檔案系統</string>
-		<string name="storage_hdr">存儲位置: %tw_storage_display_name% (%tw_storage_free_size% MB)</string>
+		<string name="storage_hdr">儲存位置: %tw_storage_display_name% (%tw_storage_free_size% MB)</string>
 		<string name="backup_hdr">備份</string>
 		<string name="backup_confirm_hdr">確認備份</string>
 		<string name="encryption_tab">加密</string>
 		<string name="encryption">加密：</string>
 		<string name="name">名稱：</string>
-		<string name="sel_part_backup">選擇要備份的分區：</string>
+		<string name="sel_part_backup">選擇要備份的分割區：</string>
 		<string name="storage">儲存位置：</string>
-		<string name="enc_disabled">已禁用 - 設置密碼以啟用</string>
+		<string name="enc_disabled">已停用 - 設定密碼以啟用</string>
 		<string name="enc_enabled">已啟用</string>
 		<string name="enable_backup_comp_chk">啟用壓縮</string>
-		<string name="skip_digest_backup_chk" version="2">備份時跳過生成 Digest</string>
-		<string name="disable_backup_space_chk" version="2">在備份之前禁用剩餘空間檢查</string>
+		<string name="skip_digest_backup_chk" version="2">備份時跳過建立 Digest</string>
+		<string name="disable_backup_space_chk" version="2">在備份之前停用剩餘空間檢查</string>
 		<string name="current_boot_slot">當前槽位: %tw_active_slot%</string>
 		<string name="boot_slot_a">槽位 A</string>
 		<string name="boot_slot_b">槽位 B</string>
@@ -239,10 +239,10 @@
 		<string name="enter_pass">請輸入密碼：</string>
 		<string name="enter_pass2">請再輸入一遍：</string>
 		<string name="pass_not_match">密碼不匹配！</string>
-		<string name="partitions">分區：</string>
-		<string name="disabled">已禁用</string>
+		<string name="partitions">分割區：</string>
+		<string name="disabled">已停用</string>
 		<string name="enabled">已啟用</string>
-		<string name="backup_name_hdr">設置備份名稱</string>
+		<string name="backup_name_hdr">設定備份名稱</string>
 		<string name="progress">進度：</string>
 		<string name="backup_complete">備份完成</string>
 		<string name="restore_hdr">恢復</string>
@@ -261,32 +261,32 @@
 		<string name="restore_try_decrypt">加密的備份 - 嘗試解密</string>
 		<string name="restore_try_decrypt_s">正在嘗試解密</string>
 		<string name="restore_backup_date">備份於 %tw_restore_file_date%</string>
-		<string name="restore_sel_part">選擇要恢復的分區：</string>
+		<string name="restore_sel_part">選擇要恢復的分割區：</string>
 		<string name="restore_enable_digest_chk" version="2">啟用 Digest 校驗備份檔案</string>
 		<string name="restore_complete">恢復完成</string>
 		<string name="swipe_restore">滑動滑塊確認恢復</string>
 		<string name="swipe_restore_s">   恢復</string>
-		<string name="rename_backup_hdr">重命名備份</string>
-		<string name="rename_backup_confirm">是否重命名備份檔案？</string>
+		<string name="rename_backup_hdr">重新命名備份</string>
+		<string name="rename_backup_confirm">是否重新命名備份檔案？</string>
 		<string name="rename_backup_confirm2">此操作無法恢復！</string>
-		<string name="renaming_backup">正在重命名…</string>
-		<string name="rename_backup_complete">重命名完成</string>
-		<string name="swipe_to_rename">滑動滑塊確認重命名</string>
-		<string name="swipe_rename">   重命名</string>
+		<string name="renaming_backup">正在重新命名…</string>
+		<string name="rename_backup_complete">重新命名完成</string>
+		<string name="swipe_to_rename">滑動滑塊確認重新命名</string>
+		<string name="swipe_rename">   重新命名</string>
 		<string name="confirm_hdr">確認</string>
 		<string name="mount_hdr">掛載</string>
-		<string name="mount_sel_part">選擇要掛載的分區：</string>
-		<string name="mount_sys_ro_chk">掛載 System 分區為只讀</string>
+		<string name="mount_sel_part">選擇要掛載的分割區：</string>
+		<string name="mount_sys_ro_chk">掛載 System 分割區為只讀</string>
 		<string name="mount_sys_ro_s_chk">掛載 System 為只讀</string>
-		<string name="decrypt_data_btn">解密 Data 分區</string>
+		<string name="decrypt_data_btn">解密 Data 分割區</string>
 		<string name="disable_mtp_btn">啟用 MTP 模式</string>
 		<string name="enable_mtp_btn">停用 MTP 模式</string>
-		<string name="mount_usb_storage_btn">掛載 USB 存儲</string>
-		<string name="usb_storage_hdr">USB 存儲</string>
-		<string name="usb_stor_mnt1">已掛載 USB 存儲</string>
-		<string name="usb_stor_mnt2">請確認解除挂載前先從</string>
+		<string name="mount_usb_storage_btn">掛載 USB 儲存空間</string>
+		<string name="usb_storage_hdr">USB 儲存空間</string>
+		<string name="usb_stor_mnt1">已掛載 USB 儲存空間</string>
+		<string name="usb_stor_mnt2">請確認解除掛載前先從</string>
 		<string name="usb_stor_mnt3">電腦上安全地移除設備！</string>
-		<string name="unmount_btn">卸載</string>
+		<string name="unmount_btn">解除掛載</string>
 		<string name="rb_system_btn">系統</string>
 		<string name="rb_poweroff_btn">關機</string>
 		<string name="rb_recovery_btn">Recovery</string>
@@ -296,26 +296,26 @@
 		<string name="turning_off">正在關機…</string>
 		<string name="swipe_power_off">滑動滑塊確認關機</string>
 		<string name="swipe_power_off_s">關機</string>
-		<string name="sys_ro_hdr">未修改的 System 分區</string>
-		<string name="sys_ro_keep">是否保持系統分區為只讀？</string>
-		<string name="sys_rop1">TWRP 可以保持系統分區未修改狀態</string>
+		<string name="sys_ro_hdr">未修改的 System 分割區</string>
+		<string name="sys_ro_keep">是否保持系統分割區為只讀？</string>
+		<string name="sys_rop1">TWRP 可以保持系統分割區未修改狀態</string>
 		<string name="sys_rop2">使您更容易獲得官方的更新。</string>
-		<string name="sys_rop3">TWRP 將無法禁止原廠固件可能</string>
+		<string name="sys_rop3">TWRP 將無法禁止原廠韌體可能</string>
 		<string name="sys_rop4">替換 TWRP 並且不能 Root 您的設備。</string>
 		<string name="sys_rop5">安裝刷機包或者通過 adb 操作依然可以</string>
-		<string name="sys_rop6">修改系統分區。</string>
-		<string name="sys_rol1">TWRP 可以保持系統分區為未修改狀態，使您更容易獲得官方的更新。</string>
-		<string name="sys_rol2">TWRP 將無法禁止原廠固件替換 TWRP，並且不能 Root 您的設備。</string>
-		<string name="sys_rol3">安裝刷機包或者通過 adb 操作依然可以修改系統分區。</string>
+		<string name="sys_rop6">修改系統分割區。</string>
+		<string name="sys_rol1">TWRP 可以保持系統分割區為未修改狀態，使您更容易獲得官方的更新。</string>
+		<string name="sys_rol2">TWRP 將無法禁止原廠韌體替換 TWRP，並且不能 Root 您的設備。</string>
+		<string name="sys_rol3">安裝刷機包或者通過 adb 操作依然可以修改系統分割區。</string>
 		<string name="sys_ro_never_show_chk">下次啟動時不再顯示此介面</string>
 		<string name="sys_ro_keep_ro_btn">保持只讀</string>
 		<string name="swipe_allow_mod">滑動滑塊允許修改</string>
 		<string name="swipe_allow_mod_s">允許修改</string>
-		<string name="settings_hdr">設置</string>
-		<string name="settings_gen_hdr">常規</string>
-		<string name="settings_gen_s_hdr">常規</string>
-		<string name="settings_gen_btn">常規</string>
-		<string name="use_rmrf_chk">使用 rm -rf 命令代替格式化</string>
+		<string name="settings_hdr">設定</string>
+		<string name="settings_gen_hdr">一般</string>
+		<string name="settings_gen_s_hdr">一般</string>
+		<string name="settings_gen_btn">一般</string>
+		<string name="use_rmrf_chk">使用 rm -rf 指令代替格式化</string>
 		<string name="use24clock_chk">使用 24 小時制</string>
 		<string name="rev_navbar_chk">反轉底部按鈕佈局</string>
 		<string name="simact_chk">為測試主題使用模擬操作</string>
@@ -323,12 +323,12 @@
 		<string name="ctr_navbar_rdo">導航欄按鈕居中</string>
 		<string name="lft_navbar_rdo">導航欄按鈕左對齊</string>
 		<string name="rht_navbar_rdo">導航欄按鈕右對齊</string>
-		<string name="restore_defaults_btn">恢復默認設置</string>
+		<string name="restore_defaults_btn">恢復預設設定</string>
 		<string name="settings_tz_btn">時區</string>
 		<string name="settings_screen_btn">螢幕</string>
 		<string name="settings_screen_bright_btn">螢幕亮度</string>
-		<string name="vibration_disabled">振動已在本設備上停用</string>
-		<string name="settings_vibration_btn">振動</string>
+		<string name="vibration_disabled">震動已在本設備上停用</string>
+		<string name="settings_vibration_btn">震動</string>
 		<string name="settings_language_btn">語言</string>
 		<string name="time_zone_hdr">時區</string>
 		<string name="sel_tz_list">選擇時區：</string>
@@ -344,19 +344,19 @@
 		<string name="utcm4">(UTC -4) 大西洋標準時間</string>
 		<string name="utcm3">(UTC -3) 巴西、阿根廷（布宜諾斯）</string>
 		<string name="utcm2">(UTC -2) 大西洋中部</string>
-		<string name="utcm1">(UTC -1) 葡萄牙（亞速爾群島），佛得角</string>
+		<string name="utcm1">(UTC -1) 葡萄牙（亞速群島），維德角</string>
 		<string name="utc0">(UTC  0) 倫敦、都柏林、里斯本</string>
 		<string name="utcp1">(UTC +1) 柏林、布魯塞爾、巴黎</string>
-		<string name="utcp2">(UTC +2) 雅典、伊斯坦布爾、南非</string>
+		<string name="utcp2">(UTC +2) 雅典、伊斯坦堡、南非</string>
 		<string name="utcp3">(UTC +3) 莫斯科、巴格達</string>
-		<string name="utcp4">(UTC +4) 阿布扎比、第比利斯、馬斯喀特</string>
-		<string name="utcp5">(UTC +5) 葉卡捷琳堡、伊斯蘭堡</string>
+		<string name="utcp4">(UTC +4) 阿布達比、提比里西、馬斯喀特</string>
+		<string name="utcp5">(UTC +5) 葉卡捷琳堡、伊斯蘭瑪巴德</string>
 		<string name="utcp6">(UTC +6) 阿拉木圖、達卡、可倫坡</string>
 		<string name="utcp7">(UTC +7) 曼谷、河內、雅加達</string>
-		<string name="utcp8">(UTC +8) 北京、新加坡、香港</string>
+		<string name="utcp8">(UTC +8) 台北、北京、新加坡、香港</string>
 		<string name="utcp9">(UTC +9) 東京、首爾、雅庫茨克</string>
-		<string name="utcp10">(UTC +10) 澳大利亞東部、關島</string>
-		<string name="utcp11">(UTC +11) 符拉迪沃斯托克、所羅門群島</string>
+		<string name="utcp10">(UTC +10) 澳洲東部、關島</string>
+		<string name="utcp11">(UTC +11) 符拉迪沃斯托克、索羅門群島</string>
 		<string name="utcp12">(UTC +12) 奧克蘭、惠靈頓、斐濟</string>
 		<string name="sel_tz_offset">時間偏差（通常為 0）: %tw_time_zone_guioffset%</string>
 		<string name="tz_offset_none">無</string>
@@ -367,35 +367,35 @@
 		<string name="use_dst_chk">使用夏令時 (DST)</string>
 		<string name="curr_tz">當前時區: %tw_time_zone%</string>
 		<string name="curr_tz_s">當前時區：</string>
-		<string name="set_tz_btn">設置時區</string>
+		<string name="set_tz_btn">設定時區</string>
 		<string name="settings_screen_hdr">螢幕</string>
 		<string name="settings_screen_timeout_hdr">螢幕超時</string>
 		<string name="enable_timeout_chk">啟用螢幕超時</string>
 		<string name="screen_to_slider">螢幕超時時間（秒）：</string>
-		<string name="screen_to_slider_s">螢幕超時（0=禁用）: %tw_screen_timeout_secs%</string>
-		<string name="screen_to_na">螢幕超時設置不可用</string>
+		<string name="screen_to_slider_s">螢幕超時（0=停用）: %tw_screen_timeout_secs%</string>
+		<string name="screen_to_na">螢幕超時設定不可用</string>
 		<string name="screen_bright_slider">螢幕亮度: %tw_brightness_pct%%</string>
-		<string name="screen_bright_na">螢幕亮度設置不可用</string>
-		<string name="vibration_hdr">振動</string>
-		<string name="button_vibration_hdr">按鈕振動</string>
-		<string name="kb_vibration_hdr">鍵盤振動</string>
-		<string name="act_vibration_hdr">操作振動</string>
-		<string name="button_vibration">按鈕振動強度：</string>
-		<string name="kb_vibration">鍵盤振動強度：</string>
-		<string name="act_vibration">操作振動強度：</string>
+		<string name="screen_bright_na">螢幕亮度設定不可用</string>
+		<string name="vibration_hdr">震動</string>
+		<string name="button_vibration_hdr">按鈕震動</string>
+		<string name="kb_vibration_hdr">鍵盤震動</string>
+		<string name="act_vibration_hdr">操作震動</string>
+		<string name="button_vibration">按鈕震動強度：</string>
+		<string name="kb_vibration">鍵盤震動強度：</string>
+		<string name="act_vibration">操作震動強度：</string>
 		<string name="select_language">選擇語言：</string>
 		<string name="sel_lang_btn">選擇語言</string>
-		<string name="set_language_btn">設置語言</string>
-		<string name="advanced_hdr">高級選項</string>
-		<string name="copy_log_confirm">是否導出日誌到內置存儲？</string>
+		<string name="set_language_btn">設定語言</string>
+		<string name="advanced_hdr">進階選項</string>
+		<string name="copy_log_confirm">是否匯出日誌到內建儲存空間？</string>
 		<string name="copying_log" version="2">正在複製…</string>
-		<string name="copy_log_complete" version="2">日誌導出完成</string>
+		<string name="copy_log_complete" version="2">日誌匯出完成</string>
 		<string name="fix_context_btn">修復 Context</string>
-		<string name="part_sd_btn">分區 SD 卡</string>
+		<string name="part_sd_btn">分割區 SD 卡</string>
 		<string name="part_sd_s_btn">SD 卡</string>
 		<string name="file_manager_btn">檔案管理</string>
 		<string name="language_hdr">語言</string>
-		<string name="terminal_btn">終端命令</string>
+		<string name="terminal_btn">終端指令</string>
 		<string name="reload_theme_btn">重載主題</string>
 		<string name="dumlock_btn">HTC Dumlock</string>
 		<string name="inject_twrp_btn">注入 TWRP</string>
@@ -403,28 +403,28 @@
 		<string name="injecting_twrp">正在重新注入 TWRP…</string>
 		<string name="inject_twrp_complete">TWRP 注入完成</string>
 		<string name="swipe_to_confirm">滑動滑塊確認</string>
-		<string name="part_sd_hdr">SD 卡分區</string>
+		<string name="part_sd_hdr">SD 卡分割區</string>
 		<string name="invalid_partsd_sel">您必須選擇一個可移動設備</string>
-		<string name="part_sd_lose">您將會丟失 SD 卡上的所有檔案！</string>
+		<string name="part_sd_lose">您將會遺失 SD 卡上的所有檔案！</string>
 		<string name="part_sd_undo">此操作無法恢復！</string>
 		<string name="part_sd_ext_sz">EXT 大小：</string>
 		<string name="part_sd_swap_sz">Swap 大小：</string>
 		<string name="part_sd_m">-</string>
 		<string name="part_sd_p">+</string>
 		<string name="file_system">檔案系統：</string>
-		<string name="swipe_part_sd">滑動滑塊確認分區</string>
-		<string name="swipe_part_sd_s">分區</string>
-		<string name="partitioning_sd">正在對 SD 卡分區…</string>
+		<string name="swipe_part_sd">滑動滑塊確認分割區</string>
+		<string name="swipe_part_sd_s">分割區</string>
+		<string name="partitioning_sd">正在對 SD 卡分割區…</string>
 		<string name="partitioning_sd2">這將需要幾分鐘的時間。</string>
-		<string name="part_sd_complete">分區完成</string>
+		<string name="part_sd_complete">分割區完成</string>
 		<string name="dumlock_hdr">HTC Dumlock</string>
-		<string name="dumlock_restore_btn">恢復原版 Boot 鏡像</string>
-		<string name="dumlock_restore_confirm">是否恢復原版 Boot 鏡像？</string>
-		<string name="dumlock_restoring">正在恢復原版 Boot 鏡像…</string>
-		<string name="dumlock_restore_complete">恢復原版 Boot 鏡像完成。</string>
+		<string name="dumlock_restore_btn">恢復原廠 Boot 映像</string>
+		<string name="dumlock_restore_confirm">是否恢復原廠 Boot 映像？</string>
+		<string name="dumlock_restoring">正在恢復原廠 Boot 映像…</string>
+		<string name="dumlock_restore_complete">恢復原廠 Boot 映像完成。</string>
 		<string name="dumlock_reflash_btn">重新刷入 Recovery</string>
-		<string name="dumlock_reflash_confirm">是否重新刷入 Recovery 至 Boot 分區？</string>
-		<string name="dumlock_reflashing">正在刷入 Recovery 至 Boot 分區…</string>
+		<string name="dumlock_reflash_confirm">是否重新刷入 Recovery 至 Boot 分割區？</string>
+		<string name="dumlock_reflashing">正在刷入 Recovery 至 Boot 分割區…</string>
 		<string name="dumlock_reflash_complete">Recovery 刷入完成</string>
 		<string name="dumlock_install_btn">安裝 HTC Dumlock</string>
 		<string name="dumlock_install_confirm">是否安裝 HTC Dumlock 檔案到系統中？</string>
@@ -449,27 +449,27 @@
 		<string name="fm_chmod_btn">chmod</string>
 		<string name="fm_delete_btn">刪除</string>
 		<string name="fm_deleting">正在刪除</string>
-		<string name="fm_rename_btn">重命名</string>
-		<string name="fm_rename_file_btn">重命名檔案</string>
-		<string name="fm_rename_folder_btn">重命名檔案夾</string>
-		<string name="fm_renaming">正在重命名</string>
+		<string name="fm_rename_btn">重新命名</string>
+		<string name="fm_rename_file_btn">重新命名檔案</string>
+		<string name="fm_rename_folder_btn">重新命名檔案夾</string>
+		<string name="fm_renaming">正在重新命名</string>
 		<string name="fm_sel_dest">選擇目標目錄</string>
 		<string name="fm_sel_curr_folder">選擇當前目錄</string>
-		<string name="fm_rename_hdr">重命名</string>
-		<string name="fm_set_perms_hdr">設置許可權</string>
+		<string name="fm_rename_hdr">重新命名</string>
+		<string name="fm_set_perms_hdr">設定許可權</string>
 		<string name="fm_perms">許可權：</string>
 		<string name="fm_complete">操作完成</string>
-		<string name="decrypt_data_hdr">解密 Data 分區</string>
+		<string name="decrypt_data_hdr">解密 Data 分割區</string>
 		<string name="decrypt_data_enter_pass">請輸入密碼。</string>
 		<string name="decrypt_data_failed">密碼錯誤，請重試！</string>
 		<string name="decrypt_data_failed_pattern">圖案錯誤，請重試！</string>
 		<string name="decrypt_data_enter_pattern">繪製解鎖圖案</string>
 		<string name="decrypt_data_trying">正在嘗試解密</string>
 		<string name="decrypt_data_vold_os_missing">缺少解密 vold 所需的檔案: {1}</string>
-		<string name="term_hdr">終端命令</string>
-		<string name="term_s_hdr">終端</string>
+		<string name="term_hdr">終端機指令</string>
+		<string name="term_s_hdr">終端機</string>
 		<string name="term_kill_btn">終止</string>
-		<string name="term_sel_folder_hdr">選擇運行目錄</string>
+		<string name="term_sel_folder_hdr">選擇執行目錄</string>
 		<string name="adb_sideload_hdr">ADB Sideload</string>
 		<string name="sideload_wipe_dalvik_chk">清除 Dalvik Cache</string>
 		<string name="sideload_wipe_cache_chk">清除 Cache</string>
@@ -481,79 +481,79 @@
 		<string name="fix_contexts_hdr">修復 Context</string>
 		<string name="fix_contexts_note1">注意：很少情況下需要修復 Context。</string>
 		<string name="fix_contexts_note2">修復 SELinux Context 可能會導致</string>
-		<string name="fix_contexts_note3">您的設備無法正常啓動。</string>
+		<string name="fix_contexts_note3">您的設備無法正常啟動。</string>
 		<string name="swipe_to_fix_contexts">滑動滑塊確認修復</string>
 		<string name="swipe_fix_contexts">   修復 Context</string>
 		<string name="fixing_contexts">正在修復 Context…</string>
 		<string name="fix_contexts_complete">修復 Context 完成</string>
-		<string name="reboot_hdr">重啟選項</string>
+		<string name="reboot_hdr">重新開機選項</string>
 		<string name="install_cancel">不，以後再說</string>
-		<string name="sel_storage_list">選擇存儲位置</string>
+		<string name="sel_storage_list">選擇儲存位置</string>
 		<string name="ok_btn">確定</string>
 		<string name="install_twrp_ramdisk">安裝 Recovery Ramdisk</string>
-		<string name="install_kernel">安裝內核</string>
-		<string name="repack_kernel_confirm_hdr">安裝內核</string>
+		<string name="install_kernel">安裝 Kernel </string>
+		<string name="repack_kernel_confirm_hdr">安裝 Kernel </string>
 		<string name="repack_ramdisk_confirm_hdr">安裝 Recovery</string>
-		<string name="repack_kernel_confirm">是否安裝內核？</string>
+		<string name="repack_kernel_confirm">是否安裝 Kernel ？</string>
 		<string name="repack_ramdisk_confirm">是否安裝 Recovery？</string>
-		<string name="repack_backup_first">請先備份現有的鏡像</string>
+		<string name="repack_backup_first">請先備份現有的映像</string>
 		<string name="repack">重新打包</string>
 		<string name="swipe_to_install">滑動滑塊確認安裝</string>
 		<string name="installing">正在安裝…</string>
 		<string name="install_complete">安裝完成</string>
-		<string name="unpack_error">解包鏡像錯誤。</string>
-		<string name="repack_error">重新打包鏡像錯誤。</string>
+		<string name="unpack_error">解包映像錯誤。</string>
+		<string name="repack_error">重新打包映像錯誤。</string>
 		<string name="unpacking_image">正在解包 {1}…</string>
 		<string name="repacking_image">正在打包 {1}…</string>
-		<string name="repack_image_hdr">選擇鏡像</string>
-		<string name="fix_recovery_loop">修復 Recovery 無限重啟</string>
-		<string name="fix_recovery_loop_confirm">是否修復 Recovery 無限重啟？</string>
-		<string name="fixing_recovery_loop">正在修復 Recovery 無限重啟…</string>
-		<string name="fix_recovery_loop_complete">Recovery 無限重啟修復完成</string>
-		<string name="fixing_recovery_loop_patch">正在對內核打補丁…</string>
-		<string name="fix_recovery_loop_patch_error">對內核打補丁時出錯。</string>
-		<string name="decrypt_users">解密用戶</string>
-		<string name="decrypt_users_selection">選擇一位要解密的用戶 ID</string>
-		<string name="select_user">選擇用戶</string>
-		<string name="backup_storage_undecrypt_warning">備份不包含一些屬於用戶 {1} 的文件，因爲該用戶沒有解密</string>
-		<string name="decrypting_user_fbe">嘗試為用戶 {1} 解密 FBE…</string>
-		<string name="decrypt_user_success_fbe">用戶 {1} 解密成功</string>
-		<string name="decrypt_user_fail_fbe">用戶 {1} 解密失敗</string>
-		<string name="decrypt_data_enter_pass_fbe">請輸入用戶 [%tw_crypto_user_id%] 的密碼</string>
-		<string name="decrypt_data_enter_pattern_fbe">請繪製用戶 [%tw_crypto_user_id%] 的解鎖圖案</string>
-		<string name="multiuser_warning1">并非所有用戶都被解密！</string>
+		<string name="repack_image_hdr">選擇映像</string>
+		<string name="fix_recovery_loop">修復 Recovery 無限重新開機</string>
+		<string name="fix_recovery_loop_confirm">是否修復 Recovery 無限重新開機？</string>
+		<string name="fixing_recovery_loop">正在修復 Recovery 無限重新開機…</string>
+		<string name="fix_recovery_loop_complete">Recovery 無限重新開機修復完成</string>
+		<string name="fixing_recovery_loop_patch">正在對 Kernel 打補丁…</string>
+		<string name="fix_recovery_loop_patch_error">對 Kernel 打補丁時出錯。</string>
+		<string name="decrypt_users">解密使用者</string>
+		<string name="decrypt_users_selection">選擇一位要解密的使用者 ID</string>
+		<string name="select_user">選擇使用者</string>
+		<string name="backup_storage_undecrypt_warning">備份不包含一些屬於使用者 {1} 的文件，因為該使用者沒有解密</string>
+		<string name="decrypting_user_fbe">嘗試為使用者 {1} 解密 FBE…</string>
+		<string name="decrypt_user_success_fbe">使用者 {1} 解密成功</string>
+		<string name="decrypt_user_fail_fbe">使用者 {1} 解密失敗</string>
+		<string name="decrypt_data_enter_pass_fbe">請輸入使用者 [%tw_crypto_user_id%] 的密碼</string>
+		<string name="decrypt_data_enter_pattern_fbe">請繪製使用者 [%tw_crypto_user_id%] 的解鎖圖案</string>
+		<string name="multiuser_warning1">並非所有使用者都被解密！</string>
 		<string name="multiuser_warning2">備份/還原操作可能會失敗！</string>
 		<string name="multiuser_warning_accept">仍然繼續</string>
-		<string name="multiuser_warning_hdr">多用戶警告</string>
+		<string name="multiuser_warning_hdr">多使用者警告</string>
 
 		<!-- Various console messages - these consist of user displayed messages, oftentimes errors -->
-		<string name="no_kernel_selinux">內核不支持讀取 SELinux Context。</string>
-		<string name="full_selinux">完整 SELinux 支持。</string>
-		<string name="no_selinux">無 SELinux 支持（無 libselinux）。</string>
+		<string name="no_kernel_selinux"> Kernel 不支援讀取 SELinux Context。</string>
+		<string name="full_selinux">完整 SELinux 支援。</string>
+		<string name="no_selinux">無 SELinux 支援（無 libselinux）。</string>
 		<string name="mtp_enabled">MTP 已啟用</string>
-		<string name="mtp_crash">MTP 已崩潰。啟動時不再加載 MTP。</string>
-		<string name="decrypt_success">已使用默認密碼解密成功。</string>
-		<string name="unable_to_decrypt">無法使用默認密碼來解密，您可能需要格式化 Data 分區。</string>
-		<string name="generating_digest1" version="2">正在生成 Digest</string>
+		<string name="mtp_crash">MTP 已崩潰。啟動時不再載入 MTP。</string>
+		<string name="decrypt_success">已使用預設密碼解密成功。</string>
+		<string name="unable_to_decrypt">無法使用預設密碼來解密，您可能需要格式化 Data 分割區。</string>
+		<string name="generating_digest1" version="2">正在建立 Digest</string>
 		<!-- Message displayed during a backup if we are generating an Digest, ideally, leave the leading " * " to help align and separate this text from other console text -->
-		<string name="generating_digest2" version="2"> * 正在生成 Digest…</string>
-		<string name="digest_created" version="2"> * Digest 已生成。</string>
+		<string name="generating_digest2" version="2"> * 正在建立 Digest…</string>
+		<string name="digest_created" version="2"> * Digest 已建立。</string>
 		<string name="digest_error" version="2"> * Digest 錯誤！</string>
 		<string name="digest_compute_error" version="2"> * 計算 Digest 錯誤。</string>
 		<string name="current_date">（當前日期）</string>
-		<string name="auto_generate">（自動生成）</string>
-		<string name="unable_to_locate_partition">未找到“{1}”分區。</string>
-		<string name="no_partition_selected">未選擇備份分區。</string>
-		<string name="total_partitions_backup"> * 備份分區總數: {1}</string>
+		<string name="auto_generate">（自動建立）</string>
+		<string name="unable_to_locate_partition">未找到“{1}”分割區。</string>
+		<string name="no_partition_selected">未選擇備份分割區。</string>
+		<string name="total_partitions_backup"> * 備份分割區總數: {1}</string>
 		<string name="total_backup_size"> * 備份數據總計: {1}MB</string>
 		<string name="available_space"> * 可用空間: {1}MB</string>
-		<string name="unable_locate_storage">未找到存儲設備。</string>
+		<string name="unable_locate_storage">未找到儲存設備。</string>
 		<string name="no_space">記憶體上沒有足夠的空間。</string>
 		<string name="backup_started">[已開始備份]</string>
 		<string name="backup_folder"> * 備份檔案夾: {1}</string>
 		<string name="fail_backup_folder">建立備份檔案夾失敗。</string>
 		<string name="avg_backup_fs">檔案平均備份速度: {1}MB/秒</string>
-		<string name="avg_backup_img">鏡像平均備份速度: {1}MB/秒</string>
+		<string name="avg_backup_img">映像平均備份速度: {1}MB/秒</string>
 		<string name="total_backed_size">[總計備份 {1}MB]</string>
 		<string name="backup_completed">[備份已完成，耗時 {1} 秒]</string>
 		<string name="restore_started">[已開始恢復]</string>
@@ -561,67 +561,67 @@
 		<!-- {1} is the partition display name and {2} is the number of seconds -->
 		<string name="restore_part_done">[{1} 恢復完成（{2} 秒）]</string>
 		<string name="verifying_digest" version="2">正在校驗 Digest</string>
-		<string name="skip_digest" version="2">基於用戶設置，已跳過 Digest 檢查。</string>
-		<string name="calc_restore">正在計算恢復詳情…</string>
+		<string name="skip_digest" version="2">基於使用者設定，已跳過 Digest 檢查。</string>
+		<string name="calc_restore">正在計算恢復資訊…</string>
 		<string name="restore_read_only">無法恢復 {1} -- 已掛載為只讀。</string>
-		<string name="restore_unable_locate">未找到“{1}”分區。</string>
-		<string name="no_part_restore">未選擇要恢復的分區。</string>
-		<string name="restore_part_count">正在恢復 {1} 個分區…</string>
+		<string name="restore_unable_locate">未找到“{1}”分割區。</string>
+		<string name="no_part_restore">未選擇要恢復的分割區。</string>
+		<string name="restore_part_count">正在恢復 {1} 個分割區…</string>
 		<string name="total_restore_size">恢復檔案總計 {1}MB</string>
 		<string name="updating_system_details">更新系統詳細資訊</string>
 		<string name="restore_completed">[恢復完成，耗時 {1} 秒]</string>
 		<!-- {1} is the path we could not open, {2} is strerror output -->
 		<string name="error_opening_strerr">打開出錯:“{1}” ({2})</string>
-		<string name="unable_locate_part_backup_name">無法通過備份名稱來查找分區:“{1}”</string>
-		<string name="unable_find_part_path">找不到分區路徑“{1}”</string>
-		<string name="update_part_details">正在更新分區詳情…</string>
+		<string name="unable_locate_part_backup_name">無法透過備份名稱來尋找分割區:“{1}”</string>
+		<string name="unable_find_part_path">找不到分割區路徑“{1}”</string>
+		<string name="update_part_details">正在更新分割區資訊…</string>
 		<string name="update_part_details_done">…完成</string>
 		<string name="wiping_dalvik">正在清除 Dalvik 目錄…</string>
 		<string name="cleaned">已清除：{1}…</string>
 		<string name="cache_dalvik_done">-- Dalvik Cache 目錄清除完成！</string>
 		<string name="dalvik_done">-- Dalvik 目錄清除完成！</string>
-		<string name="no_andsec">未發現 android secure 分區。</string>
+		<string name="no_andsec">未發現 android secure 分割區。</string>
 		<string name="unable_to_locate">未找到 {1}。</string>
-		<string name="wiping_datamedia">清除內置存儲 -- /data/media…</string>
+		<string name="wiping_datamedia">清除內建儲存空間 -- /data/media…</string>
 		<string name="unable_to_mount">無法掛載 {1}</string>
-		<string name="unable_to_mount_internal">無法掛載內置存儲</string>
-		<string name="unable_to_mount_storage">無法掛載存儲</string>
+		<string name="unable_to_mount_internal">無法掛載內建儲存空間</string>
+		<string name="unable_to_mount_storage">無法掛載儲存</string>
 		<string name="fail_decrypt">解密數據失敗。</string>
-		<string name="no_crypto_support">此版本不支持加密。</string>
-		<string name="decrypt_success_dev">Data 分區成功解密，新增塊設備:“{1}”</string>
-		<string name="decrypt_success_nodev">Data 分區已成功解密</string>
+		<string name="no_crypto_support">此版本不支援加密。</string>
+		<string name="decrypt_success_dev">Data 分割區成功解密，新增塊設備:“{1}”</string>
+		<string name="decrypt_success_nodev">Data 分割區已成功解密</string>
 		<string name="done">完成。</string>
-		<string name="start_partition_sd">正在給 SD 卡分區…</string>
-		<string name="partition_sd_locate">未找到需要分區的設備。</string>
+		<string name="start_partition_sd">正在給 SD 卡分割區…</string>
+		<string name="partition_sd_locate">未找到需要分割區的設備。</string>
 		<string name="ext_swap_size">EXT+Swap 大小超過 SD 卡容量。</string>
-		<string name="remove_part_table">正在刪除分區表…</string>
-		<string name="unable_rm_part">無法刪除分區表。</string>
-		<string name="create_part">正在創建 {1} 分區…</string>
-		<string name="unable_to_create_part">無法創建 {1} 分區。</string>
+		<string name="remove_part_table">正在刪除分割區表…</string>
+		<string name="unable_rm_part">無法刪除分割區表。</string>
+		<string name="create_part">正在建立 {1} 分割區…</string>
+		<string name="unable_to_create_part">無法建立 {1} 分割區。</string>
 		<string name="format_sdext_as">正在將 sd-ext 格式化為 {1}…</string>
-		<string name="part_complete">分區完成。</string>
+		<string name="part_complete">分割區完成。</string>
 		<string name="unable_to_open">無法打開“{1}”。</string>
 		<string name="mtp_already_enabled">MTP 已經啟用</string>
 		<string name="mtp_fail">啟用 MTP 失敗</string>
-		<string name="no_mtp">不支持 MTP</string>
-		<string name="image_flash_start">[開始刷入鏡像]</string>
-		<string name="img_to_flash">刷入鏡像:“{1}”</string>
-		<string name="flash_unable_locate">未找到“{1}”分區。</string>
-		<string name="no_part_flash">未選擇刷入分區。</string>
-		<string name="too_many_flash">選擇刷入的分區太多。</string>
-		<string name="invalid_flash">指定的刷入分區無效。</string>
-		<string name="flash_done">[鏡像刷入完成]</string>
+		<string name="no_mtp">不支援 MTP</string>
+		<string name="image_flash_start">[開始刷入映像]</string>
+		<string name="img_to_flash">刷入映像:“{1}”</string>
+		<string name="flash_unable_locate">未找到“{1}”分割區。</string>
+		<string name="no_part_flash">未選擇刷入分割區。</string>
+		<string name="too_many_flash">選擇刷入的分割區太多。</string>
+		<string name="invalid_flash">指定的刷入分割區無效。</string>
+		<string name="flash_done">[映像刷入完成]</string>
 		<string name="wiping">正在清除 {1}</string>
 		<string name="repair_not_exist">{1} 不存在！無法修復！</string>
 		<string name="repairing_using">正在使用 {2} 修復 {1}…</string>
 		<string name="unable_repair">無法修復 {1}。</string>
 		<string name="mount_data_footer">無法掛載/data，未找到加密 footer。</string>
 		<!-- {1} is the folder name that we could not create, {2} is strerror output -->
-		<string name="create_folder_strerr">無法創建“{1}”檔案夾 ({2})。</string>
+		<string name="create_folder_strerr">無法建立“{1}”檔案夾 ({2})。</string>
 		<!-- {1} is the folder name that we could not mount, {2} is strerror output -->
 		<string name="fail_mount">掛載“{1}”失敗 ({2})</string>
 		<!-- {1} is the folder name that we could not unmount, {2} is strerror output -->
-		<string name="fail_unmount">卸載“{1}”失敗 ({2})</string>
+		<string name="fail_unmount">解除掛載“{1}”失敗 ({2})</string>
 		<string name="cannot_resize">無法更改 {1} 的大小。</string>
 		<string name="repair_resize">在調整大小之前修復 {1}。</string>
 		<string name="unable_resize">無法調整 {1} 的大小。</string>
@@ -629,54 +629,54 @@
 		<string name="digest_fail_match" version="2">“{1}” Digest 校驗失敗。</string>
 		<string name="digest_matched" version="2">Digest 匹配“{1}”。</string>
 		<string name="fail_decrypt_tar">無法解密 Tar 檔案“{1}”</string>
-		<string name="format_data_msg">您可能需要重啟 Recovery 才能使用/data。</string>
+		<string name="format_data_msg">您可能需要重新開機 Recovery 才能使用/data。</string>
 		<string name="format_data_err">無法格式化並刪除加密。</string>
 		<string name="formatting_using">使用 {2} 格式化 {1}…</string>
 		<string name="unable_to_wipe">無法清除 {1}。</string>
-		<string name="cannot_wipe">無法清除 {1} 分區。</string>
+		<string name="cannot_wipe">無法清除 {1} 分割區。</string>
 		<string name="remove_all">移除“{1}”下的所有檔案</string>
-		<string name="wiping_data">正在清除 Data 分区，跳過清除/data/media…</string>
+		<string name="wiping_data">正在清除 Data 分割區，跳過清除/data/media…</string>
 		<string name="backing_up">正在備份 {1}…</string>
-		<string name="backup_storage_warning">備份的 {1} 分區不包含內置存儲上的任何檔案，例如照片或下載的檔案等等。</string>
+		<string name="backup_storage_warning">備份的 {1} 分割區不包含內建儲存空間上的任何檔案，例如照片或下載的檔案等等。</string>
 		<string name="backing">正在備份</string>
 		<string name="backup_size">“{1}”的備份檔案大小為 0 位元組。</string>
-		<string name="datamedia_fs_restore">警告：此/data備份檔案系統為 {1}！除非把檔案系統格式設置為 {1} 否則可能無法啟動。</string>
+		<string name="datamedia_fs_restore">警告：此/data備份檔案系統為 {1}！除非把檔案系統格式設定為 {1} 否則可能無法啟動。</string>
 		<string name="restoring">正在恢復 {1}…</string>
 		<string name="restoring_hdr">正在恢復</string>
-		<string name="recreate_folder_err">無法重新創建 {1} 檔案夾。</string>
-		<string name="img_size_err">鏡像大小大於目標設備</string>
+		<string name="recreate_folder_err">無法重新建立 {1} 檔案夾。</string>
+		<string name="img_size_err">映像大小大於目標設備</string>
 		<string name="flashing">正在刷入 {1}…</string>
-		<string name="backup_folder_set">備份檔案夾設置為:“{1}”</string>
+		<string name="backup_folder_set">備份檔案夾設定為:“{1}”</string>
 		<string name="locate_backup_err">未找到備份檔案“{1}”</string>
-		<string name="set_restore_opt">設置恢復選項:“{1}”：</string>
+		<string name="set_restore_opt">設定恢復選項:“{1}”：</string>
 		<string name="digest_check_skip" version="2">跳過校驗 Digest 已開啟</string>
 		<string name="ors_encrypt_restore_err">無法使用 OpenRecoveryScript 腳本恢復加密備份。</string>
 		<string name="mounting">正在掛載</string>
-		<string name="unmounting">正在卸載</string>
+		<string name="unmounting">正在解除掛載</string>
 		<string name="mounted">“{1}”已掛載</string>
-		<string name="unmounted">“{1}”已卸載</string>
-		<string name="setting">設置“{1}”為“{2}”</string>
-		<string name="setting_empty">設置“{1}”為空</string>
-		<string name="making_dir1">創建目錄</string>
-		<string name="making_dir2">創建目錄:“{1}”</string>
-		<string name="running_command">運行命令</string>
+		<string name="unmounted">“{1}”已解除掛載</string>
+		<string name="setting">設定“{1}”為“{2}”</string>
+		<string name="setting_empty">設定“{1}”為空</string>
+		<string name="making_dir1">建立目錄</string>
+		<string name="making_dir2">建立目錄:“{1}”</string>
+		<string name="running_command">執行指令</string>
 		<string name="sideload">ADB Sideload</string>
 		<string name="start_sideload">正在開始 ADB sideload…</string>
 		<string name="need_new_adb">您需要 1.0.32 或更高版本的 adb 才可以使用。</string>
 		<string name="no_pwd">未提供密碼。</string>
 		<string name="done_ors">腳本執行完畢</string>
-		<string name="injecttwrp">正在注入 TWRP 到 Boot 鏡像…</string>
+		<string name="injecttwrp">正在注入 TWRP 到 Boot 映像…</string>
 		<string name="zip_err">安裝 Zip 刷機包“{1}”時出錯</string>
 		<string name="installing_zip">正在安裝 Zip 刷機包“{1}”</string>
-		<string name="select_backup_opt">設置備份選項：</string>
+		<string name="select_backup_opt">設定備份選項：</string>
 		<string name="compression_on">壓縮選項已開啟</string>
-		<string name="digest_off" version="2">Digest 生成已關閉</string>
+		<string name="digest_off" version="2">Digest 建立已關閉</string>
 		<string name="backup_fail">備份失敗</string>
 		<string name="backup_clean">備份失敗。正在清理備份檔案夾。</string>
-		<string name="running_recovery_commands">運行 Recovery 命令</string>
-		<string name="recovery_commands_complete">Recovery 命令執行完成</string>
-		<string name="running_ors">運行 OpenRecoveryScript 腳本</string>
-		<string name="ors_complete">運行 OpenRecoveryScript 腳本完成</string>
+		<string name="running_recovery_commands">執行 Recovery 指令</string>
+		<string name="recovery_commands_complete">Recovery 指令執行完成</string>
+		<string name="running_ors">執行 OpenRecoveryScript 腳本</string>
+		<string name="ors_complete">執行 OpenRecoveryScript 腳本完成</string>
 		<string name="check_for_digest" version="2">正在檢測 Digest…</string>
 		<string name="invalid_zip_format">Zip 檔案格式無效！</string>
 		<string name="fail_sysmap">映射檔案“{1}”失敗</string>
@@ -690,27 +690,27 @@
 		<string name="pid_signal">{1} 過程結束，標誌: {2}</string>
 		<string name="pid_error">{1} 過程結束，錯誤: {2}</string>
 		<string name="install_dumlock">安裝 HTC Dumlock 到系統…</string>
-		<string name="dumlock_restore">正在恢復原版 Boot…</string>
+		<string name="dumlock_restore">正在恢復原廠 Boot…</string>
 		<string name="dumlock_reflash">正在重新刷入 Recovery 到 Boot…</string>
-		<string name="run_script">正在運行 {1} 腳本…</string>
-		<string name="rename_stock">重命名/system 下原版 Recovery 的補丁，避免原廠固件替換 TWRP。</string>
-		<string name="split_backup">分解備份檔案為多個壓縮檔…</string>
+		<string name="run_script">正在執行 {1} 腳本…</string>
+		<string name="rename_stock">重新命名/system 下原廠 Recovery 的補丁，避免原廠韌體替換 TWRP。</string>
+		<string name="split_backup">拆分備份檔案為多個壓縮檔…</string>
 		<string name="backup_error">建立備份失敗。</string>
 		<string name="restore_error">在恢復過程中發生錯誤。</string>
-		<string name="split_thread">拆分線程 ID {1} 到壓縮檔 {2}</string>
+		<string name="split_thread">拆分執行緒 ID {1} 到壓縮檔 {2}</string>
 		<!-- These 2 items are saved in the data manager instead of resource manager, so %llu, etc is correct instead of {1} -->
 		<string name="file_progress">已完成 %llu 個，共 %llu 個檔案，進度 %i%%</string>
 		<string name="size_progress">已完成 %lluMB，共 %lluMB，進度 %i%%</string>
-		<string name="decrypt_cmd" version="2">正在嘗試通過命令行解密 Data 分區或用戶數據。</string>
-		<string name="base_pkg_err">無法加載基本包。</string>
+		<string name="decrypt_cmd" version="2">正在嘗試通過指令解密 Data 分割區或使用者數據。</string>
+		<string name="base_pkg_err">無法載入基本包。</string>
 		<string name="simulating">正在模擬操作…</string>
 		<string name="backup_cancel">備份已取消。</string>
 		<string name="config_twrp">正在配置 TWRP…</string>
-		<string name="config_twrp_err">此內核無法配置 TWRP。</string>
-		<string name="copy_log">已經導出 Recovery 日誌到 {1}。</string>
+		<string name="config_twrp_err">此 Kernel 無法配置 TWRP。</string>
+		<string name="copy_log">已經匯出 Recovery 日誌到 {1}。</string>
 		<string name="max_queue">已達到最大刷機包刷入佇列！</string>
 		<string name="min_queue">已達到最大刷機包刷入佇列！</string>
-		<string name="screenshot_saved">截圖已保存到：{1}</string>
+		<string name="screenshot_saved">截圖已儲存到：{1}</string>
 		<string name="screenshot_err">截圖失敗！</string>
 		<string name="zip_wipe_cache">一個或多個刷機包請求清除 Cache -- 正在清除 Cache。</string>
 		<string name="and_sec_wipe_err">無法清除 android secure</string>
@@ -721,33 +721,33 @@
 		<string name="backup_name_invalid">備份名稱“{1}”中包含無效字元:“{1}”</string>
 		<string name="no_real_sdcard">此設備沒有真實的 SD 卡！正在中止！</string>
 		<string name="cancel_sideload">取消 ADB Sideload…</string>
-		<string name="change_fs_err">更換檔案系統时出錯。</string>
-		<string name="theme_ver_err">自定義主題和 TWRP 版本不匹配，正使用默認主題。</string>
+		<string name="change_fs_err">更換檔案系統時出錯。</string>
+		<string name="theme_ver_err">自訂主題和 TWRP 版本不匹配，正使用預設主題。</string>
 		<string name="up_a_level">（上級目錄）</string>
-		<string name="install_reboot" version="2">將會在 %tw_sleep% 秒內重啟</string>
+		<string name="install_reboot" version="2">將會在 %tw_sleep% 秒內重新開機</string>
 		<string name="adbbackup_error">ADB 備份錯誤。正在退出…"</string>
 		<string name="adbbackup_control_error">無法寫入 adb 控制通道</string>
 		<string name="twrp_adbbu_option">啟用 TWRP ADB 備份需使用 --twrp 選項</string>
-		<string name="partition_not_found">分區列表中未發現路徑: {1}</string>
-		<string name="copy_kernel_log">已導出內核日誌至 {1}</string>
-		<string name="include_kernel_log">包含內核日誌</string>
+		<string name="partition_not_found">分割區列表中未發現路徑: {1}</string>
+		<string name="copy_kernel_log">已匯出 Kernel 日誌至 {1}</string>
+		<string name="include_kernel_log">包含 Kernel 日誌</string>
 		<string name="sha2_chk">使用 SHA2 進行散列校驗</string>
 		<string name="unable_set_boot_slot">更改 Bootloader 啟動槽位至 {1} 錯誤</string>
-		<string name="unmount_sys_install">在安裝 Zip 刷機包之前先解除挂載 System</string>
-		<string name="unmount_system">正在解除挂載 System…</string>
-		<string name="unmount_system_err">解除挂載 System 失敗</string>
+		<string name="unmount_sys_install">在安裝 Zip 刷機包之前先解除掛載 System</string>
+		<string name="unmount_system">正在解除掛載 System…</string>
+		<string name="unmount_system_err">解除掛載 System 失敗</string>
 		<string name="flash_ab_inactive">正在刷入 A/B Zip 刷機包至非活動槽位: {1}</string>
-		<string name="flash_ab_reboot">如需刷入其它的 Zip 刷機包，請重新啓動 Recovery 切換到新槽位。</string>
+		<string name="flash_ab_reboot">如需刷入其它的 Zip 刷機包，請重新啟動 Recovery 切換到新槽位。</string>
 		<string name="ozip_decrypt_decryption">正在解密 Ozip…</string>
 		<string name="ozip_decrypt_finish">Ozip 解密完成！</string>
 		<string name="fastboot_button">Fastboot</string>
-		<string name="enable_adb">啓用 ADB</string>
-		<string name="enable_fastboot">啓用 Fastboot</string>
+		<string name="enable_adb">啟用 ADB</string>
+		<string name="enable_fastboot">啟用 Fastboot</string>
 		<string name="fastboot_console_msg">進入 Fastboot 模式…</string>
 		<!-- Android Rescue Party trigger -->
-		<string name="rescue_party0">Android 搶救模式已觸發！您可以嘗試下面的操作：</string>
+		<string name="rescue_party0">Android 救援模式已觸發！您可以嘗試下面的操作：</string>
 		<string name="rescue_party1"> 1. 清除 Cache；</string>
-		<string name="rescue_party2"> 2. 格式化 Data 分區；</string>
+		<string name="rescue_party2"> 2. 格式化 Data 分割區；</string>
 		<string name="rescue_party3"> 3. 重新刷入您的 ROM。</string>
 		<string name="rescue_party4">報告的問題為：</string>
 	</resources>
diff --git a/gui/theme/landscape_hdpi/ui.xml b/gui/theme/landscape_hdpi/ui.xml
index bd055bd5..a71387f3 100755
--- a/gui/theme/landscape_hdpi/ui.xml
+++ b/gui/theme/landscape_hdpi/ui.xml
@@ -119,7 +119,10 @@
 		<variable name="btn4_col2_x_right" value="1218"/>
 		<variable name="btn4_col3_x_right" value="1452"/>
 		<variable name="btn4_col4_x_right" value="1686"/>
-		<variable name="row1_header_y" value="0"/>
+		<variable name="status_topalign_header_y" value="0"/>
+		<variable name="status_centeralign_header_y" value="7"/>
+		<variable name="status_bottomalign_header_y" value="14"/>
+		<variable name="row1_header_y" value="{statusicons_align}"/>
 		<variable name="row2_header_y" value="48"/>
 		<variable name="row3_header_y" value="60"/>
 		<variable name="row4_header_y" value="126"/>
@@ -226,6 +229,10 @@
 		<variable name="pattern_dot_dia" value="32"/>
 		<variable name="pattern_line_w" value="12"/>
 		<variable name="pattern_size" value="648"/>
+		<variable name="tw_clock_12_pos_x" value="{clock_12_pos}"/>
+		<variable name="tw_clock_24_pos_x" value="{clock_24_pos}"/>
+		<variable name="tw_cpu_pos_x" value="{cpu_pos}"/>
+		<variable name="tw_battery_pos_x" value="{battery_pos}"/>
 	</variables>
 
 	<mousecursor>
@@ -267,6 +274,7 @@
 
 			<text color="%text_color%">
 				<condition var1="tw_no_cpu_temp" var2="1"/>
+				<condition var1="tw_cpu_pos_x" var2="0"/>
 				<font resource="font_m"/>
 				<placement x="%indent%" y="%row1_header_y%"/>
 				<text>%tw_version%</text>
@@ -274,12 +282,15 @@
 
 			<text color="%text_color%">
 				<condition var1="tw_no_cpu_temp" var2="0"/>
+				<condition var1="tw_cpu_pos_x" var2="0"/>
 				<font resource="font_m"/>
 				<placement x="%indent%" y="%row1_header_y%"/>
 				<text>{@cpu_temp=CPU: %tw_cpu_temp% °C}</text>
 			</text>
 
 			<text color="%text_color%">
+				<condition var1="tw_clock_12_pos_x" var2="0"/>
+				<condition var1="tw_clock_24_pos_x" var2="0"/>
 				<font resource="font_m"/>
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>%tw_time%</text>
@@ -290,12 +301,61 @@
 					<condition var1="tw_no_battery_percent" var2="0"/>
 					<condition var1="tw_battery" op="&gt;" var2="0"/>
 					<condition var1="tw_battery" op="&lt;" var2="101"/>
+					<condition var1="tw_battery_pos_x" var2="0"/>
 				</conditions>
 				<font resource="font_m"/>
 				<placement x="%indent_right%" y="%row1_header_y%" placement="1"/>
 				<text>{@battery_pct=Battery: %tw_battery%}</text>
 			</text>
 
+			<!-- Custom position for status bar items if defined START -->
+
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="1"/>
+				<condition var1="tw_cpu_pos_x" op="!=" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%tw_cpu_pos_x%" y="%row1_header_y%"/>
+				<text>%tw_version%</text>
+			</text>
+
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="0"/>
+				<condition var1="tw_cpu_pos_x" op="!=" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%tw_cpu_pos_x%" y="%row1_header_y%"/>
+				<text>{@cpu_temp=CPU: %tw_cpu_temp% °C}</text>
+			</text>
+
+			<text color="%text_color%">
+				<condition var1="tw_clock_12_pos_x" op="!=" var2="0"/>
+				<condition var1="tw_military_time" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%tw_clock_12_pos_x%" y="%row1_header_y%"/>
+				<text>%tw_time%</text>
+			</text>
+
+			<text color="%text_color%">
+				<condition var1="tw_clock_24_pos_x" op="!=" var2="0"/>
+				<condition var1="tw_military_time" var2="1"/>
+				<font resource="font_m"/>
+				<placement x="%tw_clock_24_pos_x%" y="%row1_header_y%"/>
+				<text>%tw_time%</text>
+			</text>
+
+			<text color="%text_color%">
+				<conditions>
+					<condition var1="tw_no_battery_percent" var2="0"/>
+					<condition var1="tw_battery" op="&gt;" var2="0"/>
+					<condition var1="tw_battery" op="&lt;" var2="101"/>
+					<condition var1="tw_battery_pos_x" op="!=" var2="0"/>
+				</conditions>
+				<font resource="font_m"/>
+				<placement x="%tw_battery_pos_x%" y="%row1_header_y%"/>
+				<text>{@battery_pct=Battery: %tw_battery%}</text>
+			</text>
+
+			<!-- Custom position for status bar items if defined END -->
+
 			<fill color="#000000">
 				<condition var1="tw_busy" var2="0"/>
 				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%"/>
diff --git a/gui/theme/landscape_mdpi/ui.xml b/gui/theme/landscape_mdpi/ui.xml
index 9ab8863d..dadfbb9f 100755
--- a/gui/theme/landscape_mdpi/ui.xml
+++ b/gui/theme/landscape_mdpi/ui.xml
@@ -119,7 +119,10 @@
 		<variable name="btn4_col2_x_right" value="507"/>
 		<variable name="btn4_col3_x_right" value="606"/>
 		<variable name="btn4_col4_x_right" value="703"/>
-		<variable name="row1_header_y" value="0"/>
+		<variable name="status_topalign_header_y" value="0"/>
+		<variable name="status_centeralign_header_y" value="2"/>
+		<variable name="status_bottomalign_header_y" value="4"/>
+		<variable name="row1_header_y" value="{statusicons_align}"/>
 		<variable name="row2_header_y" value="20"/>
 		<variable name="row3_header_y" value="24"/>
 		<variable name="row4_header_y" value="52"/>
@@ -226,6 +229,10 @@
 		<variable name="pattern_dot_dia" value="12"/>
 		<variable name="pattern_line_w" value="4"/>
 		<variable name="pattern_size" value="252"/>
+		<variable name="tw_clock_12_pos_x" value="{clock_12_pos}"/>
+		<variable name="tw_clock_24_pos_x" value="{clock_24_pos}"/>
+		<variable name="tw_cpu_pos_x" value="{cpu_pos}"/>
+		<variable name="tw_battery_pos_x" value="{battery_pos}"/>
 	</variables>
 
 	<mousecursor>
@@ -267,6 +274,7 @@
 
 			<text color="%text_color%">
 				<condition var1="tw_no_cpu_temp" var2="1"/>
+				<condition var1="tw_cpu_pos_x" var2="0"/>
 				<font resource="font_m"/>
 				<placement x="%indent%" y="%row1_header_y%"/>
 				<text>%tw_version%</text>
@@ -274,12 +282,15 @@
 
 			<text color="%text_color%">
 				<condition var1="tw_no_cpu_temp" var2="0"/>
+				<condition var1="tw_cpu_pos_x" var2="0"/>
 				<font resource="font_m"/>
 				<placement x="%indent%" y="%row1_header_y%"/>
 				<text>{@cpu_temp=CPU: %tw_cpu_temp% °C}</text>
 			</text>
 
 			<text color="%text_color%">
+				<condition var1="tw_clock_12_pos_x" var2="0"/>
+				<condition var1="tw_clock_24_pos_x" var2="0"/>
 				<font resource="font_m"/>
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>%tw_time%</text>
@@ -290,12 +301,61 @@
 					<condition var1="tw_no_battery_percent" var2="0"/>
 					<condition var1="tw_battery" op="&gt;" var2="0"/>
 					<condition var1="tw_battery" op="&lt;" var2="101"/>
+					<condition var1="tw_battery_pos_x" var2="0"/>
 				</conditions>
 				<font resource="font_m"/>
 				<placement x="%indent_right%" y="%row1_header_y%" placement="1"/>
 				<text>{@battery_pct=Battery: %tw_battery%}</text>
 			</text>
 
+			<!-- Custom position for status bar items if defined START -->
+
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="1"/>
+				<condition var1="tw_cpu_pos_x" op="!=" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%tw_cpu_pos_x%" y="%row1_header_y%"/>
+				<text>%tw_version%</text>
+			</text>
+
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="0"/>
+				<condition var1="tw_cpu_pos_x" op="!=" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%tw_cpu_pos_x%" y="%row1_header_y%"/>
+				<text>{@cpu_temp=CPU: %tw_cpu_temp% °C}</text>
+			</text>
+
+			<text color="%text_color%">
+				<condition var1="tw_clock_12_pos_x" op="!=" var2="0"/>
+				<condition var1="tw_military_time" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%tw_clock_12_pos_x%" y="%row1_header_y%"/>
+				<text>%tw_time%</text>
+			</text>
+
+			<text color="%text_color%">
+				<condition var1="tw_clock_24_pos_x" op="!=" var2="0"/>
+				<condition var1="tw_military_time" var2="1"/>
+				<font resource="font_m"/>
+				<placement x="%tw_clock_24_pos_x%" y="%row1_header_y%"/>
+				<text>%tw_time%</text>
+			</text>
+
+			<text color="%text_color%">
+				<conditions>
+					<condition var1="tw_no_battery_percent" var2="0"/>
+					<condition var1="tw_battery" op="&gt;" var2="0"/>
+					<condition var1="tw_battery" op="&lt;" var2="101"/>
+					<condition var1="tw_battery_pos_x" op="!=" var2="0"/>
+				</conditions>
+				<font resource="font_m"/>
+				<placement x="%tw_battery_pos_x%" y="%row1_header_y%"/>
+				<text>{@battery_pct=Battery: %tw_battery%}</text>
+			</text>
+
+			<!-- Custom position for status bar items if defined END -->
+
 			<fill color="#000000">
 				<condition var1="tw_busy" var2="0"/>
 				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%"/>
diff --git a/gui/theme/portrait_hdpi/ui.xml b/gui/theme/portrait_hdpi/ui.xml
index f7d21da3..104c3f66 100755
--- a/gui/theme/portrait_hdpi/ui.xml
+++ b/gui/theme/portrait_hdpi/ui.xml
@@ -113,7 +113,10 @@
 		<variable name="btn4_col2_x" value="297"/>
 		<variable name="btn4_col3_x" value="558"/>
 		<variable name="btn4_col4_x" value="819"/>
-		<variable name="row1_header_y" value="4"/>
+		<variable name="status_topalign_header_y" value="4"/>
+		<variable name="status_centeralign_header_y" value="15"/>
+		<variable name="status_bottomalign_header_y" value="30"/>
+		<variable name="row1_header_y" value="{statusicons_align}"/>
 		<variable name="row2_header_y" value="72"/>
 		<variable name="row3_header_y" value="90"/>
 		<variable name="row4_header_y" value="168"/>
@@ -223,6 +226,10 @@
 		<variable name="pattern_dot_dia" value="32"/>
 		<variable name="pattern_line_w" value="12"/>
 		<variable name="pattern_size" value="828"/>
+		<variable name="tw_clock_12_pos_x" value="{clock_12_pos}"/>
+		<variable name="tw_clock_24_pos_x" value="{clock_24_pos}"/>
+		<variable name="tw_cpu_pos_x" value="{cpu_pos}"/>
+		<variable name="tw_battery_pos_x" value="{battery_pos}"/>
 	</variables>
 
 	<mousecursor>
@@ -264,6 +271,7 @@
 
 			<text color="%text_color%">
 				<condition var1="tw_no_cpu_temp" var2="1"/>
+				<condition var1="tw_cpu_pos_x" var2="0"/>
 				<font resource="font_m"/>
 				<placement x="%indent%" y="%row1_header_y%"/>
 				<text>%tw_version%</text>
@@ -271,12 +279,15 @@
 
 			<text color="%text_color%">
 				<condition var1="tw_no_cpu_temp" var2="0"/>
+				<condition var1="tw_cpu_pos_x" var2="0"/>
 				<font resource="font_m"/>
 				<placement x="%indent%" y="%row1_header_y%"/>
 				<text>{@cpu_temp=CPU: %tw_cpu_temp% °C}</text>
 			</text>
 
 			<text color="%text_color%">
+				<condition var1="tw_clock_12_pos_x" var2="0"/>
+				<condition var1="tw_clock_24_pos_x" var2="0"/>
 				<font resource="font_m"/>
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>%tw_time%</text>
@@ -287,12 +298,61 @@
 					<condition var1="tw_no_battery_percent" var2="0"/>
 					<condition var1="tw_battery" op="&gt;" var2="0"/>
 					<condition var1="tw_battery" op="&lt;" var2="101"/>
+					<condition var1="tw_battery_pos_x" var2="0"/>
 				</conditions>
 				<font resource="font_m"/>
 				<placement x="%indent_right%" y="%row1_header_y%" placement="1"/>
 				<text>{@battery_pct=Battery: %tw_battery%}</text>
 			</text>
 
+			<!-- Custom position for status bar items if defined START -->
+
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="1"/>
+				<condition var1="tw_cpu_pos_x" op="!=" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%tw_cpu_pos_x%" y="%row1_header_y%"/>
+				<text>%tw_version%</text>
+			</text>
+
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="0"/>
+				<condition var1="tw_cpu_pos_x" op="!=" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%tw_cpu_pos_x%" y="%row1_header_y%"/>
+				<text>{@cpu_temp=CPU: %tw_cpu_temp% °C}</text>
+			</text>
+
+			<text color="%text_color%">
+				<condition var1="tw_clock_12_pos_x" op="!=" var2="0"/>
+				<condition var1="tw_military_time" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%tw_clock_12_pos_x%" y="%row1_header_y%"/>
+				<text>%tw_time%</text>
+			</text>
+
+			<text color="%text_color%">
+				<condition var1="tw_clock_24_pos_x" op="!=" var2="0"/>
+				<condition var1="tw_military_time" var2="1"/>
+				<font resource="font_m"/>
+				<placement x="%tw_clock_24_pos_x%" y="%row1_header_y%"/>
+				<text>%tw_time%</text>
+			</text>
+
+			<text color="%text_color%">
+				<conditions>
+					<condition var1="tw_no_battery_percent" var2="0"/>
+					<condition var1="tw_battery" op="&gt;" var2="0"/>
+					<condition var1="tw_battery" op="&lt;" var2="101"/>
+					<condition var1="tw_battery_pos_x" op="!=" var2="0"/>
+				</conditions>
+				<font resource="font_m"/>
+				<placement x="%tw_battery_pos_x%" y="%row1_header_y%"/>
+				<text>{@battery_pct=Battery: %tw_battery%}</text>
+			</text>
+
+			<!-- Custom position for status bar items if defined END -->
+
 			<fill color="#000000">
 				<condition var1="tw_busy" var2="0"/>
 				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%"/>
diff --git a/gui/theme/portrait_mdpi/ui.xml b/gui/theme/portrait_mdpi/ui.xml
index 9189df0c..d81a9a9a 100755
--- a/gui/theme/portrait_mdpi/ui.xml
+++ b/gui/theme/portrait_mdpi/ui.xml
@@ -113,7 +113,10 @@
 		<variable name="btn4_col2_x" value="131"/>
 		<variable name="btn4_col3_x" value="247"/>
 		<variable name="btn4_col4_x" value="363"/>
-		<variable name="row1_header_y" value="2"/>
+		<variable name="status_topalign_header_y" value="2"/>
+		<variable name="status_centeralign_header_y" value="6"/>
+		<variable name="status_bottomalign_header_y" value="12"/>
+		<variable name="row1_header_y" value="{statusicons_align}"/>
 		<variable name="row2_header_y" value="30"/>
 		<variable name="row3_header_y" value="40"/>
 		<variable name="row4_header_y" value="74"/>
@@ -223,6 +226,10 @@
 		<variable name="pattern_dot_dia" value="12"/>
 		<variable name="pattern_line_w" value="4"/>
 		<variable name="pattern_size" value="360"/>
+		<variable name="tw_clock_12_pos_x" value="{clock_12_pos}"/>
+		<variable name="tw_clock_24_pos_x" value="{clock_24_pos}"/>
+		<variable name="tw_cpu_pos_x" value="{cpu_pos}"/>
+		<variable name="tw_battery_pos_x" value="{battery_pos}"/>
 	</variables>
 
 	<mousecursor>
@@ -264,6 +271,7 @@
 
 			<text color="%text_color%">
 				<condition var1="tw_no_cpu_temp" var2="1"/>
+				<condition var1="tw_cpu_pos_x" var2="0"/>
 				<font resource="font_m"/>
 				<placement x="%indent%" y="%row1_header_y%"/>
 				<text>%tw_version%</text>
@@ -271,12 +279,15 @@
 
 			<text color="%text_color%">
 				<condition var1="tw_no_cpu_temp" var2="0"/>
+				<condition var1="tw_cpu_pos_x" var2="0"/>
 				<font resource="font_m"/>
 				<placement x="%indent%" y="%row1_header_y%"/>
 				<text>{@cpu_temp=CPU: %tw_cpu_temp% °C}</text>
 			</text>
 
 			<text color="%text_color%">
+				<condition var1="tw_clock_12_pos_x" var2="0"/>
+				<condition var1="tw_clock_24_pos_x" var2="0"/>
 				<font resource="font_m"/>
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>%tw_time%</text>
@@ -287,12 +298,61 @@
 					<condition var1="tw_no_battery_percent" var2="0"/>
 					<condition var1="tw_battery" op="&gt;" var2="0"/>
 					<condition var1="tw_battery" op="&lt;" var2="101"/>
+					<condition var1="tw_battery_pos_x" var2="0"/>
 				</conditions>
 				<font resource="font_m"/>
 				<placement x="%indent_right%" y="%row1_header_y%" placement="1"/>
 				<text>{@battery_pct=Battery: %tw_battery%}</text>
 			</text>
 
+			<!-- Custom position for status bar items if defined START -->
+
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="1"/>
+				<condition var1="tw_cpu_pos_x" op="!=" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%tw_cpu_pos_x%" y="%row1_header_y%"/>
+				<text>%tw_version%</text>
+			</text>
+
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="0"/>
+				<condition var1="tw_cpu_pos_x" op="!=" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%tw_cpu_pos_x%" y="%row1_header_y%"/>
+				<text>{@cpu_temp=CPU: %tw_cpu_temp% °C}</text>
+			</text>
+
+			<text color="%text_color%">
+				<condition var1="tw_clock_12_pos_x" op="!=" var2="0"/>
+				<condition var1="tw_military_time" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%tw_clock_12_pos_x%" y="%row1_header_y%"/>
+				<text>%tw_time%</text>
+			</text>
+
+			<text color="%text_color%">
+				<condition var1="tw_clock_24_pos_x" op="!=" var2="0"/>
+				<condition var1="tw_military_time" var2="1"/>
+				<font resource="font_m"/>
+				<placement x="%tw_clock_24_pos_x%" y="%row1_header_y%"/>
+				<text>%tw_time%</text>
+			</text>
+
+			<text color="%text_color%">
+				<conditions>
+					<condition var1="tw_no_battery_percent" var2="0"/>
+					<condition var1="tw_battery" op="&gt;" var2="0"/>
+					<condition var1="tw_battery" op="&lt;" var2="101"/>
+					<condition var1="tw_battery_pos_x" op="!=" var2="0"/>
+				</conditions>
+				<font resource="font_m"/>
+				<placement x="%tw_battery_pos_x%" y="%row1_header_y%"/>
+				<text>{@battery_pct=Battery: %tw_battery%}</text>
+			</text>
+
+			<!-- Custom position for status bar items if defined END -->
+
 			<fill color="#000000">
 				<condition var1="tw_busy" var2="0"/>
 				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%"/>
diff --git a/gui/theme/watch_mdpi/ui.xml b/gui/theme/watch_mdpi/ui.xml
index ed7ac825..83966396 100644
--- a/gui/theme/watch_mdpi/ui.xml
+++ b/gui/theme/watch_mdpi/ui.xml
@@ -96,7 +96,10 @@
 		<variable name="btn4_col2_x" value="86"/>
 		<variable name="btn4_col3_x" value="164"/>
 		<variable name="btn4_col4_x" value="242"/>
-		<variable name="row1_header_y" value="0"/>
+		<variable name="status_topalign_header_y" value="0"/>
+		<variable name="status_centeralign_header_y" value="3"/>
+		<variable name="status_bottomalign_header_y" value="6"/>
+		<variable name="row1_header_y" value="{statusicons_align}"/>
 		<variable name="row2_header_y" value="20"/>
 		<variable name="row1_y" value="28"/>
 		<variable name="row1a_y" value="36"/>
@@ -182,6 +185,10 @@
 		<variable name="pattern_dot_dia" value="12"/>
 		<variable name="pattern_line_w" value="4"/>
 		<variable name="pattern_size" value="200"/>
+		<variable name="tw_clock_12_pos_x" value="{clock_12_pos}"/>
+		<variable name="tw_clock_24_pos_x" value="{clock_24_pos}"/>
+		<variable name="tw_cpu_pos_x" value="{cpu_pos}"/>
+		<variable name="tw_battery_pos_x" value="{battery_pos}"/>
 	</variables>
 
 	<templates>
@@ -203,6 +210,7 @@
 
 			<text color="%text_color%">
 				<condition var1="tw_no_cpu_temp" var2="1"/>
+				<condition var1="tw_cpu_pos_x" var2="0"/>
 				<font resource="font_m"/>
 				<placement x="%indent%" y="%row1_header_y%"/>
 				<text>{@twrp_watch_header=TWRP %tw_version%}</text>
@@ -210,12 +218,15 @@
 
 			<text color="%text_color%">
 				<condition var1="tw_no_cpu_temp" var2="0"/>
+				<condition var1="tw_cpu_pos_x" var2="0"/>
 				<font resource="font_m"/>
 				<placement x="%indent%" y="%row1_header_y%"/>
 				<text>{@cpu_temp=CPU: %tw_cpu_temp% °C}</text>
 			</text>
 
 			<text color="%text_color%">
+				<condition var1="tw_clock_12_pos_x" var2="0"/>
+				<condition var1="tw_clock_24_pos_x" var2="0"/>
 				<font resource="font_m"/>
 				<placement x="%center_x%" y="%row1_header_y%" placement="5"/>
 				<text>%tw_time%</text>
@@ -226,12 +237,61 @@
 					<condition var1="tw_no_battery_percent" var2="0"/>
 					<condition var1="tw_battery" op="&gt;" var2="0"/>
 					<condition var1="tw_battery" op="&lt;" var2="101"/>
+					<condition var1="tw_battery_pos_x" var2="0"/>
 				</conditions>
 				<font resource="font_m"/>
 				<placement x="%indent_right%" y="%row1_header_y%" placement="1"/>
 				<text>{@battery_pct=Battery: %tw_battery%}</text>
 			</text>
 
+			<!-- Custom position for status bar items if defined START -->
+
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="1"/>
+				<condition var1="tw_cpu_pos_x" op="!=" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%tw_cpu_pos_x%" y="%row1_header_y%"/>
+				<text>{@twrp_watch_header=TWRP %tw_version%}</text>
+			</text>
+
+			<text color="%text_color%">
+				<condition var1="tw_no_cpu_temp" var2="0"/>
+				<condition var1="tw_cpu_pos_x" op="!=" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%tw_cpu_pos_x%" y="%row1_header_y%"/>
+				<text>{@cpu_temp=CPU: %tw_cpu_temp% °C}</text>
+			</text>
+
+			<text color="%text_color%">
+				<condition var1="tw_clock_12_pos_x" op="!=" var2="0"/>
+				<condition var1="tw_military_time" var2="0"/>
+				<font resource="font_m"/>
+				<placement x="%tw_clock_12_pos_x%" y="%row1_header_y%"/>
+				<text>%tw_time%</text>
+			</text>
+
+			<text color="%text_color%">
+				<condition var1="tw_clock_24_pos_x" op="!=" var2="0"/>
+				<condition var1="tw_military_time" var2="1"/>
+				<font resource="font_m"/>
+				<placement x="%tw_clock_24_pos_x%" y="%row1_header_y%"/>
+				<text>%tw_time%</text>
+			</text>
+
+			<text color="%text_color%">
+				<conditions>
+					<condition var1="tw_no_battery_percent" var2="0"/>
+					<condition var1="tw_battery" op="&gt;" var2="0"/>
+					<condition var1="tw_battery" op="&lt;" var2="101"/>
+					<condition var1="tw_battery_pos_x" op="!=" var2="0"/>
+				</conditions>
+				<font resource="font_m"/>
+				<placement x="%tw_battery_pos_x%" y="%row1_header_y%"/>
+				<text>{@battery_pct=Battery: %tw_battery%}</text>
+			</text>
+
+			<!-- Custom position for status bar items if defined END -->
+
 			<fill color="#000000">
 				<placement x="0" y="%navbar_y%" w="%screen_width%" h="%navbar_height%"/>
 			</fill>
diff --git a/minuitwrp/libminuitwrp_defaults.go b/minuitwrp/libminuitwrp_defaults.go
index 2f82c6eb..59e5cebf 100644
--- a/minuitwrp/libminuitwrp_defaults.go
+++ b/minuitwrp/libminuitwrp_defaults.go
@@ -116,7 +116,7 @@ func globalFlags(ctx android.BaseContext) []string {
 	}
 
 	if getMakeVars(ctx, "TARGET_RECOVERY_OVERSCAN_PERCENT") != "" {
-		cflags = append(cflags, "-DDOVERSCAN_PERCENT="+getMakeVars(ctx, "TARGET_RECOVERY_OVERSCAN_PERCENT"))
+		cflags = append(cflags, "-DOVERSCAN_PERCENT="+getMakeVars(ctx, "TARGET_RECOVERY_OVERSCAN_PERCENT"))
 	} else {
 		cflags = append(cflags, "-DOVERSCAN_PERCENT=0")
 	}
diff --git a/mtp/ffs/MtpServer.cpp b/mtp/ffs/MtpServer.cpp
index fa670243..cacb45eb 100755
--- a/mtp/ffs/MtpServer.cpp
+++ b/mtp/ffs/MtpServer.cpp
@@ -164,8 +164,17 @@ bool MtpServer::hasStorage(MtpStorageID id) {
 
 void MtpServer::run() {
 	if (mHandle->start(mPtp)) {
-		MTPE("Failed to start usb driver!");
+		MTPE("Failed to start usb driver!\n");
 		mHandle->close();
+        int controlFd = open(FFS_MTP_EP0, O_RDWR);
+        bool ffs_ok = access(FFS_MTP_EP0, W_OK) == 0;
+        if (ffs_ok) {
+            bool aio_compat = android::base::GetBoolProperty("sys.usb.ffs.aio_compat", false);
+            mHandle = aio_compat ? new MtpFfsCompatHandle(controlFd) : new MtpFfsHandle(controlFd);
+            mHandle->writeDescriptors(mPtp);
+        } else {
+            mHandle = new MtpDevHandle(controlFd);
+        }
 		return;
 	}
 
@@ -972,7 +981,7 @@ MtpResponseCode MtpServer::doSendObjectInfo() {
 	if (maxFileSize != 0) {
 		// if mSendObjectFileSize is 0xFFFFFFFF, then all we know is the file size
 		// is >= 0xFFFFFFFF
-		if (mSendObjectFileSize > maxFileSize || mSendObjectFileSize == 0xFFFFFFFF)
+		if (mSendObjectFileSize > maxFileSize)
 			return MTP_RESPONSE_OBJECT_TOO_LARGE;
 	}
 
diff --git a/partition.cpp b/partition.cpp
index ae5ef396..6f59c5d9 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -33,6 +33,7 @@
 #include <zlib.h>
 #include <sstream>
 #include <android-base/properties.h>
+#include <android-base/strings.h>
 #include <libsnapshot/snapshot.h>
 
 #include "cutils/properties.h"
@@ -472,20 +473,24 @@ bool TWPartition::Process_Fstab_Line(const char *fstab_line, bool Display_Error,
 			Can_Be_Wiped = false;
 			Mount_Read_Only = false;
 			Make_Dir(PartitionManager.Get_Android_Root_Path(), true);
+		} else if (Mount_Point == "/system_ext") {
+			Display_Name = "System_EXT";
+			Backup_Name = "System_EXT";
+			Backup_Display_Name = Display_Name;
+			Storage_Name = Display_Name;
+			Can_Be_Backed_Up = Wipe_Available_in_GUI = Is_Super ? false : true;
 		} else if (Mount_Point == "/product") {
 			Display_Name = "Product";
 			Backup_Name = "Product";
 			Backup_Display_Name = Display_Name;
 			Storage_Name = Display_Name;
 			Can_Be_Backed_Up = Wipe_Available_in_GUI = Is_Super ? false : true;
-			Mount_Read_Only = true;
 		} else if (Mount_Point == "/odm") {
 			Display_Name = "ODM";
 			Backup_Name = "ODM";
 			Backup_Display_Name = Display_Name;
 			Storage_Name = Display_Name;
 			Can_Be_Backed_Up = Wipe_Available_in_GUI = Is_Super ? false : true;
-			Mount_Read_Only = true;
 		} else if (Mount_Point == "/data") {
 			Display_Name = "Data";
 			Backup_Display_Name = Display_Name;
@@ -1243,8 +1248,22 @@ void TWPartition::Setup_Data_Media() {
 		backup_exclusions.add_absolute_dir("/data/vendor/dumpsys");
 		backup_exclusions.add_absolute_dir("/data/cache");
         backup_exclusions.add_absolute_dir("/data/misc/apexdata/com.android.art"); // exclude this dir to prevent "error 255" on AOSP Android 12
+		backup_exclusions.add_absolute_dir("/data/extm"); //exclude this dir to prevent "error 255" on MIUI
 		wipe_exclusions.add_absolute_dir(Mount_Point + "/misc/vold"); // adopted storage keys
 		ExcludeAll(Mount_Point + "/system/storage.xml");
+
+		// board-customisable exclusions
+		#ifdef TW_BACKUP_EXCLUSIONS
+			std::vector<std::string> user_extra_exclusions = TWFunc::Split_String(TW_BACKUP_EXCLUSIONS, ",");
+			std::string s1;
+			for (const std::string& extra_x : user_extra_exclusions) {
+				s1 = android::base::Trim(extra_x);
+				if (!s1.empty()) {
+					backup_exclusions.add_absolute_dir(s1);
+					LOGINFO("Adding user-defined path '%s' to the backup exclusions\n", s1.c_str());
+				}
+			}
+		#endif
 	} else {
 		int i;
 		string path;
@@ -2444,7 +2463,7 @@ bool TWPartition::Wipe_F2FS() {
 	}
 
 	needs_casefold = android::base::GetBoolProperty("external_storage.casefold.enabled", false);
-    needs_projid = android::base::GetBoolProperty("external_storage.projid.enabled", false);
+	needs_projid = android::base::GetBoolProperty("external_storage.projid.enabled", false);
 	unsigned long long dev_sz = TWFunc::IOCTL_Get_Block_Size(Actual_Block_Device.c_str());
 	if (!dev_sz)
 		return false;
@@ -2461,8 +2480,8 @@ bool TWPartition::Wipe_F2FS() {
 
 	f2fs_command += " " + Actual_Block_Device + " " + dev_sz_str;
 
-	if (TWFunc::Path_Exists("/system/bin/sload.f2fs")) {
-		f2fs_command += " && sload.f2fs -t /data " + Actual_Block_Device;
+	if (TWFunc::Path_Exists("/system/bin/sload_f2fs")) {
+		f2fs_command += " && sload_f2fs -t /data " + Actual_Block_Device;
 	}
 
 	/**
@@ -2966,36 +2985,39 @@ bool TWPartition::Restore_Image(PartitionSettings *part_settings) {
 }
 
 bool TWPartition::Update_Size(bool Display_Error) {
-	bool ret = false, Was_Already_Mounted = false;
+	bool ret = false, Was_Already_Mounted = false, ro = false;
 
 	Find_Actual_Block_Device();
 
 	if (Actual_Block_Device.empty())
 		return false;
 
+	ro = Mount_Read_Only;
+	Mount_Read_Only = true;
+
 	if (!Can_Be_Mounted && !Is_Encrypted) {
 		if (TWFunc::Path_Exists(Actual_Block_Device) && Find_Partition_Size()) {
 			Used = Size;
 			Backup_Size = Size;
-			return true;
+			goto success;
 		}
-		return false;
+		goto fail;
 	}
 
 	Was_Already_Mounted = Is_Mounted();
 
 	if (Removable || Is_Encrypted) {
 		if (!Mount(false))
-			return true;
+			goto success;
 	} else if (!Mount(Display_Error))
-		return false;
+		goto fail;
 
 	ret = Get_Size_Via_statfs(Display_Error);
 	if (!ret || Size == 0) {
 		if (!Get_Size_Via_df(Display_Error)) {
 			if (!Was_Already_Mounted)
 				UnMount(false);
-			return false;
+			goto fail;
 		}
 	}
 
@@ -3009,7 +3031,7 @@ bool TWPartition::Update_Size(bool Display_Error) {
 		} else {
 			if (!Was_Already_Mounted)
 				UnMount(false);
-			return false;
+			goto fail;
 		}
 	} else if (Has_Android_Secure) {
 		if (Mount(Display_Error))
@@ -3017,12 +3039,17 @@ bool TWPartition::Update_Size(bool Display_Error) {
 		else {
 			if (!Was_Already_Mounted)
 				UnMount(false);
-			return false;
+			goto fail;
 		}
 	}
 	if (!Was_Already_Mounted)
 		UnMount(false);
+success:
+	Mount_Read_Only = ro;
 	return true;
+fail:
+	Mount_Read_Only = ro;
+	return false;
 }
 
 bool TWPartition::Find_Wildcard_Block_Devices(const string& Device) {
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 6d4d9eee..beec30a9 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -308,6 +308,8 @@ void TWPartitionManager::Setup_Fstab_Partitions(bool Display_Error) {
 				Prepare_Super_Volume((*iter));
 		}
 
+		Unlock_Block_Partitions();
+
 		//Setup Apex before decryption
 		TWPartition* sys = PartitionManager.Find_Partition_By_Path(PartitionManager.Get_Android_Root_Path());
 		TWPartition* ven = PartitionManager.Find_Partition_By_Path("/vendor");
@@ -2839,8 +2841,6 @@ bool TWPartitionManager::Flash_Image(string& path, string& filename) {
 
 	full_filename = path + "/" + filename;
 
-	Unlock_Block_Partitions();
-
 	gui_msg("image_flash_start=[IMAGE FLASH STARTED]");
 	gui_msg(Msg("img_to_flash=Image to flash: '{1}'")(full_filename));
 
@@ -3421,11 +3421,12 @@ bool TWPartitionManager::Prepare_Super_Volume(TWPartition* twrpPart) {
 
 	twrpPart->Set_Block_Device(fstabEntry.blk_device);
 	twrpPart->Update_Size(true);
-	twrpPart->Change_Mount_Read_Only(true);
 	twrpPart->Set_Can_Be_Backed_Up(false);
 	twrpPart->Set_Can_Be_Wiped(false);
-	LOGINFO("Symlinking %s => /dev/block/bootdevice/by-name/%s \n", fstabEntry.blk_device.c_str(), bare_partition_name.c_str());
-	symlink(fstabEntry.blk_device.c_str(), ("/dev/block/bootdevice/by-name/" + bare_partition_name).c_str());
+	if (access(("/dev/block/bootdevice/by-name/" + bare_partition_name).c_str(), F_OK) == -1) {
+		LOGINFO("Symlinking %s => /dev/block/bootdevice/by-name/%s \n", fstabEntry.blk_device.c_str(), bare_partition_name.c_str());
+		symlink(fstabEntry.blk_device.c_str(), ("/dev/block/bootdevice/by-name/" + bare_partition_name).c_str());
+	}
 
     return true;
 }
@@ -3556,7 +3557,7 @@ void TWPartitionManager::Unlock_Block_Partitions() {
 					continue;
 				}
 				if (ioctl(fd, BLKROSET, &OFF) == -1) {
-					LOGERR("Unable to unlock %s for flashing: %s\n", block_device.c_str());
+					LOGERR("Unable to unlock %s: %s\n", block_device.c_str());
 					continue;
 				}
 				close(fd);
@@ -3577,7 +3578,9 @@ bool TWPartitionManager::Unmap_Super_Devices() {
 		if ((*iter)->Is_Super) {
 			TWPartition *part = *iter;
 			std::string bare_partition_name = Get_Bare_Partition_Name((*iter)->Get_Mount_Point());
-			std::string blk_device_partition = bare_partition_name + PartitionManager.Get_Active_Slot_Suffix();
+			std::string blk_device_partition = bare_partition_name;
+			if (DataManager::GetStrValue(TW_VIRTUAL_AB_ENABLED) == "1")
+				blk_device_partition.append(PartitionManager.Get_Active_Slot_Suffix());
 			(*iter)->UnMount(false);
 			LOGINFO("removing dynamic partition: %s\n", blk_device_partition.c_str());
 			destroyed = DestroyLogicalPartition(blk_device_partition);
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 5b8df086..48ee5a67 100755
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -255,7 +255,7 @@ endif
 ifneq ($(wildcard system/core/libsparse/Android.*),)
     RECOVERY_LIBRARY_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libsparse.so
 endif
-ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true)
+ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS),)
     RECOVERY_LIBRARY_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libopenaes.so
 endif
 ifeq ($(TARGET_USERIMAGES_USE_F2FS), true)
@@ -275,6 +275,9 @@ endif
 ifneq ($(TW_RECOVERY_ADDITIONAL_RELINK_LIBRARY_FILES),)
     RECOVERY_LIBRARY_SOURCE_FILES += $(TW_RECOVERY_ADDITIONAL_RELINK_LIBRARY_FILES)
 endif
+ifneq ($(TW_RECOVERY_ADDITIONAL_RELINK_VENDOR_HW_BINARY_FILES),)
+    RECOVERY_VENDOR_HW_BINARY_FILES += $(TW_RECOVERY_ADDITIONAL_RELINK_VENDOR_HW_BINARY_FILES)
+endif
 ifneq ($(wildcard external/pcre/Android.mk),)
     RECOVERY_LIBRARY_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libpcre.so
 endif
@@ -383,6 +386,17 @@ TARGET_BINARY_RELINK_FILES := $(filter-out bu, $(notdir $(RECOVERY_BINARY_SOURCE
 LOCAL_REQUIRED_MODULES += $(TARGET_BINARY_RELINK_FILES)
 include $(BUILD_PHONY_PACKAGE)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := relink_vendor_hw_binaries
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/
+LOCAL_POST_INSTALL_CMD += $(RELINK) $(TARGET_RECOVERY_ROOT_OUT)/vendor/bin/hw $(RECOVERY_VENDOR_HW_BINARY_FILES)
+TARGET_VENDOR_BINARY_RELINK_FILES := $(notdir $(RECOVERY_VENDOR_HW_BINARY_FILES))
+LOCAL_REQUIRED_MODULES += $(TARGET_VENDOR_BINARY_RELINK_FILES)
+$(warning vendor_hw: $(LOCAL_POST_INSTALL_CMD))
+include $(BUILD_PHONY_PACKAGE)
+
 #build out TWRP ramdisk
 include $(CLEAR_VARS)
 LOCAL_MODULE := twrp_ramdisk
@@ -392,20 +406,20 @@ LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)
 LOCAL_POST_INSTALL_CMD += \
     mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin; ln -sf /system/bin/sh $(TARGET_RECOVERY_ROOT_OUT)/sbin/sh && \
     mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/etc/selinux/ && \
-    mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/vendor/etc/selinux/ && \
+    mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/$(TARGET_COPY_OUT_VENDOR)/etc/selinux/ && \
     cp $(TARGET_OUT_ETC)/selinux/plat_service_contexts $(TARGET_RECOVERY_ROOT_OUT)/system/etc/selinux/plat_service_contexts && \
     cp $(TARGET_OUT_ETC)/selinux/plat_hwservice_contexts $(TARGET_RECOVERY_ROOT_OUT)/system/etc/selinux/plat_hwservice_contexts && \
-    cp $(TARGET_OUT_VENDOR_ETC)/selinux/vndservice_contexts $(TARGET_RECOVERY_ROOT_OUT)/vendor/etc/selinux/vndservice_contexts && \
-    cp $(TARGET_OUT_VENDOR_ETC)/selinux/vendor_hwservice_contexts $(TARGET_RECOVERY_ROOT_OUT)/vendor/etc/selinux/vendor_hwservice_contexts
+    cp $(TARGET_OUT_VENDOR_ETC)/selinux/vndservice_contexts $(TARGET_RECOVERY_ROOT_OUT)/$(TARGET_COPY_OUT_VENDOR)/etc/selinux/vndservice_contexts && \
+    cp $(TARGET_OUT_VENDOR_ETC)/selinux/vendor_hwservice_contexts $(TARGET_RECOVERY_ROOT_OUT)/$(TARGET_COPY_OUT_VENDOR)/etc/selinux/vendor_hwservice_contexts
     ifeq ($(TARGET_USES_MKE2FS), true)
         LOCAL_POST_INSTALL_CMD += \
             && cp $(TARGET_OUT_ETC)/mke2fs.conf $(TARGET_RECOVERY_ROOT_OUT)/system/etc/mke2fs.conf
     endif
-LOCAL_REQUIRED_MODULES += init_second_stage.recovery reboot.recovery plat_service_contexts plat_hardware_contexts vndservice_contexts twrp_soong
+LOCAL_REQUIRED_MODULES += init_second_stage.recovery reboot.recovery plat_service_contexts plat_hwservice_contexts plat_hardware_contexts vndservice_contexts vendor_hwservice_contexts twrp_soong
 include $(BUILD_PHONY_PACKAGE)
 
 # copy license file for OpenAES
-ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS), true)
+ifneq ($(TW_EXCLUDE_ENCRYPTED_BACKUPS),)
     include $(CLEAR_VARS)
     LOCAL_MODULE := openaes_license
     LOCAL_MODULE_TAGS := optional
diff --git a/prebuilt/relink.sh b/prebuilt/relink.sh
index 063f445e..59171146 100755
--- a/prebuilt/relink.sh
+++ b/prebuilt/relink.sh
@@ -12,6 +12,7 @@ process_file()
       src=$2.tmp
     fi
 
+    mkdir -p $1
     cp $src $dst
     if [[ -e $2.tmp ]]; then rm -f $2.tmp; fi
 }
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index 2b75cda9..820fccaa 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -1554,7 +1554,7 @@ bool TWFunc::Check_Xml_Format(const std::string filename) {
 		File.close();
 		// Android Binary Xml start from these bytes
 		if(!buffer.compare(0, abx_hdr.size(), abx_hdr))
-			return false; // bad format, not possible to parse
+			return false; // ABX format - requires conversion
 	}
 	return true; // good format, possible to parse
 }
diff --git a/twrp.cpp b/twrp.cpp
index dcc57640..69c82182 100644
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -44,7 +44,11 @@ extern "C" {
 #include "twcommon.h"
 #include "twrp-functions.hpp"
 #include "data.hpp"
+
+#ifdef TW_LOAD_VENDOR_MODULES
 #include "kernel_module_loader.hpp"
+#endif
+
 #include "partitions.hpp"
 #ifdef __ANDROID_API_N__
 #include <android-base/strings.h>
diff --git a/twrpRepacker.cpp b/twrpRepacker.cpp
index 6ac2ce90..1da19e26 100755
--- a/twrpRepacker.cpp
+++ b/twrpRepacker.cpp
@@ -270,6 +270,7 @@ if (!TWFunc::Path_Exists("/ramdisk-files.txt")) {
 			LOGERR("can not find ramdisk-files.txt");
 			return false;
 		}
+		PartitionManager.Unlock_Block_Partitions();
 		Repack_Options_struct Repack_Options;
 		Repack_Options.Disable_Verity = false;
 		Repack_Options.Disable_Force_Encrypt = false;
diff --git a/twrpinstall/twinstall.cpp b/twrpinstall/twinstall.cpp
index 7975a978..6805a2f0 100755
--- a/twrpinstall/twinstall.cpp
+++ b/twrpinstall/twinstall.cpp
@@ -342,6 +342,7 @@ int TWinstall_zip(const char* path, int* wipe_cache, bool check_for_digest) {
 			if (!system_mount_state)
 				PartitionManager.UnMount_By_Path(PartitionManager.Get_Android_Root_Path(), false);
 			if (android::base::GetBoolProperty("ro.virtual_ab.enabled", false)) {
+				PartitionManager.Unlock_Block_Partitions();
 				PartitionManager.Prepare_All_Super_Volumes();
 				gui_warn("mount_vab_partitions=Devices on super may not mount until rebooting recovery.");
 			}
diff --git a/variables.h b/variables.h
index 661bb481..4769dc71 100755
--- a/variables.h
+++ b/variables.h
@@ -17,7 +17,7 @@
 #ifndef _VARIABLES_HEADER_
 #define _VARIABLES_HEADER_
 
-#define TW_MAIN_VERSION_STR       "3.6.1_11"
+#define TW_MAIN_VERSION_STR       "3.7.0_11"
 #define TW_VERSION_STR TW_MAIN_VERSION_STR TW_DEVICE_VERSION
 #define TW_SETTINGS_FILE            ".twrps"
 #define TW_RECOVERY_NAME            "TWRP"
@@ -147,6 +147,7 @@
 #define TW_NO_SHA2                  "tw_no_sha2"
 #define TW_UNMOUNT_SYSTEM           "tw_unmount_system"
 #define TW_IS_SUPER                 "tw_is_super"
+#define TW_VIRTUAL_AB_ENABLED       "tw_virtual_ab.enabled"
 #define TW_AUTO_REFLASHTWRP_VAR     "tw_auto_reflashtwrp"
 
 // Theme versioning