Update Readme files

Change version code and version name Update some strings
2026-03-23 19:15:58 +00:00 · 2024-11-30 17:07:02 +08:00
parent 690ac876ab
commit c90325e1c3
14 changed files with 180 additions and 152 deletions
--- a/app/src/main/java/com/bintianqi/owndroid/MainActivity.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/MainActivity.kt
@@ -157,14 +157,14 @@ fun Home(vm: MyViewModel) {
        popExitTransition = Animations.navHostPopExitTransition
    ) {
        composable(route = "HomePage") { HomePage(navCtrl) }
-        composable(route = "SystemManage") { SystemManage(navCtrl) }
+        composable(route = "System") { SystemManage(navCtrl) }
        composable(route = "ManagedProfile") { ManagedProfile(navCtrl) }
        composable(route = "Permissions") { DpmPermissions(navCtrl) }
-        composable(route = "ApplicationManage") { ApplicationManage(navCtrl, dialogStatus) }
+        composable(route = "Applications") { ApplicationManage(navCtrl, dialogStatus) }
        composable(route = "UserRestriction") { UserRestriction(navCtrl) }
-        composable(route = "UserManage") { UserManage(navCtrl) }
+        composable(route = "Users") { UserManage(navCtrl) }
        composable(route = "Password") { Password(navCtrl) }
-        composable(route = "AppSetting") { AppSetting(navCtrl, vm) }
+        composable(route = "Settings") { AppSetting(navCtrl, vm) }
        composable(route = "Network") { Network(navCtrl) }
        composable(route = "PackageSelector") { PackageSelector(navCtrl) }
    }
@@ -237,7 +237,7 @@ private fun HomePage(navCtrl:NavHostController) {
                if(activateType != "") { Text(text = activateType, color = colorScheme.onPrimary) }
            }
        }
-        HomePageItem(R.string.system_manage, R.drawable.mobile_phone_fill0, "SystemManage", navCtrl)
+        HomePageItem(R.string.system, R.drawable.android_fill0, "System", navCtrl)
        if(deviceOwner || profileOwner) { HomePageItem(R.string.network, R.drawable.wifi_fill0, "Network", navCtrl) }
        if(
            (VERSION.SDK_INT < 24 && !deviceOwner) || (
@@ -247,13 +247,13 @@ private fun HomePage(navCtrl:NavHostController) {
        ) {
            HomePageItem(R.string.work_profile, R.drawable.work_fill0, "ManagedProfile", navCtrl)
        }
-        if(deviceOwner || profileOwner) HomePageItem(R.string.app_manager, R.drawable.apps_fill0, "ApplicationManage", navCtrl)
+        if(deviceOwner || profileOwner) HomePageItem(R.string.applications, R.drawable.apps_fill0, "Applications", navCtrl)
        if(VERSION.SDK_INT >= 24 && (profileOwner || deviceOwner)) {
            HomePageItem(R.string.user_restrict, R.drawable.person_off, "UserRestriction", navCtrl)
        }
-        HomePageItem(R.string.user_manager,R.drawable.manage_accounts_fill0,"UserManage", navCtrl)
+        HomePageItem(R.string.users,R.drawable.manage_accounts_fill0,"Users", navCtrl)
        HomePageItem(R.string.password_and_keyguard, R.drawable.password_fill0, "Password", navCtrl)
-        HomePageItem(R.string.setting, R.drawable.settings_fill0, "AppSetting", navCtrl)
+        HomePageItem(R.string.settings, R.drawable.settings_fill0, "Settings", navCtrl)
        Spacer(Modifier.padding(vertical = 20.dp))
    }
 }
--- a/app/src/main/java/com/bintianqi/owndroid/Settings.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/Settings.kt
@@ -78,7 +78,7 @@ fun AppSetting(navCtrl:NavHostController, vm: MyViewModel) {
 private fun Home(navCtrl: NavHostController) {
    Column(modifier = Modifier.fillMaxSize()) {
        SubPageItem(R.string.options, "", R.drawable.tune_fill0) { navCtrl.navigate("Options") }
-        SubPageItem(R.string.theme, "", R.drawable.format_paint_fill0) { navCtrl.navigate("Theme") }
+        SubPageItem(R.string.appearance, "", R.drawable.format_paint_fill0) { navCtrl.navigate("Theme") }
        SubPageItem(R.string.security, "", R.drawable.lock_fill0) { navCtrl.navigate("Auth") }
        SubPageItem(R.string.automation_api, "", R.drawable.apps_fill0) { navCtrl.navigate("Automation") }
        SubPageItem(R.string.about, "", R.drawable.info_fill0) { navCtrl.navigate("About") }
@@ -240,12 +240,12 @@ private fun About() {
        Spacer(Modifier.padding(vertical = 5.dp))
        Text(text = stringResource(R.string.app_name)+" v$verName ($verCode)", modifier = Modifier.padding(start = 26.dp))
        Spacer(Modifier.padding(vertical = 5.dp))
-        SubPageItem(R.string.source_code, "", R.drawable.open_in_new) { shareLink(context, "https://github.com/BinTianqi/OwnDroid") }
+        SubPageItem(R.string.project_homepage, "GitHub", R.drawable.open_in_new) { shareLink(context, "https://github.com/BinTianqi/OwnDroid") }
    }
 }

-fun shareLink(inputContext:Context,link:String) {
+fun shareLink(inputContext: Context, link: String) {
    val uri = Uri.parse(link)
    val intent = Intent(Intent.ACTION_VIEW, uri)
-    inputContext.startActivity(Intent.createChooser(intent, "Open in browser"),null)
+    inputContext.startActivity(Intent.createChooser(intent, "Open in browser"), null)
 }
--- a/app/src/main/java/com/bintianqi/owndroid/Utils.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/Utils.kt
@@ -70,11 +70,7 @@ val exportFilePath = MutableStateFlow<String?>(null)
 fun registerActivityResult(context: ComponentActivity){
    getFile = context.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { activityResult ->
        activityResult.data.let {
-            if(it == null){
-                Toast.makeText(context.applicationContext, R.string.file_not_exist, Toast.LENGTH_SHORT).show()
-            } else {
-                fileUriFlow.value = it.data
-            }
+            if(it != null) fileUriFlow.value = it.data
        }
    }
    createManagedProfile = context.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {}
--- a/app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt
--- a/app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt
@@ -165,7 +165,7 @@ fun Network(navCtrl: NavHostController) {
        AlertDialog(
            onDismissRequest = { wifiMacDialog.value = false },
            confirmButton = { TextButton(onClick = { wifiMacDialog.value = false }) { Text(stringResource(R.string.confirm)) } },
-            title = { Text(stringResource(R.string.wifi_mac_addr)) },
+            title = { Text(stringResource(R.string.wifi_mac_address)) },
            text = {
                val mac = dpm.getWifiMacAddress(receiver)
                OutlinedTextField(
@@ -199,7 +199,7 @@ private fun Home(navCtrl:NavHostController, scrollState: ScrollState, wifiMacDia
            modifier = Modifier.padding(top = 8.dp, bottom = 5.dp, start = 16.dp)
        )
        if(VERSION.SDK_INT >= 24 && (deviceOwner || dpm.isOrgProfile(receiver))) {
-            SubPageItem(R.string.wifi_mac_addr, "", R.drawable.wifi_fill0) { wifiMacDialog.value = true }
+            SubPageItem(R.string.wifi_mac_address, "", R.drawable.wifi_fill0) { wifiMacDialog.value = true }
        }
        if(VERSION.SDK_INT >= 30) {
            SubPageItem(R.string.options, "", R.drawable.tune_fill0) { navCtrl.navigate("Switches") }
--- a/app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt
@@ -147,7 +147,7 @@ fun SystemManage(navCtrl: NavHostController) {
            TopBar(backStackEntry,navCtrl,localNavCtrl) {
                if(backStackEntry?.destination?.route=="Home"&&scrollState.maxValue > 100) {
                    Text(
-                        text = stringResource(R.string.system_manage),
+                        text = stringResource(R.string.system),
                        modifier = Modifier.alpha((maxOf(scrollState.value-30,0)).toFloat()/80)
                    )
                }
@@ -196,7 +196,7 @@ private fun Home(navCtrl: NavHostController, scrollState: ScrollState) {
    var dialog by remember { mutableIntStateOf(0) }
    Column(modifier = Modifier.fillMaxSize().verticalScroll(scrollState)) {
        Text(
-            text = stringResource(R.string.system_manage),
+            text = stringResource(R.string.system),
            style = typography.headlineLarge,
            modifier = Modifier.padding(top = 8.dp, bottom = 5.dp, start = 16.dp)
        )
@@ -211,8 +211,8 @@ private fun Home(navCtrl: NavHostController, scrollState: ScrollState) {
            SubPageItem(R.string.bug_report, "", R.drawable.bug_report_fill0) { dialog = 2 }
        }
        if(VERSION.SDK_INT >= 28 && (deviceOwner || dpm.isOrgProfile(receiver))) {
-            SubPageItem(R.string.edit_time, "", R.drawable.schedule_fill0) { navCtrl.navigate("EditTime") }
-            SubPageItem(R.string.edit_timezone, "", R.drawable.schedule_fill0) { navCtrl.navigate("EditTimeZone") }
+            SubPageItem(R.string.change_time, "", R.drawable.schedule_fill0) { navCtrl.navigate("EditTime") }
+            SubPageItem(R.string.change_timezone, "", R.drawable.schedule_fill0) { navCtrl.navigate("EditTimeZone") }
        }
        if(VERSION.SDK_INT >= 23 && (deviceOwner || profileOwner)) {
            SubPageItem(R.string.permission_policy, "", R.drawable.key_fill0) { navCtrl.navigate("PermissionPolicy") }
@@ -438,13 +438,13 @@ private fun EditTime() {
    var inputTime by remember { mutableStateOf("") }
    Column(modifier = Modifier.fillMaxSize().padding(horizontal = 8.dp).verticalScroll(rememberScrollState())) {
        Spacer(Modifier.padding(vertical = 10.dp))
-        Text(text = stringResource(R.string.edit_time), style = typography.headlineLarge)
+        Text(text = stringResource(R.string.change_time), style = typography.headlineLarge)
        Spacer(Modifier.padding(vertical = 5.dp))
        OutlinedTextField(
            value = inputTime,
            label = { Text(stringResource(R.string.time_unit_ms)) },
            onValueChange = { inputTime = it },
-            supportingText = { Text(stringResource(R.string.info_edit_time)) },
+            supportingText = { Text(stringResource(R.string.info_change_time)) },
            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number, imeAction = ImeAction.Done),
            keyboardActions = KeyboardActions(onDone = {focusMgr.clearFocus() }),
            modifier = Modifier.fillMaxWidth()
@@ -473,7 +473,7 @@ private fun EditTimeZone() {
        horizontalAlignment = Alignment.CenterHorizontally
    ) {
        Spacer(Modifier.padding(vertical = 10.dp))
-        Text(text = stringResource(R.string.edit_timezone), style = typography.headlineLarge, modifier = Modifier.align(Alignment.Start))
+        Text(text = stringResource(R.string.change_timezone), style = typography.headlineLarge, modifier = Modifier.align(Alignment.Start))
        Spacer(Modifier.padding(vertical = 5.dp))
        OutlinedTextField(
            value = inputTimezone,
--- a/app/src/main/java/com/bintianqi/owndroid/dpm/UserManager.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/dpm/UserManager.kt
@@ -95,7 +95,7 @@ fun UserManage(navCtrl: NavHostController) {
            TopBar(backStackEntry, navCtrl, localNavCtrl) {
                if(backStackEntry?.destination?.route == "Home" && scrollState.maxValue > 100) {
                    Text(
-                        text = stringResource(R.string.user_manager),
+                        text = stringResource(R.string.users),
                        modifier = Modifier.alpha((maxOf(scrollState.value-30, 0)).toFloat() / 80)
                    )
                }
@@ -134,7 +134,7 @@ private fun Home(navCtrl: NavHostController,scrollState: ScrollState) {
    var dialog by remember { mutableIntStateOf(0) }
    Column(modifier = Modifier.fillMaxSize().verticalScroll(scrollState)) {
        Text(
-            text = stringResource(R.string.user_manager),
+            text = stringResource(R.string.users),
            style = typography.headlineLarge,
            modifier = Modifier.padding(top = 8.dp, bottom = 5.dp, start = 16.dp)
        )
@@ -153,7 +153,7 @@ private fun Home(navCtrl: NavHostController,scrollState: ScrollState) {
            SubPageItem(R.string.logout_current_user, "", R.drawable.logout_fill0) { dialog = 2 }
        }
        if(deviceOwner || profileOwner) {
-            SubPageItem(R.string.edit_username, "", R.drawable.edit_fill0) { navCtrl.navigate("EditUsername") }
+            SubPageItem(R.string.change_username, "", R.drawable.edit_fill0) { navCtrl.navigate("EditUsername") }
        }
        if(VERSION.SDK_INT >= 23 && (deviceOwner || profileOwner)) {
            SubPageItem(R.string.change_user_icon, "", R.drawable.account_circle_fill0) { navCtrl.navigate("ChangeUserIcon") }
@@ -174,9 +174,13 @@ private fun Home(navCtrl: NavHostController,scrollState: ScrollState) {
                val um = context.getSystemService(Context.USER_SERVICE) as UserManager
                val list = dpm.getSecondaryUsers(receiver)
                Column {
-                    Text("(" + stringResource(R.string.serial_number) + ")")
-                    list.forEach {
-                        Text(um.getSerialNumberForUser(it).toString())
+                    if(list.isEmpty()) {
+                        Text(stringResource(R.string.no_secondary_users))
+                    } else {
+                        Text("(" + stringResource(R.string.serial_number) + ")")
+                        list.forEach {
+                            Text(um.getSerialNumberForUser(it).toString())
+                        }
                    }
                }
            }
@@ -492,7 +496,7 @@ private fun Username() {
    var inputUsername by remember { mutableStateOf("") }
    Column(modifier = Modifier.fillMaxSize().padding(horizontal = 8.dp).verticalScroll(rememberScrollState())) {
        Spacer(Modifier.padding(vertical = 10.dp))
-        Text(text = stringResource(R.string.edit_username), style = typography.headlineLarge)
+        Text(text = stringResource(R.string.change_username), style = typography.headlineLarge)
        Spacer(Modifier.padding(vertical = 5.dp))
        OutlinedTextField(
            value = inputUsername,
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -125,7 +125,7 @@


    <!--Системные-->
-    <string name="system_manage">Управление системой</string>
+    <string name="system">Syetem</string> <!--TODO-->
    <string name="disable_cam">Отключить камеру</string>
    <string name="disable_screen_capture">Отключить захват экрана</string>
    <string name="disable_status_bar">Отключить строку состояния</string>
@@ -143,8 +143,8 @@
    <string name="bug_report">Отчет об ошибке</string>
    <string name="confirm_bug_report">Запросить отчет об ошибке?</string>
    <string name="reboot">Перезагрузить</string>
-    <string name="edit_time">Изменить время</string>
-    <string name="edit_timezone">Изменить часовой пояс</string>
+    <string name="change_time">Change time</string> <!--TODO-->
+    <string name="change_timezone">Change timezone</string> <!--TODO-->
    <string name="timezone_id">Идентификатор часового пояса</string>
    <string name="disable_auto_time_zone_before_set">Автоматический часовой пояс должен быть отключен перед установкой пользовательского часового пояса.</string>
    <string name="permission_policy">Политика разрешений</string>
@@ -214,7 +214,7 @@

    <!--Сеть-->
    <string name="network">Сеть</string>
-    <string name="wifi_mac_addr">MAC-адрес Wi-Fi</string>
+    <string name="wifi_mac_address">MAC-адрес Wi-Fi</string>
    <string name="min_wifi_security_level">Минимальный уровень безопасности Wi-Fi</string>
    <string name="wifi_security_open">Открытая</string>
    <string name="lockdown_admin_configured_network">Блокировка ети, настроенной администратором</string>
@@ -305,7 +305,7 @@


    <!--Управление приложениями-->
-    <string name="app_manager">Управление приложениями</string>
+    <string name="applications">Приложения</string>
    <string name="pkg_selector">Выбор пакета</string>
    <string name="loading">Загрузка</string>
    <string name="show_user_app">Показывать пользовательские приложения</string>
@@ -372,8 +372,6 @@
    <string name="some_features_invalid_in_work_profile">Функции в рабочем профиле ограничены.</string>
    <string name="network_internet">Сеть</string>
    <string name="more_connectivity">Другие подключения</string>
-    <string name="applications">Приложения</string>
-    <string name="users">Пользователь</string>
    <string name="media">Медиа</string>
    <string name="other">Другое</string>
    <string name="require_device_owner">Требуется владелец устройства</string>
@@ -444,9 +442,9 @@


    <!--Управление пользователями-->
-    <string name="user_manager">Управление пользователями</string>
+    <string name="users">Users</string> <!--TODO-->
    <string name="enable_logout">Разрешить выход из системы</string>
-    <string name="edit_username">Изменить имя пользователя</string>
+    <string name="change_username">Change username</string> <!--TODO-->
    <string name="start_user_session_msg">Сообщение о начале сеанса пользователя</string>
    <string name="end_user_session_msg">Сообщение об окончании сеанса пользователя</string>
    <string name="user_info">Информация о пользователе</string>
@@ -465,6 +463,7 @@
    <string name="user_not_exist">User does not exist</string> <!--TODO-->
    <string name="serial_number">Серийный номер</string>
    <string name="secondary_users">Secondary users</string> <!--TODO-->
+    <string name="no_secondary_users">No secondary users</string> <!--TODO-->
    <string name="use_uid">Использовать UID</string>
    <string name="logout_current_user">Выйти из текущего пользователя</string>
    <string name="start_in_background">Запустить в фоновом режиме</string>
@@ -543,15 +542,15 @@


    <!--Настройки и о программе-->
-    <string name="setting">Настройки</string>
+    <string name="settings">Настройки</string>
    <string name="show_dangerous_features">Показывать опасные функции</string>
    <string name="material_you_color">Цвет Material You</string>
    <string name="dark_theme">Dark theme</string> <!--TODO-->
    <string name="follow_system">Follow system</string> <!--TODO-->
    <string name="black_theme">Black theme</string> <!--TODO-->
    <string name="about">О приложении</string>
-    <string name="source_code">Исходный код</string>
-    <string name="theme">Тема</string>
+    <string name="project_homepage">Project homepage</string> <!--TODO-->
+    <string name="appearance">Appearance</string> <!--TODO-->

    <string name="security">Безопасность</string>
    <string name="lock_owndroid">Заблокировать OwnDroid</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -126,7 +126,7 @@
    <string name="shizuku_not_bind">Shizuku Bağlantısı Kesildi</string>

    <!--System-->
-    <string name="system_manage">Sistem yöneticisi</string>
+    <string name="system">Sistem</string>
    <string name="disable_cam">Kamerayı devre dışı bırak</string>
    <string name="disable_screen_capture">Ekran görüntüsünü devre dışı bırak</string>
    <string name="disable_status_bar">Durum çubuğunu devre dışı bırak</string>
@@ -144,8 +144,8 @@
    <string name="bug_report">Hata raporu</string>
    <string name="confirm_bug_report">Hata raporu iste?</string>
    <string name="reboot">Yeniden başlat</string>
-    <string name="edit_time">Zamanı düzenle</string>
-    <string name="edit_timezone">Saat dilimini düzenle</string>
+    <string name="change_time">Change time</string> <!--TODO-->
+    <string name="change_timezone">Change timezone</string><!--TODO-->
    <string name="timezone_id">Saat dilimi kimliği</string>
    <string name="disable_auto_time_zone_before_set">Özel bir saat dilimi ayarlamadan önce otomatik saat dilimi devre dışı bırakılmalıdır</string>
    <string name="permission_policy">İzin politikası</string>
@@ -215,11 +215,11 @@

    <!--Network-->
    <string name="network">Ağ</string>
-    <string name="wifi_mac_addr">Wi-Fi MAC adresi</string>
+    <string name="wifi_mac_address">Wi-Fi MAC adresi</string>
    <string name="min_wifi_security_level">Minimum Wi-Fi güvenlik seviyesi</string>
    <string name="wifi_security_open">Açık</string>
    <string name="lockdown_admin_configured_network">Yönetici tarafından yapılandırılmış ağı kilitle</string>
-    <string name="wifi_ssid_policy">WiFi SSID politikası</string>
+    <string name="wifi_ssid_policy">Wi-Fi SSID politikası</string>
    <string name="ssid_list_is">SSID listesi:</string>
    <string name="already_exist">Zaten mevcut</string>
    <string name="private_dns">Özel DNS</string>
@@ -241,7 +241,7 @@
    <string name="log_file_size_is">Log file size: %1$s</string> <!--TODO-->
    <string name="delete_logs">Delete logs</string> <!--TODO-->
    <string name="export_logs">Export logs</string> <!--TODO-->
-    <string name="wifi_auth_keypair">WiFi anahtar çifti</string>
+    <string name="wifi_auth_keypair">Wi-Fi anahtar çifti</string>
    <string name="keypair">Anahtar çifti</string>
    <string name="preferential_network_service">Tercihli ağ hizmeti</string>
    <string name="network_id">Network ID</string> <!--TODO-->
@@ -302,8 +302,8 @@
    <string name="length_6_to_64">Uzunluk 6 ile 64 karakter arasında olmalıdır</string>
    <string name="delete_work_profile">Delete work profile</string> <!--TODO-->

-    <!--AppManager-->
-    <string name="app_manager">Uygulama yöneticisi</string>
+    <!--Applications-->
+    <string name="applications">Uygulamalar</string>
    <string name="pkg_selector">Paket seçici</string>
    <string name="loading">Yükleniyor</string>
    <string name="show_user_app">Kullanıcı uygulamalarını göster</string>
@@ -371,21 +371,19 @@
    <string name="some_features_invalid_in_work_profile">İş profilindeki işlevler sınırlıdır. </string>
    <string name="network_internet">Ağ</string>
    <string name="more_connectivity">Diğer bağlantı</string>
-    <string name="applications">Uygulamalar</string>
-    <string name="users">Kullanıcı</string>
    <string name="media">Medya</string>
    <string name="other">Diğer</string>
    <string name="require_device_owner">Cihaz sahibi gerektirir</string>
    <string name="config_mobile_network">Mobil ağı yapılandır</string>
-    <string name="config_wifi">WiFi\'yi yapılandır</string>
+    <string name="config_wifi">Wi-Fi\'yi yapılandır</string>
    <string name="data_roaming">Veri dolaşımı</string>
    <string name="cellular_2g">2G hücresel</string>
    <string name="ultra_wideband_radio">Ultra geniş bant radyo</string>
-    <string name="add_wifi_conf">WiFi yapılandırması ekle</string>
-    <string name="change_wifi_state">WiFi durumunu değiştir</string>
-    <string name="wifi_direct">WiFi direct</string>
-    <string name="wifi_tethering">WiFi tethering</string>
-    <string name="share_admin_wifi">Yönetici yapılandırılmış WiFi paylaş</string>
+    <string name="add_wifi_conf">Wi-Fi yapılandırması ekle</string>
+    <string name="change_wifi_state">Wi-Fi durumunu değiştir</string>
+    <string name="wifi_direct">Wi-Fi direct</string>
+    <string name="wifi_tethering">Wi-Fi tethering</string>
+    <string name="share_admin_wifi">Yönetici yapılandırılmış Wi-Fi paylaş</string>
    <string name="network_reset">Ağ sıfırlama</string>
    <string name="config_tethering">Tethering yapılandır</string>
    <string name="config_vpn">VPN yapılandır</string>
@@ -441,10 +439,10 @@
    <string name="safe_boot">Güvenli başlangıç</string>
    <string name="debug_features">Hata ayıklama özellikleri</string>

-    <!--UserManage-->
-    <string name="user_manager">Kullanıcı yöneticisi</string>
+    <!--Users-->
+    <string name="users">Users</string> <!--TODO-->
    <string name="enable_logout">Enable logout</string> <!--TODO-->
-    <string name="edit_username">Kullanıcı adını düzenle</string>
+    <string name="change_username">Change username</string> <!--TODO-->
    <string name="start_user_session_msg">Kullanıcı oturumunu başlat mesajı</string>
    <string name="end_user_session_msg">Kullanıcı oturumunu sonlandır mesajı</string>
    <string name="user_info">Kullanıcı bilgisi</string>
@@ -460,6 +458,7 @@
    <string name="user_id">Kullanıcı ID</string>
    <string name="user_serial_number">Kullanıcı seri numarası</string>
    <string name="secondary_users">Secondary users</string> <!--TODO-->
+    <string name="no_secondary_users">No secondary users</string> <!--TODO-->
    <string name="user_operation">Kullanıcı işlemi</string>
    <string name="user_not_exist">User does not exist</string> <!--TODO-->
    <string name="serial_number">Seri numarası</string>
@@ -538,15 +537,15 @@
    <string name="activate_reset_password_token_here">Şifre sıfırlama jetonunu burada etkinleştirin.</string>

    <!--Settings&About-->
-    <string name="setting">Ayarlar</string>
+    <string name="settings">Ayarlar</string>
    <string name="show_dangerous_features">Show dangerous features</string> <!--TODO-->
    <string name="material_you_color">Material You rengi</string>
    <string name="dark_theme">Dark theme</string> <!--TODO-->
    <string name="follow_system">Follow system</string> <!--TODO-->
    <string name="black_theme">Black theme</string> <!--TODO-->
    <string name="about">Hakkında</string>
-    <string name="source_code">Kaynak kodu</string>
-    <string name="theme">Tema</string>
+    <string name="project_homepage">Project homepage</string> <!--TODO-->
+    <string name="appearance">Appearance</string> <!--TODO-->

    <string name="security">Güvenlik</string>
    <string name="lock_owndroid">OwnDroid\'u kilitle</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -121,7 +121,7 @@
    <string name="bind_shizuku">连接Shizuku</string>

    <!--System-->
-    <string name="system_manage">系统</string>
+    <string name="system">系统</string>
    <string name="disable_cam">禁用相机</string>
    <string name="disable_screen_capture">禁止屏幕捕获</string>
    <string name="disable_status_bar">禁用状态栏</string>
@@ -139,8 +139,8 @@
    <string name="bug_report">错误报告</string>
    <string name="confirm_bug_report">请求错误报告？</string>
    <string name="reboot">重启</string>
-    <string name="edit_time">修改时间</string>
-    <string name="edit_timezone">修改时区</string>
+    <string name="change_time">更改时间</string>
+    <string name="change_timezone">更改时区</string>
    <string name="timezone_id">时区ID</string>
    <string name="disable_auto_time_zone_before_set">在设置时区前需要关闭自动时区</string>
    <string name="permission_policy">权限策略</string>
@@ -210,11 +210,11 @@

    <!--Network-->
    <string name="network">网络</string>
-    <string name="wifi_mac_addr">Wi-Fi Mac地址</string>
-    <string name="min_wifi_security_level">最低WiFi安全等级</string>
+    <string name="wifi_mac_address">Wi-Fi Mac地址</string>
+    <string name="min_wifi_security_level">最低Wi-Fi安全等级</string>
    <string name="wifi_security_open">开放</string>
    <string name="lockdown_admin_configured_network">锁定由管理员配置的网络</string>
-    <string name="wifi_ssid_policy">WiFi SSID策略</string>
+    <string name="wifi_ssid_policy">Wi-Fi SSID策略</string>
    <string name="ssid_list_is">SSID列表：</string>
    <string name="already_exist">已经存在</string>
    <string name="private_dns">私人DNS</string>
@@ -236,7 +236,7 @@
    <string name="log_file_size_is">日志文件大小：%1$s</string>
    <string name="delete_logs">删除日志</string>
    <string name="export_logs">导出日志</string>
-    <string name="wifi_auth_keypair">WiFi密钥对</string>
+    <string name="wifi_auth_keypair">Wi-Fi密钥对</string>
    <string name="keypair">密钥对</string>
    <string name="preferential_network_service">首选网络服务</string>
    <string name="network_id">网络ID</string>
@@ -297,8 +297,8 @@
    <string name="length_6_to_64">长度应在6~64个字符之间</string>
    <string name="delete_work_profile">删除工作资料</string>

-    <!--AppManage-->
-    <string name="app_manager">应用管理</string>
+    <!--Applications-->
+    <string name="applications">应用程序</string>
    <string name="pkg_selector">应用选择器</string>
    <string name="loading">加载中</string>
    <string name="show_user_app">显示用户应用</string>
@@ -363,8 +363,6 @@
    <string name="some_features_invalid_in_work_profile">工作资料中部分功能无效</string>
    <string name="network_internet">网络和互联网</string>
    <string name="more_connectivity">更多连接</string>
-    <string name="applications">应用</string>
-    <string name="users">用户</string>
    <string name="media">媒体</string>
    <string name="other">其他</string>
    <string name="require_device_owner">需要DeviceOwner</string>
@@ -373,11 +371,11 @@
    <string name="data_roaming">数据漫游</string>
    <string name="cellular_2g">使用2G(GSM)</string>
    <string name="ultra_wideband_radio">超宽频段无线电</string>
-    <string name="add_wifi_conf">添加WiFi配置</string>
-    <string name="change_wifi_state">修改WiFi状态</string>
-    <string name="wifi_direct">WiFi直连</string>
-    <string name="wifi_tethering">WiFi共享</string>
-    <string name="share_admin_wifi">分享设备管理器配置的WiFi</string>
+    <string name="add_wifi_conf">添加Wi-Fi配置</string>
+    <string name="change_wifi_state">修改Wi-Fi状态</string>
+    <string name="wifi_direct">Wi-Fi直连</string>
+    <string name="wifi_tethering">Wi-Fi共享</string>
+    <string name="share_admin_wifi">分享设备管理器配置的Wi-Fi</string>
    <string name="network_reset">重置网络</string>
    <string name="config_tethering">配置网络共享</string>
    <string name="config_vpn">配置VPN</string>
@@ -433,10 +431,10 @@
    <string name="safe_boot">安全模式</string>
    <string name="debug_features">调试功能</string>

-    <!--UserManage-->
-    <string name="user_manager">用户管理</string>
+    <!--Users-->
+    <string name="users">用户</string>
    <string name="enable_logout">允许登出</string>
-    <string name="edit_username">修改用户名</string>
+    <string name="change_username">更改用户名</string>
    <string name="start_user_session_msg">用户会话开始消息</string>
    <string name="end_user_session_msg">用户会话结束消息</string>
    <string name="user_info">用户信息</string>
@@ -452,6 +450,7 @@
    <string name="user_id">当前UserID</string>
    <string name="user_serial_number">当前用户序列号</string>
    <string name="secondary_users">次要用户</string>
+    <string name="no_secondary_users">无次要用户</string>
    <string name="user_operation">用户操作</string>
    <string name="user_not_exist">用户不存在</string>
    <string name="serial_number">序列号</string>
@@ -530,15 +529,15 @@
    <string name="activate_reset_password_token_here">在这里激活密码重置令牌</string>

    <!--Settings&About-->
-    <string name="setting">设置</string>
+    <string name="settings">设置</string>
    <string name="show_dangerous_features">显示危险功能</string>
    <string name="material_you_color">Material you 颜色</string>
    <string name="dark_theme">深色主题</string>
    <string name="follow_system">跟随系统</string>
    <string name="black_theme">黑色主题</string>
    <string name="about">关于</string>
-    <string name="source_code">源代码</string>
-    <string name="theme">主题</string>
+    <string name="project_homepage">项目主页</string>
+    <string name="appearance">外观</string>

    <string name="security">安全</string>
    <string name="lock_owndroid">锁定OwnDroid</string>
@@ -608,7 +607,7 @@
    <string name="info_disable_keyguard">禁用锁屏相当于把锁屏方式设置为“无”。在已设置密码或图案时使用这个功能无效。如果在锁屏禁用时设置密码或图案，锁屏将启用</string>
    <string name="info_evict_credential_encryption_key">从密钥环中移除用户的凭证加密密钥。用户需要再次输入凭证才能将密钥存储回密钥环中。为了保护用户数据，用户将重新启动</string>
    <string name="info_reboot">打电话时不能使用此功能</string>
-    <string name="info_edit_time">输入以毫秒为单位的UNIX时间</string>
+    <string name="info_change_time">输入以毫秒为单位的UNIX时间</string>
    <string name="info_permission_policy">设置应用申请运行时权限时的默认选择</string>
    <string name="info_mte_policy">设置内存标记扩展(Memory Tagging Extension)策略。重启设备以应用更改。</string>
    <string name="info_nearby_app_streaming_policy">应用流式传输：当app在虚拟显示器上启动，传输这个app的视频流到附近的设备。</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -131,7 +131,7 @@
    <string name="shizuku_not_bind">Shizuku disconnected</string>

    <!--System-->
-    <string name="system_manage">System manager</string>
+    <string name="system">System</string>
    <string name="disable_cam">Disable camera</string>
    <string name="disable_screen_capture">Disable screen capture</string>
    <string name="disable_status_bar">Disable status bar</string>
@@ -149,8 +149,8 @@
    <string name="bug_report">Bug report</string>
    <string name="confirm_bug_report">Request bug report?</string>
    <string name="reboot">Reboot</string>
-    <string name="edit_time">Edit time</string>
-    <string name="edit_timezone">Edit timezone</string>
+    <string name="change_time">Change time</string>
+    <string name="change_timezone">Change timezone</string>
    <string name="timezone_id">Timezone ID</string>
    <string name="disable_auto_time_zone_before_set">Auto timezone should be disabled before set a custom timezone. </string>
    <string name="permission_policy">Permission policy</string>
@@ -220,11 +220,11 @@

    <!--Network-->
    <string name="network">Network</string>
-    <string name="wifi_mac_addr">Wi-Fi Mac address</string>
+    <string name="wifi_mac_address">Wi-Fi Mac address</string>
    <string name="min_wifi_security_level">Minimum Wi-Fi security level</string>
    <string name="wifi_security_open">Open</string>
    <string name="lockdown_admin_configured_network">Lockdown admin configured network</string>
-    <string name="wifi_ssid_policy">WiFi SSID policy</string>
+    <string name="wifi_ssid_policy">Wi-Fi SSID policy</string>
    <string name="ssid_list_is">SSID list:</string>
    <string name="already_exist">Already exist</string>
    <string name="private_dns">Private DNS</string>
@@ -246,7 +246,7 @@
    <string name="log_file_size_is">Log file size: %1$s</string>
    <string name="delete_logs">Delete logs</string>
    <string name="export_logs">Export logs</string>
-    <string name="wifi_auth_keypair">WiFi keypair</string>
+    <string name="wifi_auth_keypair">Wi-Fi keypair</string>
    <string name="keypair">Keypair</string>
    <string name="preferential_network_service">Preferential network service</string>
    <string name="network_id">Network ID</string>
@@ -310,8 +310,8 @@
    <string name="length_6_to_64">The length should be between 6~64 characters</string>
    <string name="delete_work_profile">Delete work profile</string>

-    <!--AppManager-->
-    <string name="app_manager">App manager</string>
+    <!--Applications-->
+    <string name="applications">Applications</string>
    <string name="pkg_selector">Package selector</string>
    <string name="loading">Loading</string>
    <string name="show_user_app">Show user apps</string>
@@ -377,21 +377,19 @@
    <string name="some_features_invalid_in_work_profile">Functions in work profile is limited. </string>
    <string name="network_internet">Network</string>
    <string name="more_connectivity">Other connection</string>
-    <string name="applications">Applications</string>
-    <string name="users">User</string>
    <string name="media">Media</string>
    <string name="other">Other</string>
    <string name="require_device_owner">Require device owner</string>
    <string name="config_mobile_network">Configure mobile network</string>
-    <string name="config_wifi">Configure WiFi</string>
+    <string name="config_wifi">Configure Wi-Fi</string>
    <string name="data_roaming">Data roaming</string>
    <string name="cellular_2g">2G cellular</string>
    <string name="ultra_wideband_radio">Ultra wideband radio</string>
-    <string name="add_wifi_conf">Add WiFi config</string>
-    <string name="change_wifi_state">Change WiFi status</string>
-    <string name="wifi_direct">WiFi direct</string>
-    <string name="wifi_tethering">WiFi tethering</string>
-    <string name="share_admin_wifi">Share admin configured WiFi</string>
+    <string name="add_wifi_conf">Add Wi-Fi config</string>
+    <string name="change_wifi_state">Change Wi-Fi status</string>
+    <string name="wifi_direct">Wi-Fi direct</string>
+    <string name="wifi_tethering">Wi-Fi tethering</string>
+    <string name="share_admin_wifi">Share admin configured Wi-Fi</string>
    <string name="network_reset">Reset network</string>
    <string name="config_tethering">Configure tethering</string>
    <string name="config_vpn">Configure VPN</string>
@@ -447,10 +445,10 @@
    <string name="safe_boot">Safe boot</string>
    <string name="debug_features">Debug features</string>

-    <!--UserManage-->
-    <string name="user_manager">User manager</string>
+    <!--Users-->
+    <string name="users">Users</string>
    <string name="enable_logout">Enable logout</string>
-    <string name="edit_username">Edit username</string>
+    <string name="change_username">Change username</string>
    <string name="start_user_session_msg">Start user session message</string>
    <string name="end_user_session_msg">End user session message</string>
    <string name="user_info">User info</string>
@@ -466,6 +464,7 @@
    <string name="user_id">UserID</string>
    <string name="user_serial_number">User serial number</string>
    <string name="secondary_users">Secondary users</string>
+    <string name="no_secondary_users">No secondary users</string>
    <string name="user_operation">User operation</string>
    <string name="user_not_exist">User does not exist</string>
    <string name="serial_number">Serial number</string>
@@ -544,15 +543,15 @@
    <string name="activate_reset_password_token_here">Activate reset password token here. </string>

    <!--Settings&About-->
-    <string name="setting">Settings</string>
+    <string name="settings">Settings</string>
    <string name="show_dangerous_features">Show dangerous features</string>
    <string name="material_you_color">Material you color</string>
    <string name="dark_theme">Dark theme</string>
    <string name="follow_system">Follow system</string>
    <string name="black_theme">Black theme</string>
    <string name="about">About</string>
-    <string name="source_code">Source code</string>
-    <string name="theme">Theme</string>
+    <string name="project_homepage">Project homepage</string>
+    <string name="appearance">Appearance</string>

    <string name="security">Security</string>
    <string name="lock_owndroid">Lock OwnDroid</string>
@@ -622,7 +621,7 @@
    <string name="info_disable_keyguard">Setting the keyguard to disabled has the same effect as choosing "None" as the screen lock type. However, this call has no effect if a password, pin or pattern is currently set.\nIf a password, pin or pattern is set after the keyguard was disabled, the keyguard stops being disabled.</string>
    <string name="info_evict_credential_encryption_key">Evict the user\'s credential encryption key from the keyring. The user\'s credential will need to be entered again in order to derive the credential encryption key that will be stored back in the keyring for future use. In order to secure user data, the user will be stopped and restarted.</string>
    <string name="info_reboot">You can\'t use this function if there is an ongoing call on the device.</string>
-    <string name="info_edit_time">Input UNIX time in milliseconds</string>
+    <string name="info_change_time">Input UNIX time in milliseconds</string>
    <string name="info_permission_policy">Set the default response for future runtime permission requests by applications.</string>
    <string name="info_mte_policy">Set the Memory Tagging Extension policy. Reboot the device to apply changes.</string>
    <string name="info_nearby_app_streaming_policy">App streaming is when the device starts an app on a virtual display and sends a video stream of the app to nearby devices.</string>