From 9182a665d907c0bdca1d29cda5a4600c0680eecc Mon Sep 17 00:00:00 2001 From: h30034439 Date: Mon, 5 Feb 2024 19:46:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fixed=20b0ac470=20from=20https://gitee.com/?= =?UTF-8?q?lucifinil=5Fhan/applications=5Fadmin=5Fprovisioning/pulls/57=20?= =?UTF-8?q?=E5=90=88=E5=85=A5=E7=BF=BB=E8=AF=91=E5=9B=9E=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: h30034439 --- .../main/resources/base/element/string.json | 36 +++++++-------- .../main/resources/en_US/element/string.json | 44 +++++++++---------- .../main/resources/zh_CN/element/string.json | 4 +- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/entry/src/main/resources/base/element/string.json b/entry/src/main/resources/base/element/string.json index aefbf3c..abda569 100644 --- a/entry/src/main/resources/base/element/string.json +++ b/entry/src/main/resources/base/element/string.json @@ -18,7 +18,7 @@ }, { "name": "adminprovisioning", - "value": "是否激活设备管理器?" + "value": "Activate device administrator" }, { "name": "activation", @@ -30,7 +30,7 @@ }, { "name": "cancel", - "value": "取消" + "value": "Cancel" }, { "name": "device_active_1", @@ -54,27 +54,27 @@ }, { "name": "permissionLabel", - "value": "Setting the system time" + "value": "Set system time" }, { "name": "permissionDescription", - "value": "Permission required for the application to set the system time" + "value": "Allows an app to set the system time." }, { "name": "device_mgr_info_content", - "value": "您的单位管理员可以监控此设备的设置、应用、权限以及数据（其中包括您的网络活动以及您设备的位置信息、通话记录和联系人搜索记录）。" + "value": "Your organization's administrator can monitor this device's settings, apps, permissions, and data, including network activity, location information, call history, and contact search history." }, { "name": "returnVal", - "value": "返回" + "value": "Back" }, { "name": "nextVal", - "value": "下一步" + "value": "Next" }, { "name": "tips", - "value": "提示" + "value": "Note" }, { "name": "tipsInfo", @@ -82,19 +82,19 @@ }, { "name": "CancelSetting", - "value": "取消设置" + "value": "Cancel setup" }, { "name": "deviceManageInfo", - "value": "设备管理信息" + "value": "Device management information" }, { "name": "unitManageDevice", - "value": "您的单位将管理此设备" + "value": "This device will be managed by your organization" }, { "name": "unitManage", - "value": "单位管理员" + "value": "administrator" }, { "name": "textManagerBefore", @@ -122,11 +122,11 @@ }, { "name": "loadingSearch", - "value": "正在设置设备..." + "value": "Setting up device..." }, { "name": "terms", - "value": "条款" + "value": "Terms" }, { "name": "manageInfo", @@ -134,7 +134,7 @@ }, { "name": "settingFailed", - "value": "设置失败" + "value": "Setup failed" }, { "name": "settingFailedInfo", @@ -142,11 +142,11 @@ }, { "name": "resetFactorySet", - "value": "恢复出厂设置" + "value": "Factory reset" }, { "name": "setupComplete", - "value": "设置完成" + "value": "Setup complete" }, { "name": "AutoDeployText", @@ -154,7 +154,7 @@ }, { "name": "continue", - "value": "继续" + "value": "Continue" }, { "name": "PreviousStep", diff --git a/entry/src/main/resources/en_US/element/string.json b/entry/src/main/resources/en_US/element/string.json index 123b902..25cd471 100644 --- a/entry/src/main/resources/en_US/element/string.json +++ b/entry/src/main/resources/en_US/element/string.json @@ -18,7 +18,7 @@ }, { "name": "adminprovisioning", - "value": "Activate Device Manager?" + "value": "Activate device administrator" }, { "name": "activation", @@ -30,7 +30,7 @@ }, { "name": "cancel", - "value": "cancel" + "value": "Cancel" }, { "name": "device_active_1", @@ -54,27 +54,27 @@ }, { "name": "permissionLabel", - "value": "Setting the system time" + "value": "Set system time" }, { "name": "permissionDescription", - "value": "Permission required for the application to set the system time" + "value": "Allows an app to set the system time." }, { "name": "device_mgr_info_content", - "value": "your organization administrator can monitor this device's setting, apps, permissions, and data, including your web activity and your device's location, call history, and contact search history." + "value": "Your organization's administrator can monitor this device's settings, apps, permissions, and data, including network activity, location information, call history, and contact search history." }, { "name": "returnVal", - "value": "return" + "value": "Back" }, { "name": "nextVal", - "value": "next" + "value": "Next" }, { "name": "tips", - "value": "Tips" + "value": "Note" }, { "name": "tipsInfo", @@ -82,19 +82,19 @@ }, { "name": "CancelSetting", - "value": "cancelSetting" + "value": "Cancel setup" }, { "name": "deviceManageInfo", - "value": "device management information" + "value": "Device management information" }, { "name": "unitManageDevice", - "value": "your organization will manage this device" + "value": "This device will be managed by your organization" }, { "name": "unitManage", - "value": "unit administrator" + "value": "administrator" }, { "name": "textManagerBefore", @@ -122,7 +122,7 @@ }, { "name": "loadingSearch", - "value": "setting up device..." + "value": "Setting up device..." }, { "name": "terms", @@ -134,7 +134,7 @@ }, { "name": "settingFailed", - "value": "setup failed" + "value": "Setup failed" }, { "name": "settingFailedInfo", @@ -142,11 +142,11 @@ }, { "name": "resetFactorySet", - "value": "restoreFactorySettings" + "value": "Factory reset" }, { "name": "setupComplete", - "value": "setup complete" + "value": "Setup complete" }, { "name": "AutoDeployText", @@ -154,7 +154,7 @@ }, { "name": "continue", - "value": "continue" + "value": "Continue" }, { "name": "PreviousStep", @@ -162,23 +162,23 @@ }, { "name": "textManageSuccessContentVal1", - "value": "%s" + "value": "%1$s" }, { "name": "textManageSuccessContentVal2", - "value": "%s" + "value": "%2$s" }, { "name": "textManageSuccessContent", - "value": "if you have any questions, please contact your %s contact." + "value": "if you have any questions, please contact your %1$s contact." }, { "name": "textApplicationInfoActive", - "value": "This device administrator is currently active and allows \"%s\" to perform the following operations:" + "value": "This device administrator is currently active and allows \"%1$s\" to perform the following operations:" }, { "name": "textApplicationInfoInactive", - "value": "Activating this administrator will allow \"%s\" to perform the following operations:" + "value": "Activating this administrator will allow \"%1$s\" to perform the following operations:" } ] } \ No newline at end of file diff --git a/entry/src/main/resources/zh_CN/element/string.json b/entry/src/main/resources/zh_CN/element/string.json index abab789..60a43aa 100644 --- a/entry/src/main/resources/zh_CN/element/string.json +++ b/entry/src/main/resources/zh_CN/element/string.json @@ -18,7 +18,7 @@ }, { "name": "adminprovisioning", - "value": "是否激活设备管理器?" + "value": "是否激活设备管理器？" }, { "name": "activation", @@ -122,7 +122,7 @@ }, { "name": "loadingSearch", - "value": "正在设置设备..." + "value": "正在设置设备…" }, { "name": "terms", -- Gitee From ab8e63882fbe074dbf11b5e032b3fd91cc677bce Mon Sep 17 00:00:00 2001 From: HYY Date: Tue, 6 Feb 2024 07:07:32 +0000 Subject: [PATCH 2/2] update entry/src/main/resources/en_US/element/string.json. Signed-off-by: HYY --- entry/src/main/resources/en_US/element/string.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/entry/src/main/resources/en_US/element/string.json b/entry/src/main/resources/en_US/element/string.json index 25cd471..3c13f03 100644 --- a/entry/src/main/resources/en_US/element/string.json +++ b/entry/src/main/resources/en_US/element/string.json @@ -122,7 +122,7 @@ }, { "name": "loadingSearch", - "value": "Setting up device..." + "value": "Setting up device…" }, { "name": "terms", @@ -162,23 +162,23 @@ }, { "name": "textManageSuccessContentVal1", - "value": "%1$s" + "value": "%s" }, { "name": "textManageSuccessContentVal2", - "value": "%2$s" + "value": "%s" }, { "name": "textManageSuccessContent", - "value": "if you have any questions, please contact your %1$s contact." + "value": "if you have any questions, please contact your %s contact." }, { "name": "textApplicationInfoActive", - "value": "This device administrator is currently active and allows \"%1$s\" to perform the following operations:" + "value": "This device administrator is currently active and allows \"%s\" to perform the following operations:" }, { "name": "textApplicationInfoInactive", - "value": "Activating this administrator will allow \"%1$s\" to perform the following operations:" + "value": "Activating this administrator will allow \"%s\" to perform the following operations:" } ] } \ No newline at end of file -- Gitee