From cadd194135ed06a9e36973b78ce78226ac7c528f Mon Sep 17 00:00:00 2001 From: BinTianqi Date: Thu, 20 Jun 2024 01:21:18 +0800 Subject: [PATCH] update some strings --- Readme.md | 4 ++-- .../java/com/bintianqi/owndroid/dpm/Network.kt | 6 +++--- .../com/bintianqi/owndroid/dpm/Password.kt | 6 ++---- .../bintianqi/owndroid/dpm/SystemManager.kt | 6 +++--- app/src/main/res/values-zh-rCN/strings.xml | 18 +++++++++--------- app/src/main/res/values/strings.xml | 18 +++++++++--------- 6 files changed, 28 insertions(+), 30 deletions(-) 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 @@ 使用默认密钥 每个用户分别加密 激活的Device admin: %1$s - 设备唯一标识码 + 设备注册专用ID 需要设置组织ID 组织名称 禁用账号管理 @@ -109,11 +109,12 @@ 系统 禁用相机 - 禁止截屏 + 禁止屏幕捕获 禁用状态栏 对AOSP的录屏也起作用 自动设置时间 自动设置时区 + 要求自动时间 全局静音 备份服务 禁止蓝牙分享联系人 @@ -123,7 +124,7 @@ 锁屏 禁用需要无密码 立即锁屏 - 需要重新输入密码 + 移除凭证加密密钥 错误报告 请求错误报告？ 重启 @@ -201,7 +202,7 @@ 网络 Wi-Fi Mac地址 - 最小WiFi安全等级 + 最低WiFi安全等级 开放 优先网络服务 锁定由管理员配置的网络 @@ -213,7 +214,7 @@ 私人DNS 指定主机名 主机不支持 - 设为自动 + 设为自动 DNS主机名 无效主机名 安全错误 @@ -222,7 +223,7 @@ 收集 WiFi密钥对 密钥对 - APN设置 + APN设置 一共有%1$s个APN设置 选择一个你要修改的APN设置(1~%1$s)或者输入0以新建APN设置 当前没有APN设置，你可以新建一个APN设置 @@ -454,13 +455,12 @@ 最大密码错误次数 达到该限制会恢复出厂设置，0为无限制 错误次数 - 密码失效超时时间 + 密码失效超时时间 屏幕超时 要求强验证超时 值为0表示OwnDroid不参与控制超时 超时后锁屏(毫秒)，0为由用户决定 - 超时后用户需重新设置密码（毫秒），0为无限制 - 密码历史记录长度 + 密码历史长度 用户无法设置指定历史范围内之前曾设置过的密码 无（允许不设密码） 低（允许图案和连续性） 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 @@ Unsupported Active(default key) Active(per-user) - Activated device admin: %1$s + Active device admins: %1$s Enrollment specific ID Require organization ID Organization name @@ -120,12 +120,13 @@ System manager Disable camera - Disable screenshot + Disable screen capture Disable status bar Also disable screen record in AOSP. Auto time + Require auto time Auto timezone - Master mute + Master volume mute Backup service Disable bluetooth contact sharing Common criteria mode @@ -134,7 +135,7 @@ Keyguard Disable keyguard require no password is set. Lock screen now - Require re-enter password + Evict credential encryption key Bug report Request bug report? Reboot @@ -224,7 +225,7 @@ PrivateDNS Provide hostname Host not serving - Set to auto + Set to opportunistic DNS hostname Invalid hostname Security Exception @@ -233,7 +234,7 @@ Retrieve WiFi keypair Keypair - APN settings + APN settings APN settings amount: %1$s Select an APN setting you want to edit (1~%1$s) or enter 0 to create a new APN setting. No APN settings. Will create a new one. @@ -467,15 +468,14 @@ Password and keyguard Password Info Keep empty to remove password - Max password attempt limit + Max failed passwords When reach this limit, the device will be factory reset Maximum failed attempts - Password timeout + Password expiration timeout Screen timeout Required strong auth timeout A value of 0 means the admin is not participating in controlling the timeout Enter 0 to allow user decision, unit: millisecond - When reach this limit, user should set a new password. Enter 0 to allow user decision, unit: millisecond Password history length Historical passwords within the specified range cannot be set by user None (No password allowed)