diff --git a/Readme.md b/Readme.md
index 0623ac0..6df5b55 100644
--- a/Readme.md
+++ b/Readme.md
@@ -10,7 +10,7 @@
 
 ### 文档
 
-全新的OwnDroid文档：[owndroid.pages.dev](https://owndroid.pages.dev)
+全新的OwnDroid文档：[owndroid.pages.dev](https://owndroid.pages.dev/zh_CN)
 
 ### 优点
 
@@ -22,7 +22,7 @@
 ### 缺点
 
 - 功能没有谷歌官方的 [TestDPC](https://github.com/googlesamples/android-testdpc) 那么全
-- 在我中考完之前这个项目可能不会更新，因为电脑被没收了
+- 在我中考完(2024/7/2)之前这个项目可能不会更新，因为电脑被没收了
 
 ### 功能
 
diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt
index 477e336..e718cd4 100644
--- a/app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt
@@ -180,7 +180,7 @@ private fun Home(navCtrl:NavHostController, scrollState: ScrollState, wifiMacDia
             SubPageItem(R.string.wifi_auth_keypair, "", R.drawable.key_fill0) { navCtrl.navigate("WifiAuthKeypair") }
         }
         if(VERSION.SDK_INT >= 28 && isDeviceOwner(dpm)) {
-            SubPageItem(R.string.apn_settings, "", R.drawable.cell_tower_fill0) { navCtrl.navigate("APN") }
+            SubPageItem(R.string.override_apn_settings, "", R.drawable.cell_tower_fill0) { navCtrl.navigate("APN") }
         }
         Spacer(Modifier.padding(vertical = 30.dp))
     }
@@ -393,7 +393,7 @@ private fun PrivateDNS() {
                 },
                 modifier = Modifier.fillMaxWidth()
             ) {
-                Text(stringResource(R.string.set_to_auto))
+                Text(stringResource(R.string.set_to_opportunistic))
             }
         }
         Spacer(Modifier.padding(vertical = 10.dp))
@@ -520,7 +520,7 @@ private fun APN() {
         var nextStep by remember { mutableStateOf(false) }
         val builder = Builder()
         Spacer(Modifier.padding(vertical = 10.dp))
-        Text(text = stringResource(R.string.apn_settings), style = typography.headlineLarge)
+        Text(text = stringResource(R.string.override_apn_settings), style = typography.headlineLarge)
         Spacer(Modifier.padding(vertical = 5.dp))
         Text(text = stringResource(id = R.string.developing))
         Spacer(Modifier.padding(vertical = 5.dp))
diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/Password.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/Password.kt
index 1470261..629c5e7 100644
--- a/app/src/main/java/com/bintianqi/owndroid/dpm/Password.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/dpm/Password.kt
@@ -104,7 +104,7 @@ private fun Home(navCtrl:NavHostController,scrollState: ScrollState) {
         }
         if(isDeviceOwner(dpm)) {
             SubPageItem(R.string.max_time_to_lock, "", R.drawable.schedule_fill0) { navCtrl.navigate("MaxTimeToLock") }
-            SubPageItem(R.string.pwd_timeout, "", R.drawable.lock_clock_fill0) { navCtrl.navigate("PasswordTimeout") }
+            SubPageItem(R.string.pwd_expiration_timeout, "", R.drawable.lock_clock_fill0) { navCtrl.navigate("PasswordTimeout") }
             SubPageItem(R.string.max_pwd_fail, "", R.drawable.no_encryption_fill0) { navCtrl.navigate("MaxPasswordFail") }
         }
         if(dpm.isAdminActive(receiver)){
@@ -464,9 +464,7 @@ private fun PasswordExpiration() {
     LaunchedEffect(Unit) { inputContent = dpm.getPasswordExpirationTimeout(receiver).toString() }
     Column(modifier = Modifier.fillMaxSize().padding(horizontal = 8.dp).verticalScroll(rememberScrollState())) {
         Spacer(Modifier.padding(vertical = 10.dp))
-        Text(text = stringResource(R.string.pwd_timeout), style = typography.headlineLarge)
-        Spacer(Modifier.padding(vertical = 5.dp))
-        Text(text= stringResource(R.string.pwd_timeout_desc))
+        Text(text = stringResource(R.string.pwd_expiration_timeout), style = typography.headlineLarge)
         Spacer(Modifier.padding(vertical = 5.dp))
         OutlinedTextField(
             value = inputContent,
diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt
index e7e5ada..12facc7 100644
--- a/app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt
@@ -234,7 +234,7 @@ private fun Switches() {
             )
         }
         if(isDeviceOwner(dpm) || isProfileOwner(dpm)) {
-            SwitchItem(R.string.disable_screenshot, stringResource(R.string.also_disable_aosp_screen_record), R.drawable.screenshot_fill0,
+            SwitchItem(R.string.disable_screen_capture, stringResource(R.string.also_disable_aosp_screen_record), R.drawable.screenshot_fill0,
                 { dpm.getScreenCaptureDisabled(null) }, { dpm.setScreenCaptureDisabled(receiver,it) }
             )
         }
@@ -252,7 +252,7 @@ private fun Switches() {
                     { dpm.getAutoTimeZoneEnabled(receiver) }, { dpm.setAutoTimeZoneEnabled(receiver,it) }
                 )
             }else{
-                SwitchItem(R.string.auto_time, "", R.drawable.schedule_fill0, { dpm.autoTimeRequired}, { dpm.setAutoTimeRequired(receiver,it) })
+                SwitchItem(R.string.require_auto_time, "", R.drawable.schedule_fill0, { dpm.autoTimeRequired}, { dpm.setAutoTimeRequired(receiver,it) })
             }
         }
         if(isDeviceOwner(dpm) || isProfileOwner(dpm)) {
@@ -333,7 +333,7 @@ private fun Keyguard() {
         }
         if(VERSION.SDK_INT >= 26) {
             CheckBoxItem(
-                stringResource(R.string.require_enter_password_again),
+                stringResource(R.string.evict_credential_encryptoon_key),
                 flag == FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY,
                 { flag = if(flag==0) {1}else{0} }
             )
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 45a6c93..05a71bb 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -70,7 +70,7 @@
     <string name="es_active_default_key">使用默认密钥</string>
     <string name="es_active_per_user">每个用户分别加密</string>
     <string name="activated_device_admin">激活的Device admin: %1$s</string>
-    <string name="enrollment_specific_id">设备唯一标识码</string>
+    <string name="enrollment_specific_id">设备注册专用ID</string>
     <string name="require_set_org_id">需要设置组织ID</string>
     <string name="org_name">组织名称</string>
     <string name="disable_account_management">禁用账号管理</string>
@@ -109,11 +109,12 @@
     <!--System-->
     <string name="system_manage">系统</string>
     <string name="disable_cam">禁用相机</string>
-    <string name="disable_screenshot">禁止截屏</string>
+    <string name="disable_screen_capture">禁止屏幕捕获</string>
     <string name="disable_status_bar">禁用状态栏</string>
     <string name="also_disable_aosp_screen_record">对AOSP的录屏也起作用</string>
     <string name="auto_time">自动设置时间</string>
     <string name="auto_timezone">自动设置时区</string>
+    <string name="require_auto_time">要求自动时间</string>
     <string name="master_mute">全局静音</string>
     <string name="backup_service">备份服务</string>
     <string name="disable_bt_contact_share">禁止蓝牙分享联系人</string>
@@ -123,7 +124,7 @@
     <string name="keyguard">锁屏</string>
     <string name="require_no_password_to_disable">禁用需要无密码</string>
     <string name="lock_now">立即锁屏</string>
-    <string name="require_enter_password_again">需要重新输入密码</string>
+    <string name="evict_credential_encryptoon_key">移除凭证加密密钥</string>
     <string name="bug_report">错误报告</string>
     <string name="confirm_bug_report">请求错误报告？</string>
     <string name="reboot">重启</string>
@@ -201,7 +202,7 @@
     <!--Network-->
     <string name="network">网络</string>
     <string name="wifi_mac_addr">Wi-Fi Mac地址</string>
-    <string name="min_wifi_security_level">最小WiFi安全等级</string>
+    <string name="min_wifi_security_level">最低WiFi安全等级</string>
     <string name="wifi_security_level_open">开放</string>
     <string name="preferential_network_service">优先网络服务</string>
     <string name="lockdown_admin_configured_network">锁定由管理员配置的网络</string>
@@ -213,7 +214,7 @@
     <string name="private_dns">私人DNS</string>
     <string name="dns_provide_hostname">指定主机名</string>
     <string name="host_not_serving_dns_tls">主机不支持</string>
-    <string name="set_to_auto">设为自动</string>
+    <string name="set_to_opportunistic">设为自动</string>
     <string name="dns_hostname">DNS主机名</string>
     <string name="invalid_hostname">无效主机名</string>
     <string name="security_exception">安全错误</string>
@@ -222,7 +223,7 @@
     <string name="retrieve">收集</string>
     <string name="wifi_auth_keypair">WiFi密钥对</string>
     <string name="keypair">密钥对</string>
-    <string name="apn_settings">APN设置</string>
+    <string name="override_apn_settings">APN设置</string>
     <string name="total_apn_amount">一共有%1$s个APN设置</string>
     <string name="select_a_apn_or_create">选择一个你要修改的APN设置(1~%1$s)或者输入0以新建APN设置</string>
     <string name="no_apn_you_should_create_one">当前没有APN设置，你可以新建一个APN设置</string>
@@ -454,13 +455,12 @@
     <string name="max_pwd_fail">最大密码错误次数</string>
     <string name="max_pwd_fail_desc">达到该限制会恢复出厂设置，0为无限制</string>
     <string name="max_pwd_fail_textfield">错误次数</string>
-    <string name="pwd_timeout">密码失效超时时间</string>
+    <string name="pwd_expiration_timeout">密码失效超时时间</string>
     <string name="max_time_to_lock">屏幕超时</string>
     <string name="required_strong_auth_timeout">要求强验证超时</string>
     <string name="zero_means_no_control">值为0表示OwnDroid不参与控制超时</string>
     <string name="max_time_to_lock_desc">超时后锁屏(毫秒)，0为由用户决定</string>
-    <string name="pwd_timeout_desc">超时后用户需重新设置密码（毫秒），0为无限制</string>
-    <string name="pwd_history">密码历史记录长度</string>
+    <string name="pwd_history">密码历史长度</string>
     <string name="pwd_history_desc">用户无法设置指定历史范围内之前曾设置过的密码</string>
     <string name="password_complexity_none">无（允许不设密码）</string>
     <string name="password_complexity_low">低（允许图案和连续性）</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a7d31d0..da159d2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -76,7 +76,7 @@
     <string name="es_unsupported">Unsupported</string>
     <string name="es_active_default_key">Active(default key)</string>
     <string name="es_active_per_user">Active(per-user)</string>
-    <string name="activated_device_admin">Activated device admin: %1$s</string>
+    <string name="activated_device_admin">Active device admins: %1$s</string>
     <string name="enrollment_specific_id">Enrollment specific ID</string>
     <string name="require_set_org_id">Require organization ID</string>
     <string name="org_name">Organization name</string>
@@ -120,12 +120,13 @@
     <!--System-->
     <string name="system_manage">System manager</string>
     <string name="disable_cam">Disable camera</string>
-    <string name="disable_screenshot">Disable screenshot</string>
+    <string name="disable_screen_capture">Disable screen capture</string>
     <string name="disable_status_bar">Disable status bar</string>
     <string name="also_disable_aosp_screen_record">Also disable screen record in AOSP. </string>
     <string name="auto_time">Auto time</string>
+    <string name="require_auto_time">Require auto time</string>
     <string name="auto_timezone">Auto timezone</string>
-    <string name="master_mute">Master mute</string>
+    <string name="master_mute">Master volume mute</string>
     <string name="backup_service">Backup service</string>
     <string name="disable_bt_contact_share">Disable bluetooth contact sharing</string>
     <string name="common_criteria_mode">Common criteria mode</string>
@@ -134,7 +135,7 @@
     <string name="keyguard">Keyguard</string>
     <string name="require_no_password_to_disable">Disable keyguard require no password is set. </string>
     <string name="lock_now">Lock screen now</string>
-    <string name="require_enter_password_again">Require re-enter password</string>
+    <string name="evict_credential_encryptoon_key">Evict credential encryption key</string>
     <string name="bug_report">Bug report</string>
     <string name="confirm_bug_report">Request bug report?</string>
     <string name="reboot">Reboot</string>
@@ -224,7 +225,7 @@
     <string name="private_dns">PrivateDNS</string>
     <string name="dns_provide_hostname">Provide hostname</string>
     <string name="host_not_serving_dns_tls">Host not serving</string>
-    <string name="set_to_auto">Set to auto</string>
+    <string name="set_to_opportunistic">Set to opportunistic</string>
     <string name="dns_hostname">DNS hostname</string>
     <string name="invalid_hostname">Invalid hostname</string>
     <string name="security_exception">Security Exception</string>
@@ -233,7 +234,7 @@
     <string name="retrieve">Retrieve</string>
     <string name="wifi_auth_keypair">WiFi keypair</string>
     <string name="keypair">Keypair</string>
-    <string name="apn_settings">APN settings</string>
+    <string name="override_apn_settings">APN settings</string>
     <string name="total_apn_amount">APN settings amount: %1$s</string>
     <string name="select_a_apn_or_create">Select an APN setting you want to edit (1~%1$s) or enter 0 to create a new APN setting. </string>
     <string name="no_apn_you_should_create_one">No APN settings. Will create a new one. </string>
@@ -467,15 +468,14 @@
     <string name="password_and_keyguard">Password and keyguard</string>
     <string name="password_info">Password Info</string>
     <string name="reset_pwd_desc">Keep empty to remove password</string>
-    <string name="max_pwd_fail">Max password attempt limit</string>
+    <string name="max_pwd_fail">Max failed passwords</string>
     <string name="max_pwd_fail_desc">When reach this limit, the device will be factory reset</string>
     <string name="max_pwd_fail_textfield">Maximum failed attempts</string>
-    <string name="pwd_timeout">Password timeout</string>
+    <string name="pwd_expiration_timeout">Password expiration timeout</string>
     <string name="max_time_to_lock">Screen timeout</string>
     <string name="required_strong_auth_timeout">Required strong auth timeout</string>
     <string name="zero_means_no_control">A value of 0 means the admin is not participating in controlling the timeout</string>
     <string name="max_time_to_lock_desc">Enter 0 to allow user decision, unit: millisecond</string>
-    <string name="pwd_timeout_desc">When reach this limit, user should set a new password. Enter 0 to allow user decision, unit: millisecond</string>
     <string name="pwd_history">Password history length</string>
     <string name="pwd_history_desc">Historical passwords within the specified range cannot be set by user</string>
     <string name="password_complexity_none">None (No password allowed)</string>