From 21e4e7ade32d6cb840edc272b203edfa8005a3c4 Mon Sep 17 00:00:00 2001 From: liuzhongming60 Date: Thu, 4 Sep 2025 09:32:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=20Signed-off-by:=20liuzhongming=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/deviceprofile_connector.cpp | 7 ++---- display/AppScope/app.json | 4 ++-- .../src/main/resources/ar/element/plural.json | 6 ++--- .../src/main/resources/ar/element/string.json | 24 +++++++++---------- .../src/main/resources/es/element/plural.json | 2 +- .../src/main/resources/es/element/string.json | 18 +++++++------- .../src/main/resources/fr/element/plural.json | 2 +- .../src/main/resources/fr/element/string.json | 24 +++++++++---------- .../src/main/resources/ja/element/string.json | 16 ++++++------- .../src/main/resources/ko/element/string.json | 16 ++++++------- .../src/main/resources/ru/element/plural.json | 4 ++-- .../src/main/resources/ru/element/string.json | 20 ++++++++-------- .../src/main/resources/vi/element/plural.json | 4 ++-- .../src/main/resources/vi/element/string.json | 18 +++++++------- .../main/resources/zh_CN/element/plural.json | 8 ------- 15 files changed, 81 insertions(+), 92 deletions(-) diff --git a/commondependency/src/deviceprofile_connector.cpp b/commondependency/src/deviceprofile_connector.cpp index 16c8db8d3..49ec04f9f 100644 --- a/commondependency/src/deviceprofile_connector.cpp +++ b/commondependency/src/deviceprofile_connector.cpp @@ -3518,18 +3518,15 @@ bool DeviceProfileConnector::IsAllowAuthAlways(const std::string &localUdid, int int32_t DeviceProfileConnector::GetAuthOnceUdids(std::unordered_set &udidSet) { std::vector profiles = GetAllAclIncludeLnnAcl(); - int32_t currentUserId = MultipleUserConnector::GetCurrentAccountUserID(); std::string localUdid = GetLocalDeviceId(); for (auto &item : profiles) { std::string accesserUdid = item.GetAccesser().GetAccesserDeviceId(); std::string accesseeUdid = item.GetAccessee().GetAccesseeDeviceId(); - int32_t accesserUserId = item.GetAccesser().GetAccesserUserId(); - int32_t accesseeUserId = item.GetAccessee().GetAccesseeUserId(); if (item.GetAuthenticationType() == ALLOW_AUTH_ONCE) { - if (accesserUserId == currentUserId && accesserUdid == localUdid) { + if (accesserUdid == localUdid) { udidSet.insert(accesseeUdid); } - if (accesseeUserId == currentUserId && accesseeUdid == localUdid) { + if (accesseeUdid == localUdid) { udidSet.insert(accesserUdid); } } diff --git a/display/AppScope/app.json b/display/AppScope/app.json index e48d02ec5..aae3daefc 100644 --- a/display/AppScope/app.json +++ b/display/AppScope/app.json @@ -2,8 +2,8 @@ "app": { "bundleName": "com.ohos.devicemanagerui", "vendor": "example", - "versionCode": 1000048, - "versionName": "1.0.48", + "versionCode": 1000049, + "versionName": "1.0.49", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 10, diff --git a/display/entry/src/main/resources/ar/element/plural.json b/display/entry/src/main/resources/ar/element/plural.json index 45fac9c6b..5fe8e796d 100644 --- a/display/entry/src/main/resources/ar/element/plural.json +++ b/display/entry/src/main/resources/ar/element/plural.json @@ -61,7 +61,7 @@ "quantity":"one", "value":"عدم الوثوق (%d)", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -75,7 +75,7 @@ "quantity":"few", "value":"عدم الوثوق (%d)", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -89,7 +89,7 @@ "quantity":"two", "value":"عدم الوثوق (%d)", "attr":{ - "priority":"translate" + "priority":"LT" } } ] diff --git a/display/entry/src/main/resources/ar/element/string.json b/display/entry/src/main/resources/ar/element/string.json index 98c75fc52..23bda40d1 100644 --- a/display/entry/src/main/resources/ar/element/string.json +++ b/display/entry/src/main/resources/ar/element/string.json @@ -11,14 +11,14 @@ "name":"dm_confirm_title_hap", "value":"تطبيق %1$s على \u202a%2$s\u202c يريد الوصول إلى هذا الجهاز. هل تريد الوثوق بهذا التطبيق؟", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_cancel", "value":"إلغاء", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -53,7 +53,7 @@ "name":"dm_allow_this_time", "value":"الوثوق هذه المرة فقط", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -67,14 +67,14 @@ "name":"dm_enter_connect_code", "value":"أدخل رمز الاتصال الظاهر على شاشة الجهاز الآخر.", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_confirm_title_cast", - "value":"يريد %s عرض شاشته على جهازك. هل تثق بهذا الجهاز؟", + "value":"يريد %s عرض شاشته على جهازك. هل تريد الوثوق بهذا الجهاز؟", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -93,9 +93,9 @@ }, { "name":"dm_bluetooth_dialog_close", - "value":"موافق", + "value":"حسنًا", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -114,16 +114,16 @@ }, { "name":"dm_bluetooth_dialog_content", - "value":"مطلوب تشغيل البلوتوث للاتصال بجهاز آخر. يُرجى تشغيله والمحاولة مرة أخرى.", + "value":"مطلوب تشغيل البلوتوث للاتصال بجهاز آخر. يُرجى تشغيله وإعادة المحاولة.", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_connect", - "value":"الاتصال بالجهاز «\u202a%s\u202c»", + "value":"الاتصال بالجهاز \"\u202a%s\u202c\"", "attr":{ - "priority":"translate" + "priority":"LT" } } ] diff --git a/display/entry/src/main/resources/es/element/plural.json b/display/entry/src/main/resources/es/element/plural.json index f8ceb54a9..6528ce072 100644 --- a/display/entry/src/main/resources/es/element/plural.json +++ b/display/entry/src/main/resources/es/element/plural.json @@ -33,7 +33,7 @@ "quantity":"one", "value":"No confiar (%d)", "attr":{ - "priority":"translate" + "priority":"LT" } } ] diff --git a/display/entry/src/main/resources/es/element/string.json b/display/entry/src/main/resources/es/element/string.json index 8de387d87..32149eae7 100644 --- a/display/entry/src/main/resources/es/element/string.json +++ b/display/entry/src/main/resources/es/element/string.json @@ -18,7 +18,7 @@ "name":"dm_cancel", "value":"Cancelar", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -53,7 +53,7 @@ "name":"dm_allow_this_time", "value":"Solo confiar esta vez", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -67,14 +67,14 @@ "name":"dm_enter_connect_code", "value":"Introduce el código de conexión que se muestra en el otro dispositivo.", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_confirm_title_cast", - "value":"%s quiere duplicar su pantalla en tu dispositivo. ¿Confiar en este dispositivo?", + "value":"El dispositivo %s quiere duplicar su pantalla en tu dispositivo. ¿Confiar en este dispositivo?", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -95,7 +95,7 @@ "name":"dm_bluetooth_dialog_close", "value":"Aceptar", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -116,14 +116,14 @@ "name":"dm_bluetooth_dialog_content", "value":"El Bluetooth debe estar habilitado para poder conectarse a otro dispositivo. Habilítalo y vuelve a intentarlo.", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_connect", - "value":"Conectarse con %s", + "value":"Conectarse con este dispositivo: %s", "attr":{ - "priority":"translate" + "priority":"LT" } } ] diff --git a/display/entry/src/main/resources/fr/element/plural.json b/display/entry/src/main/resources/fr/element/plural.json index 45cf7f4d5..410a89fa4 100644 --- a/display/entry/src/main/resources/fr/element/plural.json +++ b/display/entry/src/main/resources/fr/element/plural.json @@ -33,7 +33,7 @@ "quantity":"one", "value":"Ne pas faire confiance (%d)", "attr":{ - "priority":"translate" + "priority":"LT" } } ] diff --git a/display/entry/src/main/resources/fr/element/string.json b/display/entry/src/main/resources/fr/element/string.json index 187a0c056..b3644f498 100644 --- a/display/entry/src/main/resources/fr/element/string.json +++ b/display/entry/src/main/resources/fr/element/string.json @@ -4,7 +4,7 @@ "name":"dm_connect_code", "value":"Code de connexion", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -18,7 +18,7 @@ "name":"dm_cancel", "value":"Annuler", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -32,7 +32,7 @@ "name":"dm_confirm_intention", "value":"Ceci est nécessaire pour la synchronisation des données et la collaboration multi-appareils.", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -53,7 +53,7 @@ "name":"dm_allow_this_time", "value":"Faire confiance cette fois uniquement", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -67,14 +67,14 @@ "name":"dm_enter_connect_code", "value":"Veuillez saisir le code de connexion qui s'affiche sur l'autre appareil.", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_confirm_title_cast", - "value":"%s souhaite mettre en miroir son écran sur votre appareil. Faites-vous confiance à cet appareil ?", + "value":"%s souhaite mettre en miroir son écran sur votre appareil. Faire confiance à cet appareil ?", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -95,7 +95,7 @@ "name":"dm_bluetooth_dialog_close", "value":"OK", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -114,16 +114,16 @@ }, { "name":"dm_bluetooth_dialog_content", - "value":"Le Bluetooth doit être activé pour se connecter à un autre appareil. Veuillez l'activer et réessayer.", + "value":"Le Bluetooth doit être activé pour se connecter à un autre appareil. Veuillez l'activer, puis réessayez.", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_connect", - "value":"Connexion à %s", + "value":"Se connecter à %s", "attr":{ - "priority":"translate" + "priority":"LT" } } ] diff --git a/display/entry/src/main/resources/ja/element/string.json b/display/entry/src/main/resources/ja/element/string.json index f0da5d210..5fdb57667 100644 --- a/display/entry/src/main/resources/ja/element/string.json +++ b/display/entry/src/main/resources/ja/element/string.json @@ -4,21 +4,21 @@ "name":"dm_connect_code", "value":"接続コード", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_confirm_title_hap", "value":"%2$sの%1$sがこのデバイスへのアクセスを要求しています。このアプリを信頼しますか？", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_cancel", "value":"キャンセル", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -53,7 +53,7 @@ "name":"dm_allow_this_time", "value":"今回のみ信頼", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -67,7 +67,7 @@ "name":"dm_enter_connect_code", "value":"もう一方のデバイスに表示されている接続コードを入力してください。", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -95,7 +95,7 @@ "name":"dm_bluetooth_dialog_close", "value":"OK", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -116,14 +116,14 @@ "name":"dm_bluetooth_dialog_content", "value":"他のデバイスに接続するには、Bluetoothを有効にする必要があります。有効にしてから、もう一度お試しください。", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_connect", "value":"%sに接続", "attr":{ - "priority":"translate" + "priority":"LT" } } ] diff --git a/display/entry/src/main/resources/ko/element/string.json b/display/entry/src/main/resources/ko/element/string.json index 11debf8cb..c906e6eb1 100644 --- a/display/entry/src/main/resources/ko/element/string.json +++ b/display/entry/src/main/resources/ko/element/string.json @@ -4,21 +4,21 @@ "name":"dm_connect_code", "value":"연결 코드", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_confirm_title_hap", "value":"%2$s의 %1$s에서 이 장치에 액세스하려고 합니다. 이 앱을 신뢰할까요?", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_cancel", "value":"취소", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -53,7 +53,7 @@ "name":"dm_allow_this_time", "value":"이번 한 번만 신뢰", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -67,7 +67,7 @@ "name":"dm_enter_connect_code", "value":"다른 장치에 표시된 연결 코드를 입력하십시오.", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -95,7 +95,7 @@ "name":"dm_bluetooth_dialog_close", "value":"확인", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -116,14 +116,14 @@ "name":"dm_bluetooth_dialog_content", "value":"다른 장치에 연결하려면 블루투스를 실행해야 합니다. 실행하고 다시 시도하십시오.", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_connect", "value":"%s에 연결", "attr":{ - "priority":"translate" + "priority":"LT" } } ] diff --git a/display/entry/src/main/resources/ru/element/plural.json b/display/entry/src/main/resources/ru/element/plural.json index c21c9aa7e..90db623ec 100644 --- a/display/entry/src/main/resources/ru/element/plural.json +++ b/display/entry/src/main/resources/ru/element/plural.json @@ -47,14 +47,14 @@ "quantity":"one", "value":"Не доверять (%d)", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "quantity":"few", "value":"Не доверять (%d)", "attr":{ - "priority":"translate" + "priority":"LT" } }, { diff --git a/display/entry/src/main/resources/ru/element/string.json b/display/entry/src/main/resources/ru/element/string.json index fdc2c8ea5..d7280a705 100644 --- a/display/entry/src/main/resources/ru/element/string.json +++ b/display/entry/src/main/resources/ru/element/string.json @@ -4,21 +4,21 @@ "name":"dm_connect_code", "value":"Код подключения", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_confirm_title_hap", "value":"Приложение %1$s на устройстве %2$s хочет получить доступ к этому устройству. Доверять этому приложению?", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_cancel", "value":"Отмена", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -53,7 +53,7 @@ "name":"dm_allow_this_time", "value":"Доверять только сейчас", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -67,14 +67,14 @@ "name":"dm_enter_connect_code", "value":"Введите код подключения, отобразившийся на другом устройстве.", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_confirm_title_cast", "value":"%s хочет транслировать контент экрана на вашем устройстве. Доверять этому устройству?", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -95,7 +95,7 @@ "name":"dm_bluetooth_dialog_close", "value":"OK", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -116,14 +116,14 @@ "name":"dm_bluetooth_dialog_content", "value":"Для подключения к другому устройству необходимо включить Bluetooth. Включите и повторите попытку.", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_connect", - "value":"Подключить к %s", + "value":"Подключение к %s", "attr":{ - "priority":"translate" + "priority":"LT" } } ] diff --git a/display/entry/src/main/resources/vi/element/plural.json b/display/entry/src/main/resources/vi/element/plural.json index dfc9af6d5..43dcf559d 100644 --- a/display/entry/src/main/resources/vi/element/plural.json +++ b/display/entry/src/main/resources/vi/element/plural.json @@ -5,9 +5,9 @@ "value":[ { "quantity":"other", - "value":"Không đúng. Còn %d lần thử.", + "value":"Không chính xác. Còn %d lần thử.", "attr":{ - "priority":"translate" + "priority":"LT" } } ] diff --git a/display/entry/src/main/resources/vi/element/string.json b/display/entry/src/main/resources/vi/element/string.json index be9ffdf69..84204f3be 100644 --- a/display/entry/src/main/resources/vi/element/string.json +++ b/display/entry/src/main/resources/vi/element/string.json @@ -4,21 +4,21 @@ "name":"dm_connect_code", "value":"Mã kết nối", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_confirm_title_hap", "value":"%1$s trên %2$s muốn truy cập vào thiết bị này. Tin tưởng ứng dụng này?", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_cancel", "value":"Hủy", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -53,7 +53,7 @@ "name":"dm_allow_this_time", "value":"Chỉ tin tưởng lần này", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -67,14 +67,14 @@ "name":"dm_enter_connect_code", "value":"Nhập mã kết nối hiển thị trên thiết bị còn lại.", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_confirm_title_cast", "value":"%s muốn phản chiếu màn hình của mình lên thiết bị của bạn. Tin cậy thiết bị này?", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -95,7 +95,7 @@ "name":"dm_bluetooth_dialog_close", "value":"OK", "attr":{ - "priority":"translate" + "priority":"LT" } }, { @@ -116,14 +116,14 @@ "name":"dm_bluetooth_dialog_content", "value":"Cần bật Bluetooth để kết nối với một thiết bị khác. Vui lòng bật Bluetooth và thử lại.", "attr":{ - "priority":"translate" + "priority":"LT" } }, { "name":"dm_connect", "value":"Kết nối tới %s", "attr":{ - "priority":"translate" + "priority":"LT" } } ] diff --git a/display/entry/src/main/resources/zh_CN/element/plural.json b/display/entry/src/main/resources/zh_CN/element/plural.json index 932ef1551..636305d55 100644 --- a/display/entry/src/main/resources/zh_CN/element/plural.json +++ b/display/entry/src/main/resources/zh_CN/element/plural.json @@ -3,10 +3,6 @@ { "name":"dm_not_allow", "value":[ - { - "quantity":"one", - "value":"不信任( %d 秒)" - }, { "quantity":"other", "value":"不信任 (%d 秒)", @@ -19,10 +15,6 @@ { "name":"dm_incorrect_code", "value":[ - { - "quantity":"one", - "value":"连接码错误，还可以尝试 %d 次" - }, { "quantity":"other", "value":"连接码错误，还可以尝试 %d 次", -- Gitee