summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Auto Companion <no-reply@google.com>2021-02-02 21:22:08 +0000
committerErin Yan <yiranyan@google.com>2021-02-02 21:31:04 +0000
commitc8fcd2bfe89603579d549e2af8a560fb8cb215ee (patch)
treed63911ff711e1bbc7dafeb3a00701ddac61682f6
parentcf7e904f54660fad8086e757a5a4711c70a5c5fe (diff)
downloadCompanionDeviceSupport-c8fcd2bfe89603579d549e2af8a560fb8cb215ee.tar.gz
Project import generated by Copybara
Included changes: - 355238318 Exclude extra files in copybara config by yiranyan <yiranyan@google.com> - 355006253 Fail OOB data exchange if the IHU isn't Bluetooth bonded ... by Android Auto Companion <no-reply@google.com> - 354979624 Add a separate string for app entry title by yiranyan <yiranyan@google.com> - 354611034 Refactor TrustedDeviceViewModel by yiranyan <yiranyan@google.com> - 354594813 Remove non-third-party dependency by yiranyan <yiranyan@google.com> - 354571855 Fix lint for aosp/1532478 by yiranyan <yiranyan@google.com> - 354450509 Enable app name translation by yiranyan <yiranyan@google.com> - 354401969 Generated changelist to update app translations by yiranyan <yiranyan@google.com> - 354345777 Update calendar sync feature on the car to access methods... by Android Auto Companion <no-reply@google.com> - 354182686 Refactor AssociatedDeviceViewModel by yiranyan <yiranyan@google.com> - 354142795 Add timeout to RFCOMM connection step of OOB exchange. by Android Auto Companion <no-reply@google.com> - 354139810 Use shared background calendar sync access from companion... by Android Auto Companion <no-reply@google.com> - 353714790 Automated g4 rollback of changelist 353336407. by Android Auto Companion <no-reply@google.com> - 353690130 Ensure branch services are properly started and shutdown ... by danharms <danharms@google.com> - 353669979 Use the same config value for SPP. by Android Auto Companion <no-reply@google.com> - 353336407 Automated g4 rollback of changelist 353277223. by Android Auto Companion <no-reply@google.com> - 353277223 Check if out of band is supported, and attempt to complet... by Android Auto Companion <no-reply@google.com> - 353193711 Enable StrictMode when debugging CalendarSyncService. by Android Auto Companion <no-reply@google.com> - 353192848 Create shared android package with code to manage a backg... by Android Auto Companion <no-reply@google.com> - 352372495 Add a test showing the common code can be used from Swift. by Android Auto Companion <no-reply@google.com> - 352362718 Create CalendarSync in common code package. by Android Auto Companion <no-reply@google.com> - 351885803 Mark existing violations of the InsecureCipherMode check ... by Android Auto Companion <no-reply@google.com> - 351821610 Fix missedMessage poll and empty check race condition. by Android Auto Companion <no-reply@google.com> - 351615761 Create BUILD rule to build an IHU apk that enables spp. by Android Auto Companion <no-reply@google.com> - 350421306 Add retry logic when two devices disconnected while avail... by Android Auto Companion <no-reply@google.com> - 350222429 Create custom workflow for pushing to Play Store. by ajchen <ajchen@google.com> - 349572416 Add Capabilities exchange logic to DeviceMessageStream. (... by Android Auto Companion <no-reply@google.com> - 348855628 Store missed messages if no onMessageReceivedListener reg... by Android Auto Companion <no-reply@google.com> - 348844307 Create a capabilities exchange proto file. by Android Auto Companion <no-reply@google.com> - 348677438 Add script that pulls the latest translations from the tr... by yiranyan <yiranyan@google.com> - 348122320 Update strings.xml by yiranyan <yiranyan@google.com> - 348114177 Enable OOB in CarSppManager by Android Auto Companion <no-reply@google.com> - 348108219 Create passthrough of binder from bg user to fg user serv... by danharms <danharms@google.com> - 347886652 Update Copybara config by yiranyan <yiranyan@google.com> - 347730846 Migrate Account Transfer to GMSCore. by Android Auto Companion <no-reply@google.com> - 347674690 Retry logic in ConnectTask by Android Auto Companion <no-reply@google.com> - 347646869 Clean up pending connection when SppService is destroyed. by Android Auto Companion <no-reply@google.com> - 347402416 Add BUILD rule to use translated strings by yiranyan <yiranyan@google.com> PiperOrigin-RevId: 355238318 Change-Id: I0c0678aa28d7d26c8ddff0e2863fa5b7fe204baa
-rw-r--r--companiondevice/AndroidManifest.xml14
-rw-r--r--companiondevice/config/dev/res/values/configs.xml1
-rw-r--r--companiondevice/config/dogfood/res/values/configs.xml20
-rw-r--r--companiondevice/config/proxy/res/values/configs.xml20
-rw-r--r--companiondevice/res/values-af/strings.xml136
-rw-r--r--companiondevice/res/values-am/strings.xml136
-rw-r--r--companiondevice/res/values-ar/strings.xml140
-rw-r--r--companiondevice/res/values-as/strings.xml136
-rw-r--r--companiondevice/res/values-az/strings.xml136
-rw-r--r--companiondevice/res/values-b+sr+Latn/strings.xml137
-rw-r--r--companiondevice/res/values-be/strings.xml138
-rw-r--r--companiondevice/res/values-bg/strings.xml136
-rw-r--r--companiondevice/res/values-bn/strings.xml136
-rw-r--r--companiondevice/res/values-bs/strings.xml137
-rw-r--r--companiondevice/res/values-ca/strings.xml136
-rw-r--r--companiondevice/res/values-cs/strings.xml138
-rw-r--r--companiondevice/res/values-da/strings.xml136
-rw-r--r--companiondevice/res/values-de/strings.xml136
-rw-r--r--companiondevice/res/values-el/strings.xml136
-rw-r--r--companiondevice/res/values-en-rAU/strings.xml136
-rw-r--r--companiondevice/res/values-en-rCA/strings.xml136
-rw-r--r--companiondevice/res/values-en-rGB/strings.xml136
-rw-r--r--companiondevice/res/values-en-rIN/strings.xml136
-rw-r--r--companiondevice/res/values-en-rXC/strings.xml136
-rw-r--r--companiondevice/res/values-es-rUS/strings.xml136
-rw-r--r--companiondevice/res/values-es/strings.xml136
-rw-r--r--companiondevice/res/values-et/strings.xml136
-rw-r--r--companiondevice/res/values-eu/strings.xml136
-rw-r--r--companiondevice/res/values-fa/strings.xml136
-rw-r--r--companiondevice/res/values-fi/strings.xml136
-rw-r--r--companiondevice/res/values-fr-rCA/strings.xml136
-rw-r--r--companiondevice/res/values-fr/strings.xml136
-rw-r--r--companiondevice/res/values-gl/strings.xml136
-rw-r--r--companiondevice/res/values-gu/strings.xml136
-rw-r--r--companiondevice/res/values-hi/strings.xml136
-rw-r--r--companiondevice/res/values-hr/strings.xml137
-rw-r--r--companiondevice/res/values-hu/strings.xml136
-rw-r--r--companiondevice/res/values-hy/strings.xml136
-rw-r--r--companiondevice/res/values-in/strings.xml136
-rw-r--r--companiondevice/res/values-is/strings.xml136
-rw-r--r--companiondevice/res/values-it/strings.xml136
-rw-r--r--companiondevice/res/values-iw/strings.xml138
-rw-r--r--companiondevice/res/values-ja/strings.xml136
-rw-r--r--companiondevice/res/values-ka/strings.xml136
-rw-r--r--companiondevice/res/values-kk/strings.xml136
-rw-r--r--companiondevice/res/values-km/strings.xml136
-rw-r--r--companiondevice/res/values-kn/strings.xml136
-rw-r--r--companiondevice/res/values-ko/strings.xml136
-rw-r--r--companiondevice/res/values-ky/strings.xml136
-rw-r--r--companiondevice/res/values-lo/strings.xml136
-rw-r--r--companiondevice/res/values-lt/strings.xml138
-rw-r--r--companiondevice/res/values-lv/strings.xml137
-rw-r--r--companiondevice/res/values-mk/strings.xml136
-rw-r--r--companiondevice/res/values-ml/strings.xml136
-rw-r--r--companiondevice/res/values-mn/strings.xml136
-rw-r--r--companiondevice/res/values-mr/strings.xml136
-rw-r--r--companiondevice/res/values-ms/strings.xml136
-rw-r--r--companiondevice/res/values-my/strings.xml136
-rw-r--r--companiondevice/res/values-nb/strings.xml136
-rw-r--r--companiondevice/res/values-ne/strings.xml136
-rw-r--r--companiondevice/res/values-nl/strings.xml136
-rw-r--r--companiondevice/res/values-or/strings.xml136
-rw-r--r--companiondevice/res/values-pa/strings.xml136
-rw-r--r--companiondevice/res/values-pl/strings.xml138
-rw-r--r--companiondevice/res/values-pt-rPT/strings.xml136
-rw-r--r--companiondevice/res/values-pt/strings.xml136
-rw-r--r--companiondevice/res/values-ro/strings.xml137
-rw-r--r--companiondevice/res/values-ru/strings.xml138
-rw-r--r--companiondevice/res/values-si/strings.xml136
-rw-r--r--companiondevice/res/values-sk/strings.xml138
-rw-r--r--companiondevice/res/values-sl/strings.xml138
-rw-r--r--companiondevice/res/values-sq/strings.xml136
-rw-r--r--companiondevice/res/values-sr/strings.xml137
-rw-r--r--companiondevice/res/values-sv/strings.xml136
-rw-r--r--companiondevice/res/values-sw/strings.xml136
-rw-r--r--companiondevice/res/values-ta/strings.xml136
-rw-r--r--companiondevice/res/values-te/strings.xml136
-rw-r--r--companiondevice/res/values-th/strings.xml136
-rw-r--r--companiondevice/res/values-tl/strings.xml136
-rw-r--r--companiondevice/res/values-tr/strings.xml136
-rw-r--r--companiondevice/res/values-uk/strings.xml138
-rw-r--r--companiondevice/res/values-ur/strings.xml136
-rw-r--r--companiondevice/res/values-uz/strings.xml136
-rw-r--r--companiondevice/res/values-vi/strings.xml136
-rw-r--r--companiondevice/res/values-zh-rCN/strings.xml136
-rw-r--r--companiondevice/res/values-zh-rHK/strings.xml136
-rw-r--r--companiondevice/res/values-zh-rTW/strings.xml136
-rw-r--r--companiondevice/res/values-zu/strings.xml136
-rw-r--r--companiondevice/res/values/config.xml2
-rw-r--r--companiondevice/res/values/strings.xml14
-rw-r--r--companiondevice/src/com/google/android/companiondevicesupport/AssociatedDeviceDetailFragment.java87
-rw-r--r--companiondevice/src/com/google/android/companiondevicesupport/AssociationActivity.java110
-rw-r--r--companiondevice/src/com/google/android/companiondevicesupport/AssociationErrorFragment.java11
-rw-r--r--companiondevice/src/com/google/android/companiondevicesupport/OobAssociatedDeviceViewModel.java7
-rw-r--r--companiondevice/src/com/google/android/companiondevicesupport/OobAssociatedDeviceViewModelFactory.java12
-rw-r--r--companiondevice/src/com/google/android/companiondevicesupport/OobAssociationActivity.java5
-rw-r--r--companiondevice/src/com/google/android/companiondevicesupport/trust/TrustedDeviceActivity.java320
-rw-r--r--companiondevice/src/com/google/android/companiondevicesupport/trust/TrustedDeviceDetailFragment.java8
-rw-r--r--libs/companionprotos/src/capabilities_exchange.proto40
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/ConnectedDeviceManager.java40
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/api/IAssociatedDeviceManager.aidl9
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/api/IOnAssociatedDevicesRetrievedListener.aidl25
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/CalendarSyncFeature2.java62
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/CalendarSyncService.java20
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/android/CalendarSyncAccess.java88
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/common/CalendarSync.java88
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/common/Logger.java51
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/common/package-info.java5
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/connection/CarBluetoothManager.java60
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/connection/DeviceMessageStream.java171
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/connection/ble/CarBlePeripheralManager.java209
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/connection/spp/CarSppManager.java66
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/model/AssociatedDevice.java7
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/model/AssociatedDeviceDetails.java (renamed from companiondevice/src/com/google/android/companiondevicesupport/AssociatedDeviceDetails.java)19
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/model/ConnectedDevice.java7
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/oob/BluetoothRfcommChannel.java65
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/oob/OobConnectionManager.java9
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/service/AssociatedDeviceViewModel.java (renamed from companiondevice/src/com/google/android/companiondevicesupport/AssociatedDeviceViewModel.java)171
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/service/AssociatedDeviceViewModelFactory.java39
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/service/AssociationBinder.java43
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/service/ConnectedDeviceFgUserService.java108
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/service/ConnectedDeviceService.java11
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/service/SppService.java3
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/service/TrunkService.java59
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/storage/ConnectedDeviceStorage.java37
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/transport/spp/ConnectTask.java36
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/transport/spp/ReadMessageTask.java3
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/transport/spp/SppManager.java24
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/trust/TrustedDeviceManager.java104
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/trust/TrustedDeviceUiDelegateService.java3
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/trust/TrustedDeviceViewModel.java350
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/trust/api/IOnTrustedDevicesRetrievedListener.aidl26
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/trust/api/ITrustedDeviceManager.aidl5
-rw-r--r--libs/connecteddevice/src/com/google/android/connecteddevice/util/SafeLog.java13
-rw-r--r--libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/ConnectedDeviceManagerTest.java1
-rw-r--r--libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/calendarsync/CalendarSyncFeature2Test.java81
-rw-r--r--libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/calendarsync/android/CalendarSyncAccessTest.java62
-rw-r--r--libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/calendarsync/common/CalendarSyncTest.java34
-rw-r--r--libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/connection/DeviceMessageStreamTest.java92
-rw-r--r--libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/connection/ble/CarBlePeripheralManagerTest.java18
-rw-r--r--libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/connection/spp/CarSppManagerTest.java10
-rw-r--r--libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/oob/BluetoothRfcommChannelTest.java50
-rw-r--r--libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/service/AssociatedDeviceViewModelTest.java305
-rw-r--r--libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/transport/spp/ConnectTaskTest.java22
-rw-r--r--libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/transport/spp/SppManagerTest.java12
-rw-r--r--libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/trust/TrustedDeviceViewModelTest.java183
146 files changed, 8550 insertions, 6479 deletions
diff --git a/companiondevice/AndroidManifest.xml b/companiondevice/AndroidManifest.xml
index c48a6bf..66526d1 100644
--- a/companiondevice/AndroidManifest.xml
+++ b/companiondevice/AndroidManifest.xml
@@ -53,13 +53,13 @@
<service
android:name="com.google.android.connecteddevice.service.ConnectedDeviceService"
android:singleUser="true"
- android:exported="false">
+ android:exported="true">
<intent-filter>
<action android:name="com.google.android.connecteddevice.BIND_ASSOCIATION" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
- <action android:name="com.google.android.connecteddevice.BIND_CONNECTED_DEVICE_MANAGER" />
+ <action android:name="com.google.android.connecteddevice.BIND_REMOTE_FEATURE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
@@ -74,10 +74,16 @@
android:resource="@string/car_association_service_uuid" />
<meta-data android:name="com.google.android.connecteddevice.enable_proxy"
android:resource="@bool/enable_proxy" />
+ <meta-data android:name="com.google.android.connecteddevice.enable_spp"
+ android:resource="@bool/enable_spp" />
</service>
<service
android:name="com.google.android.connecteddevice.service.ConnectedDeviceFgUserService"
- android:exported="false">
+ android:exported="true">
+ <intent-filter>
+ <action android:name="com.google.android.connecteddevice.BIND_REMOTE_FEATURE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
<meta-data android:name="com.google.android.connecteddevice.early_services"
android:resource="@array/early_fg_user_services"/>
<meta-data android:name="com.google.android.connecteddevice.unlock_services"
@@ -98,7 +104,7 @@
<meta-data android:name="com.android.settings.icon"
android:resource="@drawable/ic_smartphone" android:value="true"/>
<meta-data android:name="com.android.settings.title"
- android:resource="@string/app_name" />
+ android:resource="@string/settings_entry_title" />
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.personal" />
</activity>
diff --git a/companiondevice/config/dev/res/values/configs.xml b/companiondevice/config/dev/res/values/configs.xml
index 88d6ab5..8d34a97 100644
--- a/companiondevice/config/dev/res/values/configs.xml
+++ b/companiondevice/config/dev/res/values/configs.xml
@@ -17,4 +17,5 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<bool name="enable_proxy">false</bool>
+ <bool name="enable_spp">false</bool>
</resources>
diff --git a/companiondevice/config/dogfood/res/values/configs.xml b/companiondevice/config/dogfood/res/values/configs.xml
deleted file mode 100644
index 88d6ab5..0000000
--- a/companiondevice/config/dogfood/res/values/configs.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2020 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <bool name="enable_proxy">false</bool>
-</resources>
diff --git a/companiondevice/config/proxy/res/values/configs.xml b/companiondevice/config/proxy/res/values/configs.xml
deleted file mode 100644
index 99bc59a..0000000
--- a/companiondevice/config/proxy/res/values/configs.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2020 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <bool name="enable_proxy">true</bool>
-</resources>
diff --git a/companiondevice/res/values-af/strings.xml b/companiondevice/res/values-af/strings.xml
index f2b3549..f03d967 100644
--- a/companiondevice/res/values-af/strings.xml
+++ b/companiondevice/res/values-af/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Geassosieerde toestel"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Voeg geassosieerde toestel by"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Koppel \'n metgeseltoestel"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Jy kan jou foon as \'n metgeseltoestel gebruik om jou ry-ervaring te help bestuur"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Maak seker dat "<b>"metgeselprogram"</b>" op jou foon geïnstalleer is"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Bevestig kode op foon"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Maak seker dat dit ooreenstem met die kode wat op jou foon gewys word"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Toestel is suksesvol geassosieer"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Maak program oop en koppel aan &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Maak die program oop en volg instruksies"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Vergeet &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Dié motor sal nie meer met hierdie toestel saamgebind wees nie. Hierbenewens sal jy die motor van die metgeselprogram moet verwyder."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> is vergeet"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Kon nie <xliff:g id="PHONE_NAME">%1$s</xliff:g> vergeet nie"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Gaan op jou foon met die opstelling voort"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Iets is fout"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Ongelukkig kon hierdie skerm nie reg wys nie. Probeer weer."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Skakel Bluetooth aan"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Jou motor moet Bluetooth hê om jou foon as \'n metgeseltoestel op te stel."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Skakel Bluetooth aan?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Jou motor moet Bluetooth hê om aan jou metgeseltoestel te koppel."</string>
- <string name="accept" msgid="1454710793329618813">"Aanvaar"</string>
- <string name="reject" msgid="4315432282758892890">"Weier"</string>
- <string name="confirm" msgid="3748997214719276945">"Bevestig"</string>
- <string name="cancel" msgid="4306609731174629323">"Kanselleer"</string>
- <string name="remove" msgid="5513398257088729188">"Verwyder"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Verbinding"</string>
- <string name="forget_title" msgid="3027608547243824729">"Vergeet hierdie toestel"</string>
- <string name="forget" msgid="2069897665699141222">"Vergeet"</string>
- <string name="disable" msgid="4619854429066283970">"Deaktiveer"</string>
- <string name="enable" msgid="7656386199154111316">"Aktiveer"</string>
- <string name="continue_button" msgid="2748318968566159950">"Gaan voort"</string>
- <string name="retry" msgid="3783419451480721367">"Probeer weer"</string>
- <string name="turn_on" msgid="4288754850470994812">"Skakel aan"</string>
- <string name="not_now" msgid="8764692269093707622">"Nie nou nie"</string>
- <string name="connected" msgid="8051190714042020471">"Gekoppel"</string>
- <string name="notDetected" msgid="4115229772085594506">"Nie bespeur nie"</string>
- <string name="disconnected" msgid="8526513868622591894">"Ontkoppel"</string>
- <string name="unknown" msgid="555736316465118024">"Onbekend"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Foon se SMS-diens werk tans"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Foon se SMS-diens is aktief"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Ontvang tans SMS\'e deur metgeseltoestel"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Ontsluit profiel met foon"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Gaan jou metgeselprogram na om ontsluitingopsies te stel"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Laat &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; my profiel ontsluit"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Jou foon moet aktief gekoppel wees"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"As jy hierdie kenmerk wil aanskakel, moet jy seker maak dat Bluetooth in jou motor en op jou foon aangeskakel is en naby mekaar is"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; kan nou jou profiel ontsluit"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Skep \'n primêre profielslot"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"As jy jou foon wil gebruik om jou profiel te ontsluit, moet jy \'n primêre profielslot as \'n rugsteun hê"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Ontsluit jou profiel om proses klaar te maak"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Jy het \'n nuwe profielslot geskep. Nou moet jy dit weer invoer om te bevestig dat jou foon jou profiel outomaties kan ontsluit"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Ontkoppel hierdie toestel"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Herkoppel hierdie toestel"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Ontsluit met foon"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Laat jou foon jou profiel ontsluit"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Tik hier om hierdie kenmerk te magtig"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Iets is fout"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Ongelukkig kon hierdie kenmerk nie op die oomblik aangeskakel word nie. Probeer weer."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Skep \'n skermslot op jou foon"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Daar is nie \'n skermslot vir jou foon gestel nie. Skep eers \'n skermslot (ook bekend as \'n wagkode) in jou foon se instellings om jou motorprofiel met jou foon te ontsluit."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Verwante toestel</string>
+ <string name="add_device_title">Voeg geassosieerde toestel by</string>
+ <string name="add_associated_device_title">Koppel \'n metgeseltoestel</string>
+ <string name="add_associated_device_instruction">Jy kan jou foon as \'n metgeseltoestel gebruik om jou ryervaring te help bestuur</string>
+ <string name="associated_device_install_app">Maak seker dat <b>metgeselprogram</b> op jou foon geïnstalleer is</string>
+ <string name="associated_device_pairing_code_title">Bevestig kode op foon</string>
+ <string name="associated_device_pairing_message">Maak seker dat dit ooreenstem met die kode wat op jou foon gewys word</string>
+ <string name="associated_device_success">Toestel is suksesvol geassosieer</string>
+ <string name="associated_device_select_device">Maak die program oop en koppel aan &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Maak die program oop en volg instruksies in die program</string>
+ <string name="remove_associated_device_title">Vergeet &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Hierdie motor sal nie meer met hierdie toestel saamgebind wees nie. Jy sal hierdie motor ook uit die metgeselprogram moet verwyder.</string>
+ <string name="device_removed_success_toast_text">%1$s is vergeet</string>
+ <string name="device_removed_failure_toast_text">Kon nie %1$s vergeet nie</string>
+ <string name="continue_setup_toast_text">Gaan op jou foon met die opstelling voort</string>
+ <string name="error_screen_title">Iets was fout</string>
+ <string name="error_screen_message">Hierdie skerm kon ongelukkig nie reg gewys word nie. Probeer weer.</string>
+ <string name="turn_on_bluetooth_title">Skakel Bluetooth aan</string>
+ <string name="turn_on_bluetooth_message">Jou motor moet Bluetooth hê om jou foon as \'n metgeseltoestel op te stel.</string>
+ <string name="turn_on_bluetooth_dialog_title">Skakel Bluetooth aan?</string>
+ <string name="turn_on_bluetooth_dialog_message">Jou motor moet Bluetooth hê om aan jou metgeseltoestel te koppel.</string>
+ <string name="accept">Aanvaar</string>
+ <string name="reject">Weier</string>
+ <string name="confirm">Bevestig</string>
+ <string name="cancel">Kanselleer</string>
+ <string name="remove">Verwyder</string>
+ <string name="ok">OK</string>
+ <string name="connection">Verbinding</string>
+ <string name="forget_title">Vergeet hierdie toestel</string>
+ <string name="forget">Vergeet</string>
+ <string name="disable">Deaktiveer</string>
+ <string name="enable">Aktiveer</string>
+ <string name="continue_button">Gaan voort</string>
+ <string name="retry">Probeer weer</string>
+ <string name="turn_on">Skakel aan</string>
+ <string name="not_now">Nie nou nie</string>
+ <string name="connected">Gekoppel</string>
+ <string name="notDetected">Nie bespeur nie</string>
+ <string name="disconnected">Ontkoppel</string>
+ <string name="unknown">Onbekend</string>
+ <string name="app_running_msg_channel_name">Foon se SMS-diens werk tans</string>
+ <string name="app_running_msg_notification_title">Foon se SMS-diens is aktief</string>
+ <string name="app_running_msg_notification_content">Ontvang tans SMS\'e deur metgeseltoestel</string>
+ <string name="trusted_device_feature_title">Ontsluit profiel met foon</string>
+ <string name="trusted_device_feature_instruction">Gaan jou metgeselprogram na om ontsluitingopsies te stel</string>
+ <string name="trusted_device_item_title">Laat &lt;b&gt;%1$s&lt;/b&gt; my profiel ontsluit</string>
+ <string name="device_not_connected_dialog_title">Jou foon moet aktief gekoppel wees</string>
+ <string name="device_not_connected_dialog_message">As jy hierdie kenmerk wil aanskakel, moet jy seker maak dat Bluetooth in jou motor en op jou foon aangeskakel is en dat hulle naby mekaar is</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; kan nou jou profiel ontsluit</string>
+ <string name="create_profile_lock_dialog_title">Skep \'n primêre profielslot</string>
+ <string name="create_profile_lock_dialog_message">As jy jou foon wil gebruik om jou profiel te ontsluit, moet jy \'n primêre profielslot as \'n rugsteun hê</string>
+ <string name="unlock_profile_to_finish_title">Ontsluit jou profiel om te voltooi</string>
+ <string name="unlock_profile_to_finish_message">Jy het \'n nuwe profielslot geskep. Nou moet jy dit weer invoer om te bevestig dat jou foon jou profiel outomaties kan ontsluit</string>
+ <string name="disable_device_connection_text">Ontkoppel hierdie toestel</string>
+ <string name="enable_device_connection_text">Herkoppel hierdie toestel</string>
+ <string name="trusted_device_notification_channel_name">Ontsluit met foon</string>
+ <string name="trusted_device_notification_title">Laat jou foon jou profiel ontsluit</string>
+ <string name="trusted_device_notification_content">Tik hier om hierdie kenmerk te magtig</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Iets was fout</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Hierdie kenmerk kan ongelukkig nie op die oomblik aangeskakel word nie. Probeer weer.</string>
+ <string name="create_phone_lock_dialog_title">Skep \'n skermslot op jou foon</string>
+ <string name="create_phone_lock_dialog_message">\'n Skermslot is nie vir jou foon gestel nie. Skep eers \'n skermslot (ook bekend as \'n wagkode) in jou foon se instellings om jou motorprofiel met jou foon te ontsluit.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Nuwe boodskap</item>
+ <item quantity="other">%d nuwe boodskappe</item>
+ </plurals>
+ <string name="name_not_available">Naam is nie beskikbaar nie</string>
</resources>
diff --git a/companiondevice/res/values-am/strings.xml b/companiondevice/res/values-am/strings.xml
index a3df43d..e3b35c3 100644
--- a/companiondevice/res/values-am/strings.xml
+++ b/companiondevice/res/values-am/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"የተጎዳኘ መሣሪያ"</string>
- <string name="add_device_title" msgid="6166003577845888151">"ተጓዳኝ መሣሪያ አክል"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"አጃቢ መሣሪያ ያገናኙ"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"የመንዳት ተሞክሮዎን እንዲያቀናብሩ እንዲያግዝ ስልክዎን እንደ አጃቢ መሣሪያዎ ሊጠቀሙበት ይችላሉ"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"በስልክዎ ላይ "<b>"አጃቢ መተግበሪያ"</b>" መጫንዎን ያረጋግጡ"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"በስልክ ላይ ኮድ ያረጋግጡ"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"ይህ በስልክዎ ላይ ከሚታየው ኮድ ጋር እንደሚዛመድ ያረጋግጡ"</string>
- <string name="associated_device_success" msgid="584760065696870256">"መሣሪያ በተሳካ ሁኔታ ተገናኝቷል"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"መተግበሪያውን ይክፈቱትና ከ&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; ጋር ያገናኙት"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"መተግበሪያውን ይክፈቱ እና በመተግበሪያው ውስጥ መመሪያዎችን ይከተሉ"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; ይረሳ?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"ይህ መኪና ከእንግዲህ ከዚህ መሣሪያ ጋር አይጣመርም። በተጨማሪም ይህን መኪና ከአጃቢ መተግበሪያው ማስወገድ አለብዎት።"</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> ተረስቷል"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g>ን መርሳት አልተሳካም"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"በእርስዎ ስልክ ላይ ማዋቀር ይቀጥሉ"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"የሆነ ችግር ተፈጥሯል"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"መጥፎ ዕድል ሆኖ ይህ ማያ ገጽ በአግባቡ ማሳየት አይችልም። እባክዎ እንደገና ይሞክሩ።"</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"ብሉቱዝን አብራ"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"ስልክዎን እንደ አጃቢ መሣሪያ ለማቀናበር መኪናዎ ብሉቱዝ ያስፈልገዋል።"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"ብሉቱዝ ይብራ?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"አጃቢ መሣሪያዎን ለማገናኘት መኪናዎ ብሉቱዝ ያስፈልገዋል።"</string>
- <string name="accept" msgid="1454710793329618813">"ተቀበል"</string>
- <string name="reject" msgid="4315432282758892890">"አትቀበል"</string>
- <string name="confirm" msgid="3748997214719276945">"አረጋግጥ"</string>
- <string name="cancel" msgid="4306609731174629323">"ይቅር"</string>
- <string name="remove" msgid="5513398257088729188">"አስወግድ"</string>
- <string name="ok" msgid="2825038997730899083">"እሺ"</string>
- <string name="connection" msgid="2798490936433656846">"ግንኙነት"</string>
- <string name="forget_title" msgid="3027608547243824729">"ይህን መሣሪያ እርሳ"</string>
- <string name="forget" msgid="2069897665699141222">"እርሳ"</string>
- <string name="disable" msgid="4619854429066283970">"አሰናክል"</string>
- <string name="enable" msgid="7656386199154111316">"አንቃ"</string>
- <string name="continue_button" msgid="2748318968566159950">"ቀጥል"</string>
- <string name="retry" msgid="3783419451480721367">"እንደገና ሞክር"</string>
- <string name="turn_on" msgid="4288754850470994812">"አብራ"</string>
- <string name="not_now" msgid="8764692269093707622">"አሁን አይደለም"</string>
- <string name="connected" msgid="8051190714042020471">"ተገናኝቷል"</string>
- <string name="notDetected" msgid="4115229772085594506">"አልተገኘም"</string>
- <string name="disconnected" msgid="8526513868622591894">"ግንኙነት ተቋርጧል"</string>
- <string name="unknown" msgid="555736316465118024">"ያልታወቀ"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"የስልክ ጽሑፍ መልዕክት አገልግሎት በማሄድ ላይ"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"የስልክ ጽሑፍ መልዕክት መላላኪያ አገልግሎት ገቢር ነው"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"በአጃቢ መሣሪያ በኩል የጽሑፍ መልዕክቶችን በመቀበል ላይ"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"መገለጫውን በስልክ ይክፈቱት"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"የመክፈቻ አማራጮችን ለማቀናበር አጃቢ መተግበሪያዎን ይፈትሹ"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; መገለጫዬን ይክፈተው"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"የእርስዎ ስልክ በንቃት መገናኘት አለበት"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"ይህን ባህሪ ለማብራት የእርስዎ መኪና እና ስልክ ብሉቱዝ ማብራታቸውን እና እርስ ከራሳቸው ጋር አጠገብ መሆናቸውን ያረጋግጡ"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; አሁን መገለጫዎን መክፈት ይችላል"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"ዋና የመገለጫ ቁልፍ ይፍጠሩ"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"ስልክዎን ተጠቅመው መገለጫዎን ለመክፈት ዋና የመገለጫ ቁልፍ እንደ መጠባበቂያ ያስፈልገዎታል"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"ለመጨረስ መገለጫዎን ይክፈቱት"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"አዲስ የመገለጫ ቁልፍ ፈጥረዋል። በመቀጠል ስልክዎ መገለጫዎን በራስ-ሰር መክፈት መቻሉን ለማረጋገጥ እንደገና ያስገቡት"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"የዚህን መሣሪያ ግንኙነት ያቋርጡ"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"ይህን መሣሪያ ዳግም አገናኝ"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"በስልክ ክፈት"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"ስልክዎ መገለጫዎን ይክፈተው"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"ለዚህ ባህሪ ፈቀዳ ለመስጠት እዚህ መታ ያድርጉ"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"የሆነ ችግር ተፈጥሯል"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"መጥፎ ዕድል ሆኖ ይህ ባህሪ በዚህ ጊዜ ሊበራ አልቻለም። እባክዎ እንደገና ይሞክሩ።"</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"በስልክዎ ላይ የማያ ገጽ ቁልፍ ይፍጠሩ"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"የእርስዎ ስልክ የማያ ቁልፍ አልተቀናበረለትም። የመኪናዎን መገለጫ በስልክዎ ለመክፈት መጀመሪያ በቁልፍዎ ቅንብሮች ውስጥ የማያ ገጽ ቁልፍ (እንዲሁም የይለፍ ኮድ በመባል የሚታወቅ) ይፍጠሩ።"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">የተጎዳኘ መሣሪያ</string>
+ <string name="add_device_title">ተጓዳኝ መሣሪያ አክል</string>
+ <string name="add_associated_device_title">አጃቢ መሣሪያ ያገናኙ</string>
+ <string name="add_associated_device_instruction">የመንዳት ተሞክሮዎን እንዲያቀናብሩ እንዲያግዝ ስልክዎን እንደ አጃቢ መሣሪያዎ ሊጠቀሙበት ይችላሉ</string>
+ <string name="associated_device_install_app">በስልክዎ ላይ <b>አጃቢ መተግበሪያ</b> መጫንዎን ያረጋግጡ</string>
+ <string name="associated_device_pairing_code_title">በስልክ ላይ ኮድ ያረጋግጡ</string>
+ <string name="associated_device_pairing_message">ይህ በስልክዎ ላይ ከሚታየው ኮድ ጋር እንደሚዛመድ ያረጋግጡ</string>
+ <string name="associated_device_success">መሣሪያ በተሳካ ሁኔታ ተገናኝቷል</string>
+ <string name="associated_device_select_device">መተግበሪያውን ይክፈቱትና &lt;b&gt;%1$s&lt;/b&gt; ጋር ያገናኙት</string>
+ <string name="associated_device_open_app">መተግበሪያውን ይክፈቱ እና በመተግበሪያው ውስጥ መመሪያዎችን ይከተሉ</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; እርሳ?</string>
+ <string name="remove_associated_device_message">ይህ መኪና ከእንግዲህ ከዚህ መሣሪያ ጋር አይጣመርም። በተጨማሪም ይህን መኪና ከአጃቢ መተግበሪያው ማስወገድ አለብዎት።</string>
+ <string name="device_removed_success_toast_text">%1$s ተረስቷል</string>
+ <string name="device_removed_failure_toast_text">%1$sን መርሳት አልተሳካም</string>
+ <string name="continue_setup_toast_text">በእርስዎ ስልክ ላይ ማዋቀር ይቀጥሉ</string>
+ <string name="error_screen_title">የሆነ ስህተት ተከስቷል</string>
+ <string name="error_screen_message">መጥፎ ዕድል ሆኖ ይህ ማያ ገጽ በአግባቡ ማሳየት አይችልም። እባክዎ እንደገና ይሞክሩ።</string>
+ <string name="turn_on_bluetooth_title">ብሉቱዝ ያብሩ</string>
+ <string name="turn_on_bluetooth_message">ስልክዎን እንደ አጃቢ መሣሪያ ለማቀናበር መኪናዎ ብሉቱዝ ያስፈልገዋል።</string>
+ <string name="turn_on_bluetooth_dialog_title">ብሉቱዝ ይብራ?</string>
+ <string name="turn_on_bluetooth_dialog_message">አጃቢ መሣሪያዎን ለማገናኘት መኪናዎ ብሉቱዝ ያስፈልገዋል።</string>
+ <string name="accept">ተቀበል</string>
+ <string name="reject">አትቀበል</string>
+ <string name="confirm">አረጋግጥ</string>
+ <string name="cancel">ይቅር</string>
+ <string name="remove">አስወግድ</string>
+ <string name="ok">እሺ</string>
+ <string name="connection">ግንኙነት</string>
+ <string name="forget_title">ይህን መሣሪያ እርሳ</string>
+ <string name="forget">እርሳ</string>
+ <string name="disable">አሰናክል</string>
+ <string name="enable">አንቃ</string>
+ <string name="continue_button">ቀጥል</string>
+ <string name="retry">እንደገና ሞክር</string>
+ <string name="turn_on">አብራ</string>
+ <string name="not_now">አሁን አይደለም</string>
+ <string name="connected">ተገናኝቷል</string>
+ <string name="notDetected">አልተገኘም</string>
+ <string name="disconnected">ተቋርጧል</string>
+ <string name="unknown">ያልታወቀ</string>
+ <string name="app_running_msg_channel_name">የስልክ ጽሑፍ መልዕክት አገልግሎት በማሄድ ላይ</string>
+ <string name="app_running_msg_notification_title">የስልክ ጽሑፍ መልዕክት መላላኪያ አገልግሎት ገቢር ነው</string>
+ <string name="app_running_msg_notification_content">በአጃቢ መሣሪያ በኩል የጽሑፍ መልዕክቶችን በመቀበል ላይ</string>
+ <string name="trusted_device_feature_title">መገለጫውን በስልክ ይክፈቱት</string>
+ <string name="trusted_device_feature_instruction">የመክፈቻ አማራጮችን ለማቀናበር አጃቢ መተግበሪያዎን ይፈትሹ</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; መገለጫዬን እንዲከፍት ይፍቀዱ</string>
+ <string name="device_not_connected_dialog_title">የእርስዎ ስልክ በንቃት መገናኘት አለበት</string>
+ <string name="device_not_connected_dialog_message">ይህን ባህሪ ለማብራት የእርስዎ መኪና እና ስልክ ብሉቱዝ ማብራታቸውን እና እርስ ከራሳቸው ጋር አጠገብ መሆናቸውን ያረጋግጡ</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; አሁን መገለጫዎን ማስከፈት ይችላል</string>
+ <string name="create_profile_lock_dialog_title">ዋና የመገለጫ ቁልፍ ይፍጠሩ</string>
+ <string name="create_profile_lock_dialog_message">ስልክዎን ተጠቅመው መገለጫዎን ለመክፈት ዋና የመገለጫ ቁልፍ እንደ መጠባበቂያ ያስፈልገዎታል</string>
+ <string name="unlock_profile_to_finish_title">ለመጨረስ መገለጫዎን ይክፈቱት</string>
+ <string name="unlock_profile_to_finish_message">አዲስ የመገለጫ ቁልፍ ፈጥረዋል። በመቀጠል ስልክዎ መገለጫዎን በራስ-ሰር መክፈት መቻሉን ለማረጋገጥ እንደገና ያስገቡት</string>
+ <string name="disable_device_connection_text">የዚህን መሣሪያ ግንኙነት ያቋርጡ</string>
+ <string name="enable_device_connection_text">ይህን መሣሪያ ዳግም ያገናኙ</string>
+ <string name="trusted_device_notification_channel_name">በስልክ ክፈት</string>
+ <string name="trusted_device_notification_title">ስልክዎ መገለጫዎን ይክፈተው</string>
+ <string name="trusted_device_notification_content">ለዚህ ባህሪ ፈቀዳ ለመስጠት እዚህ መታ ያድርጉ</string>
+ <string name="trusted_device_enrollment_error_dialog_title">የሆነ ስህተት ተከስቷል</string>
+ <string name="trusted_device_enrollment_error_dialog_message">መጥፎ ዕድል ሆኖ ይህ ባህሪ በዚህ ጊዜ ሊበራ አልቻለም። እባክዎ እንደገና ይሞክሩ።</string>
+ <string name="create_phone_lock_dialog_title">በስልክዎ ላይ የማያ ገጽ ቁልፍ ይፍጠሩ</string>
+ <string name="create_phone_lock_dialog_message">የእርስዎ ስልክ የማያ ቁልፍ አልተቀናበረለትም። የመኪናዎን መገለጫ በስልክዎ ለመክፈት መጀመሪያ በስልክዎ ቅንብሮች ውስጥ የማያ ገጽ ቁልፍ (እንዲሁም የይለፍ ኮድ በመባል የሚታወቅ) ይፍጠሩ።</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d አዲስ መልዕክቶች</item>
+ <item quantity="other">%d አዲስ መልዕክቶች</item>
+ </plurals>
+ <string name="name_not_available">ስም አይገኝም</string>
</resources>
diff --git a/companiondevice/res/values-ar/strings.xml b/companiondevice/res/values-ar/strings.xml
index 44797a8..1660068 100644
--- a/companiondevice/res/values-ar/strings.xml
+++ b/companiondevice/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,78 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"جهاز مرتبط"</string>
- <string name="add_device_title" msgid="6166003577845888151">"إضافة جهاز مرتبط"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"ربط جهاز مصاحب"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"يمكنك استخدام هاتفك كجهاز مصاحب لمساعدتك في قيادة سيارتك."</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"احرِص على تثبيت "<b>"التطبيق المصاحب"</b>" على هاتفك."</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"تأكيد الرمز على الهاتف"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"تأكّد من تطابق هذا الرمز مع الرمز المعروض على هاتفك."</string>
- <string name="associated_device_success" msgid="584760065696870256">"تم ربط الجهاز بنجاح."</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"افتح التطبيق واربط الجهاز بالسيارة &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"فتح التطبيق واتباع التعليمات الموضحة به"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"هل تريد حذف &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;؟"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"لن يتم إقران هذه السيارة بهذا الجهاز بعد الآن. وعليك أيضًا إزالة هذه السيارة من التطبيق المصاحب."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"تم حذف <xliff:g id="PHONE_NAME">%1$s</xliff:g>."</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"تعذَّر حذف <xliff:g id="PHONE_NAME">%1$s</xliff:g>."</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"مواصلة الإعداد على هاتفك"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"حدث خطأ"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"تعذَّر عرض هذه الشاشة بشكل صحيح. يُرجى إعادة المحاولة."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"تفعيل البلوتوث"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"لإعداد هاتفك كجهاز مصاحب، يجب تفعيل البلوتوث في سيارتك."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"هل تريد تفعيل البلوتوث؟"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"يجب تفعيل البلوتوث في سيارتك لتتمكّن من ربطها بالجهاز المصاحب."</string>
- <string name="accept" msgid="1454710793329618813">"قبول"</string>
- <string name="reject" msgid="4315432282758892890">"رفض"</string>
- <string name="confirm" msgid="3748997214719276945">"تأكيد"</string>
- <string name="cancel" msgid="4306609731174629323">"إلغاء"</string>
- <string name="remove" msgid="5513398257088729188">"إزالة"</string>
- <string name="ok" msgid="2825038997730899083">"حسنًا"</string>
- <string name="connection" msgid="2798490936433656846">"الربط"</string>
- <string name="forget_title" msgid="3027608547243824729">"حذف هذا الجهاز"</string>
- <string name="forget" msgid="2069897665699141222">"حذف"</string>
- <string name="disable" msgid="4619854429066283970">"إيقاف"</string>
- <string name="enable" msgid="7656386199154111316">"تفعيل"</string>
- <string name="continue_button" msgid="2748318968566159950">"متابعة"</string>
- <string name="retry" msgid="3783419451480721367">"إعادة المحاولة"</string>
- <string name="turn_on" msgid="4288754850470994812">"تفعيل"</string>
- <string name="not_now" msgid="8764692269093707622">"ليس الآن"</string>
- <string name="connected" msgid="8051190714042020471">"تم الربط"</string>
- <string name="notDetected" msgid="4115229772085594506">"لم يتم رصد أي أجهزة."</string>
- <string name="disconnected" msgid="8526513868622591894">"تم إلغاء الربط"</string>
- <string name="unknown" msgid="555736316465118024">"غير معروفة"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"خدمة تلقّي الرسائل النصية على الهاتف مُفعَّلة"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"خدمة تلقّي الرسائل النصية على الهاتف مُفعَّلة"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"تلقّي الرسائل النصية باستخدام الجهاز المصاحب"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"فتح قفل الملف الشخصي باستخدام الهاتف"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"افتح تطبيقك المصاحب لضبط خيارات فتح القفل."</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"السماح لهاتف &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; بفتح قفل ملفي الشخصي"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"يجب أن تكون ميزة الربط بالهاتف مفعَّلة"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"لتفعيل هذه الميزة، احرِص على تفعيل البلوتوث في سيارتك وهاتفك وأن يكون الهاتف قريبًا من السيارة."</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"بإمكان &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; الآن فتح قفل ملفك الشخصي."</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"إنشاء قفل أساسي للملف الشخصي"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"لاستخدام هاتفك في فتح قفل ملفك الشخصي، يجب أن يكون لديك قفل أساسي للملف الشخصي كنسخة احتياطية."</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"فتح قفل ملفك الشخصي لإتمام العملية"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"لقد أنشأت قفلاً جديدًا للملف الشخصي. بعد ذلك، أدخِله مرة أخرى للتأكّد من أن هاتفك يمكنه فتح قفل ملفك الشخصي تلقائيًا."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"إلغاء ربط هذا الجهاز"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"إعادة ربط هذا الجهاز"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"فتح القفل باستخدام الهاتف"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"السماح لهاتفك بفتح قفل ملفك الشخصي"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"انقر هنا للسماح بهذه الميزة."</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"حدث خطأ"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"تعذَّر تفعيل هذه الميزة في الوقت الحالي. يُرجى إعادة المحاولة."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"إنشاء \"قفل الشاشة\" على هاتفك"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"ميزة \"قفل الشاشة\" غير مُفعَّلة على هاتفك. لفتح قفل ملفك الشخصي للسيارة باستخدام هاتفك، عليك أولاً إنشاء قفل الشاشة (المعروف أيضًا باسم \"رمز المرور\") من خلال إعدادات هاتفك."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">جهاز مرتبط</string>
+ <string name="add_device_title">إضافة جهاز مرتبط</string>
+ <string name="add_associated_device_title">إنشاء اتصال بين جهاز مصاحب والسيارة</string>
+ <string name="add_associated_device_instruction">يمكنك استخدام هاتفك كجهاز مصاحب لمساعدتك في قيادة سيارتك.</string>
+ <string name="associated_device_install_app">تأكّد من أن <b>التطبيق المصاحب</b> مُثبَّت على هاتفك.</string>
+ <string name="associated_device_pairing_code_title">تأكيد الرمز على الهاتف</string>
+ <string name="associated_device_pairing_message">أكِّد تطابق هذا الرمز مع الرمز الموضّح على هاتفك.</string>
+ <string name="associated_device_success">تم ربط الجهاز بنجاح.</string>
+ <string name="associated_device_select_device">فتح التطبيق لربط الجهاز بالسيارة &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">افتح التطبيق واتّبع التعليمات التي يعرضها لك.</string>
+ <string name="remove_associated_device_title">هل تريد حذف &lt;b&gt;%1$s&lt;/b&gt;؟</string>
+ <string name="remove_associated_device_message">لن تكون هذه السيارة مقترنة بهذا الجهاز من الآن. وسيكون عليك أيضًا إزالة هذه السيارة من التطبيق المصاحب.</string>
+ <string name="device_removed_success_toast_text">تم حذف %1$s.</string>
+ <string name="device_removed_failure_toast_text">تعذَّر حذف %1$s.</string>
+ <string name="continue_setup_toast_text">مواصلة الإعداد على هاتفك</string>
+ <string name="error_screen_title">حدث خطأ</string>
+ <string name="error_screen_message">تعذَّر عرض هذه الشاشة بشكل صحيح. يُرجى إعادة المحاولة.</string>
+ <string name="turn_on_bluetooth_title">تفعيل البلوتوث</string>
+ <string name="turn_on_bluetooth_message">لإعداد هاتفك كجهاز مصاحب، يجب تفعيل البلوتوث في سيارتك.</string>
+ <string name="turn_on_bluetooth_dialog_title">هل تريد تفعيل البلوتوث؟</string>
+ <string name="turn_on_bluetooth_dialog_message">يجب تفعيل البلوتوث في سيارتك لتتمكّن من إنشاء اتصال بينها وبين الجهاز المصاحب.</string>
+ <string name="accept">قبول</string>
+ <string name="reject">رفض</string>
+ <string name="confirm">تأكيد</string>
+ <string name="cancel">إلغاء</string>
+ <string name="remove">إزالة</string>
+ <string name="ok">حسنًا</string>
+ <string name="connection">الاتصال</string>
+ <string name="forget_title">حذف هذا الجهاز</string>
+ <string name="forget">حذف</string>
+ <string name="disable">إيقاف</string>
+ <string name="enable">تفعيل</string>
+ <string name="continue_button">متابعة</string>
+ <string name="retry">إعادة المحاولة</string>
+ <string name="turn_on">تفعيل</string>
+ <string name="not_now">لاحقًا</string>
+ <string name="connected">متصل بالسيارة</string>
+ <string name="notDetected">لم ترصده السيارة</string>
+ <string name="disconnected">غير متصل بالسيارة</string>
+ <string name="unknown">الحالة غير معروفة</string>
+ <string name="app_running_msg_channel_name">خدمة تلقّي الرسائل النصية على الهاتف مُفعَّلة</string>
+ <string name="app_running_msg_notification_title">خدمة تلقّي الرسائل النصية على الهاتف نشطة.</string>
+ <string name="app_running_msg_notification_content">يتم تلقّي الرسائل النصية عبر الجهاز المصاحب.</string>
+ <string name="trusted_device_feature_title">فتح قفل الملف الشخصي باستخدام الهاتف</string>
+ <string name="trusted_device_feature_instruction">افتح التطبيق المصاحب لضبط خيارات فتح القفل.</string>
+ <string name="trusted_device_item_title">السماح لجهاز &lt;b&gt;%1$s&lt;/b&gt; بفتح قفل ملفي الشخصي</string>
+ <string name="device_not_connected_dialog_title">يجب أن يكون هاتفك في وضع اتصال نشط.</string>
+ <string name="device_not_connected_dialog_message">لتفعيل هذه الميزة، احرِص على تفعيل البلوتوث في سيارتك وهاتفك وأن يكون الهاتف قريبًا من السيارة.</string>
+ <string name="trusted_device_enrollment_success_message">بإمكان &lt;b&gt;%1$s&lt;/b&gt; الآن فتح قفل ملفك الشخصي.</string>
+ <string name="create_profile_lock_dialog_title">إنشاء قفل أساسي للملف الشخصي</string>
+ <string name="create_profile_lock_dialog_message">لاستخدام هاتفك في فتح قفل ملفك الشخصي، يجب أن يكون لديك قفل أساسي للملف الشخصي كنسخة احتياطية.</string>
+ <string name="unlock_profile_to_finish_title">فتح قفل ملفك الشخصي لإكمال الإجراء</string>
+ <string name="unlock_profile_to_finish_message">لقد أنشأت قفلاً جديدًا للملف الشخصي. بعد ذلك، أدخِله مرة أخرى للتأكّد من أن هاتفك يمكنه فتح قفل ملفك الشخصي تلقائيًا.</string>
+ <string name="disable_device_connection_text">قطع الاتصال بهذا الجهاز</string>
+ <string name="enable_device_connection_text">إعادة الاتصال بهذا الجهاز</string>
+ <string name="trusted_device_notification_channel_name">فتح القفل باستخدام الهاتف</string>
+ <string name="trusted_device_notification_title">السماح لهاتفك بفتح قفل ملفك الشخصي</string>
+ <string name="trusted_device_notification_content">انقر هنا للسماح بهذه الميزة.</string>
+ <string name="trusted_device_enrollment_error_dialog_title">حدث خطأ</string>
+ <string name="trusted_device_enrollment_error_dialog_message">تعذَّر تفعيل هذه الميزة في الوقت الحالي. يُرجى إعادة المحاولة.</string>
+ <string name="create_phone_lock_dialog_title">إنشاء قفل للشاشة على هاتفك</string>
+ <string name="create_phone_lock_dialog_message">ميزة \"قفل الشاشة\" غير مُفعَّلة على هاتفك. لفتح قفل ملفك الشخصي للسيارة باستخدام هاتفك، عليك أولاً إنشاء قفل الشاشة (المعروف أيضًا باسم \"رمز المرور\") من خلال إعدادات هاتفك.</string>
+ <plurals name="notification_new_message">
+ <item quantity="zero">%d رسالة جديدة</item>
+ <item quantity="one">رسالة جديدة</item>
+ <item quantity="two">رسالتان (%d) جديدتان</item>
+ <item quantity="few">%d رسائل جديدة</item>
+ <item quantity="many">%d رسالة جديدة</item>
+ <item quantity="other">%d رسالة جديدة</item>
+ </plurals>
+ <string name="name_not_available">الاسم غير متاح.</string>
</resources>
diff --git a/companiondevice/res/values-as/strings.xml b/companiondevice/res/values-as/strings.xml
index 63fd4fb..57ed6d8 100644
--- a/companiondevice/res/values-as/strings.xml
+++ b/companiondevice/res/values-as/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"জড়িত ডিভাইচ"</string>
- <string name="add_device_title" msgid="6166003577845888151">"জড়িত ডিভাইচটো যোগ দিয়ক"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"এটা সহযোগী ডিভাইচ সংযোগ কৰক"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"আপোনাৰ গাড়ী চলোৱাৰ অভিজ্ঞতা পৰিচালনা কৰাত সহায় কৰিবলৈ আপুনি নিজৰ ফ’নটো এটা সহযোগী ডিভাইচ হিচাপে ব্যৱহাৰ কৰিব পাৰে"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"আপোনাৰ ফ’নটোত "<b>"সহযোগী এপ্‌"</b>" ইনষ্টল হৈ থকাটো নিশ্চিত কৰক"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"ক’ডটো ফ’নত নিশ্চিত কৰক"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"এইটো আপোনাৰ ফ’নটোত দেখুওৱা ক’ডটোৰ সৈতে মিলাটো নিশ্চিত কৰক"</string>
- <string name="associated_device_success" msgid="584760065696870256">"ডিভাইচটো সফলতাৰে জড়িত কৰা হৈছে"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"এপ্‌টো খুলি &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;ৰে সংযোগ কৰক"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"এপ্‌টো খুলি তাত থকা নিৰ্দেশাৱলী অনুসৰণ কৰক"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;ক আঁতৰাবনে?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"এই গাড়ীখনক আৰু এই ডিভাইচটোৰ সৈতে পেয়াৰ কৰা নহ’ব। ইয়াৰ উপৰিও আপুনি সহযোগী এপ্‌টোৰ পৰা এই গাড়ীখন আঁতৰাব লাগিব।"</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g>ক আঁতৰোৱা হৈছে"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g>ক আঁতৰাব পৰা নগ’ল"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"আপোনাৰ ফ’নটোত ছেটআপ অব্যাহত ৰাখক"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"কিবা ভুল হ’ল"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"দুৰ্ভাগ্যবশতঃ, এই স্ক্ৰীনখনে সঠিকভাৱে দেখুৱাবলৈ সক্ষম নহ\'ল। অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।"</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"ব্লুটুথ অন কৰক"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"আপোনাৰ ফ’নটোক এটা সহযোগী ডিভাইচ হিচাপে ছেট আপ কৰিবলৈ আপোনাৰ গাড়ীখনক ব্লুটুথৰ প্ৰয়োজন।"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"ব্লুটুথ অন কৰিবনে?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"আপোনাৰ সহযোগী ডিভাইচটোৰ সৈতে সংযোগ কৰিবলৈ আপোনাৰ গাড়ীখনক ব্লুটুথৰ প্ৰয়োজন।"</string>
- <string name="accept" msgid="1454710793329618813">"গ্ৰহণ কৰক"</string>
- <string name="reject" msgid="4315432282758892890">"প্ৰত্যাখ্যান কৰক"</string>
- <string name="confirm" msgid="3748997214719276945">"নিশ্চিত কৰক"</string>
- <string name="cancel" msgid="4306609731174629323">"বাতিল কৰক"</string>
- <string name="remove" msgid="5513398257088729188">"আঁতৰাওক"</string>
- <string name="ok" msgid="2825038997730899083">"ঠিক আছে"</string>
- <string name="connection" msgid="2798490936433656846">"সংযোগ"</string>
- <string name="forget_title" msgid="3027608547243824729">"এই ডিভাইচটো আঁতৰাওক"</string>
- <string name="forget" msgid="2069897665699141222">"পাহৰি যাওক"</string>
- <string name="disable" msgid="4619854429066283970">"অক্ষম কৰক"</string>
- <string name="enable" msgid="7656386199154111316">"সক্ষম কৰক"</string>
- <string name="continue_button" msgid="2748318968566159950">"অব্যাহত ৰাখক"</string>
- <string name="retry" msgid="3783419451480721367">"পুনৰ চেষ্টা কৰক"</string>
- <string name="turn_on" msgid="4288754850470994812">"অন কৰক"</string>
- <string name="not_now" msgid="8764692269093707622">"এতিয়া নহয়"</string>
- <string name="connected" msgid="8051190714042020471">"সংযোগ কৰা হৈছে"</string>
- <string name="notDetected" msgid="4115229772085594506">"চিনাক্ত কৰা হোৱা নাই"</string>
- <string name="disconnected" msgid="8526513868622591894">"সংযোগ বিচ্ছিন্ন হৈছে"</string>
- <string name="unknown" msgid="555736316465118024">"অজ্ঞাত"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"ফ’নৰ পাঠ বাৰ্তাৰ সেৱাটো চলি আছে"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"ফ’নৰ পাঠ বাৰ্তাৰ সেৱাটো সক্ৰিয় হৈ আছে"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"সহযোগী ডিভাইচৰ জৰিয়তে পাঠ বাৰ্তাসমূহ লাভ কৰি থকা হৈছে"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"ফ’নৰ জৰিয়তে প্ৰ’ফাইল আনলক কৰক"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"আনলক কৰাৰ বিকল্পসমূহ ছেট কৰিবলৈ আপোনাৰ সহযোগী এপ্‌টো পৰীক্ষা কৰক"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;ক মোৰ প্ৰ’ফাইলটো আনলক কৰিবলৈ দিয়ক"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"আপোনাৰ ফ’নটো সক্ৰিয়ভাৱে সংযোগ হৈ থাকিবই লাগিব"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"এই সুবিধাটো অন কৰিবলৈ আপোনাৰ গাড়ী আৰু ফ’নটোত ব্লুটুথ অন থকাটো আৰু এটা আনটোৰ ওচৰত থকাটো নিশ্চিত কৰক"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;এ এতিয়া আপোনাৰ প্ৰ’ফাইলটো আনলক কৰিব পাৰে"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"এটা প্ৰাথমিক প্ৰ’ফাইল লক সৃষ্টি কৰক"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"আপোনাৰ প্ৰ’ফাইল আনলক কৰাৰ বাবে নিজৰ ফ’নটো ব্যৱহাৰ কৰিবলৈ আপোনাক বেকআপ হিচাপে এটা প্ৰাথমিক প্ৰ’ফাইল লকৰ প্ৰয়োজন"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"সম্পূর্ণ কৰিবলৈ আপোনাৰ প্ৰ’ফাইলটো আনলক কৰক"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"আপুনি এটা নতুন প্ৰ’ফাইল লক সৃষ্টি কৰিছে। ইয়াৰ পাছত, আপোনাৰ ফ’নটোৱে আপোনাৰ প্ৰ’ফাইলটো স্বয়ংক্ৰিয়ভাৱে আনলক কৰিব পৰাটো নিশ্চিত কৰিবলৈ এইটো পুনৰ দিয়ক"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"এই ডিভাইচটোৰ সংযোগ বিছিন্ন কৰক"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"এই ডিভাইচটো পুনৰ সংযোগ কৰক"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"ফ’নৰ জৰিয়তে আনলক কৰক"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"আপোনাৰ ফ’নটোক আপোনাৰ প্ৰ’ফাইলটো আনলক কৰিবলৈ দিয়ক"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"এই সুবিধাটোক কৰ্তৃত্ব দিবলৈ ইয়াত টিপক"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"কিবা ভুল হ’ল"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"দুৰ্ভাগ্যবশতঃ, এই সুবিধাটো এই মুহূৰ্তত অন কৰিব পৰা নগ\'ল। অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।"</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"আপোনাৰ ফ’নটোত এটা স্ক্ৰীন লক সৃষ্টি কৰক"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"আপোনাৰ ফ’নটোত কোনো স্ক্ৰীন লক ছেট কৰি থোৱা নাই। আপোনাৰ ফ’নটোৰ জৰিয়তে আপোনাৰ গাড়ীৰ প্ৰ’ফাইল আনলক কৰিবলৈ, প্ৰথমে আপোনাৰ ফ’নটোৰ ছেটিংসমূহত এটা স্ক্ৰীন লক (যাক পাছক’ড বুলিও কোৱা হয়) ছেট কৰক।"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">জড়িত ডিভাইচ</string>
+ <string name="add_device_title">জড়িত ডিভাইচটো যোগ দিয়ক</string>
+ <string name="add_associated_device_title">এটা সহযোগী ডিভাইচ সংযোগ কৰক</string>
+ <string name="add_associated_device_instruction">গাড়ী চলোৱাৰ অভিজ্ঞতা পৰিচালনাত সহায়ৰ বাবে আপুনি নিজৰ ফ’নটো সহযোগী ডিভাইচ হিচাপে ব্যৱহাৰ কৰিব পাৰে</string>
+ <string name="associated_device_install_app">আপোনাৰ ফ’নটোত <b>সহযোগী এপ্‌</b>টো ইনষ্টল হৈ থকাটো নিশ্চিত কৰক</string>
+ <string name="associated_device_pairing_code_title">ক’ডটো ফ’নত নিশ্চিত কৰক</string>
+ <string name="associated_device_pairing_message">এইটো আপোনাৰ ফ’নটোত দেখুওৱা ক’ডটোৰ সৈতে মিলাটো নিশ্চিত কৰক</string>
+ <string name="associated_device_success">ডিভাইচটো সফলতাৰে জড়িত কৰা হৈছে</string>
+ <string name="associated_device_select_device">এপ্‌টো খোলক আৰু &lt;b&gt;%1$s&lt;b&gt;ৰ সৈতে সংযোগ কৰক</string>
+ <string name="associated_device_open_app">এপ্‌টো খোলক আৰু তাত থকা নিৰ্দেশাৱলী অনুসৰণ কৰক</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; আঁতৰাবনে?</string>
+ <string name="remove_associated_device_message">এই গাড়ীখনক আৰু এই ডিভাইচটোৰ সৈতে পেয়াৰ কৰা নহ’ব। ইয়াৰ উপৰিও আপুনি সহযোগী এপ্‌টোৰ পৰা এই গাড়ীখন আঁতৰাব লাগিব।</string>
+ <string name="device_removed_success_toast_text">%1$s আঁতৰোৱা হ’ল</string>
+ <string name="device_removed_failure_toast_text">%1$s আঁতৰাব পৰা নগ’ল</string>
+ <string name="continue_setup_toast_text">আপোনাৰ ফ’নত ছেটআপ অব্যাহত ৰাখক</string>
+ <string name="error_screen_title">কিবা ভুল হ’ল</string>
+ <string name="error_screen_message">দুৰ্ভাগ্যবশতঃ, এই স্ক্ৰীনখন সঠিকভাৱে দেখুৱাব পৰা নগ’ল। অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।</string>
+ <string name="turn_on_bluetooth_title">ব্লুটুথ অন কৰক</string>
+ <string name="turn_on_bluetooth_message">আপোনাৰ ফ’নটো এটা সহযোগী ডিভাইচ হিচাপে ছেট আপ কৰিবলৈ আপোনাৰ গাড়ীখনক ব্লুটুথৰ প্ৰয়োজন।</string>
+ <string name="turn_on_bluetooth_dialog_title">ব্লুটুথ অন কৰিবনে?</string>
+ <string name="turn_on_bluetooth_dialog_message">আপোনাৰ সহযোগী ডিভাইচটোৰ সৈতে সংযোগ কৰিবলৈ আপোনাৰ গাড়ীখনক ব্লুটুথৰ প্ৰয়োজন।</string>
+ <string name="accept">গ্ৰহণ কৰক</string>
+ <string name="reject">প্ৰত্যাখ্যান কৰক</string>
+ <string name="confirm">নিশ্চিত কৰক</string>
+ <string name="cancel">বাতিল কৰক</string>
+ <string name="remove">আঁতৰাওক</string>
+ <string name="ok">ঠিক আছে</string>
+ <string name="connection">সংযোগ</string>
+ <string name="forget_title">এই ডিভাইচটো পাহৰি যাওক</string>
+ <string name="forget">পাহৰি যাওক</string>
+ <string name="disable">অক্ষম কৰক</string>
+ <string name="enable">সক্ষম কৰক</string>
+ <string name="continue_button">অব্যাহত ৰাখক</string>
+ <string name="retry">পুনৰ চেষ্টা কৰক</string>
+ <string name="turn_on">অন কৰক</string>
+ <string name="not_now">এতিয়া নহয়</string>
+ <string name="connected">সংযোগ কৰা হ’ল</string>
+ <string name="notDetected">চিনাক্ত কৰা হোৱা নাই</string>
+ <string name="disconnected">সংযোগ বিচ্ছিন্ন হৈছে</string>
+ <string name="unknown">অজ্ঞাত</string>
+ <string name="app_running_msg_channel_name">ফ’নৰ পাঠ বাৰ্তাৰ সেৱাটো চলি আছে</string>
+ <string name="app_running_msg_notification_title">ফ’নৰ পাঠ বাৰ্তাৰ সেৱাটো সক্ৰিয় হৈ আছে</string>
+ <string name="app_running_msg_notification_content">সহযোগী ডিভাইচৰ জৰিয়তে পাঠ বাৰ্তা লাভ কৰি থকা হৈছে</string>
+ <string name="trusted_device_feature_title">ফ’নৰ জৰিয়তে প্ৰ’ফাইল আনলক কৰক</string>
+ <string name="trusted_device_feature_instruction">আনলক কৰাৰ বিকল্পসমূহ ছেট কৰিবলৈ আপোনাৰ সহযোগী এপ্‌টো পৰীক্ষা কৰক</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt;ক মোৰ প্ৰ’ফাইলটো আনলক কৰিবলৈ দিয়ক</string>
+ <string name="device_not_connected_dialog_title">আপোনাৰ ফ’নটো সক্ৰিয়ভাৱে সংযোগ হৈ থাকিবই লাগিব</string>
+ <string name="device_not_connected_dialog_message">এই সুবিধাটো অন কৰিবলৈ আপোনাৰ গাড়ী আৰু ফ’নটোত ব্লুটুথ অন থকাটো আৰু এটা আনটোৰ ওচৰত থকাটো নিশ্চিত কৰক</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt;এ এতিয়া আপোনাৰ প্ৰ’ফাইলটো আনলক কৰিব পাৰে</string>
+ <string name="create_profile_lock_dialog_title">এটা প্ৰাথমিক প্ৰ’ফাইল লক সৃষ্টি কৰক</string>
+ <string name="create_profile_lock_dialog_message">আপোনাৰ প্ৰ’ফাইলটো আনলক কৰাৰ বাবে নিজৰ ফ’নটো ব্যৱহাৰ কৰিবলৈ আপোনাক বেকআপ হিচাপে এটা প্ৰাথমিক প্ৰ’ফাইল লকৰ প্ৰয়োজন</string>
+ <string name="unlock_profile_to_finish_title">সম্পূৰ্ণ কৰিবলৈ আপোনাৰ প্ৰ’ফাইলটো আনলক কৰক</string>
+ <string name="unlock_profile_to_finish_message">আপুনি এটা নতুন প্ৰ’ফাইল লক সৃষ্টি কৰিছে। ইয়াৰ পাছত, আপোনাৰ ফ’নটোৱে আপোনাৰ প্ৰ’ফাইলটো স্বয়ংক্ৰিয়ভাৱে আনলক কৰিব পৰাটো নিশ্চিত কৰিবলৈ এইটো পুনৰ দিয়ক</string>
+ <string name="disable_device_connection_text">এই ডিভাইচটোৰ সংযোগ বিছিন্ন কৰক</string>
+ <string name="enable_device_connection_text">এই ডিভাইচটো পুনৰ সংযোগ কৰক</string>
+ <string name="trusted_device_notification_channel_name">ফ’নৰ জৰিয়তে আনলক কৰক</string>
+ <string name="trusted_device_notification_title">আপোনাৰ ফ’নটোক আপোনাৰ প্ৰ’ফাইলটো আনলক কৰিবলৈ দিয়ক</string>
+ <string name="trusted_device_notification_content">এই সুবিধাটোক কৰ্তৃত্ব দিবলৈ ইয়াত টিপক</string>
+ <string name="trusted_device_enrollment_error_dialog_title">কিবা ভুল হ’ল</string>
+ <string name="trusted_device_enrollment_error_dialog_message">দুৰ্ভাগ্যবশতঃ, এই সুবিধাটো এই মুহূৰ্তত অন কৰিব পৰা নগ’ল। অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।</string>
+ <string name="create_phone_lock_dialog_title">আপোনাৰ ফ’নটোত এটা স্ক্ৰীন লক সৃষ্টি কৰক</string>
+ <string name="create_phone_lock_dialog_message">আপোনাৰ ফ’নটোত কোনো স্ক্ৰীন লক ছেট কৰি থোৱা নাই। আপোনাৰ ফ’নটোৰ জৰিয়তে আপোনাৰ গাড়ীৰ প্ৰ’ফাইল আনলক কৰিবলৈ, প্ৰথমে আপোনাৰ ফ’নটোৰ ছেটিঙত এটা স্ক্ৰীন লক (যাক পাছক’ড বুলিও কোৱা হয়) ছেট কৰক।</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d টা নতুন বাৰ্তা</item>
+ <item quantity="other">%d টা নতুন বাৰ্তা</item>
+ </plurals>
+ <string name="name_not_available">নামটো উপলব্ধ নহয়</string>
</resources>
diff --git a/companiondevice/res/values-az/strings.xml b/companiondevice/res/values-az/strings.xml
index 36fa50a..8d1e5ba 100644
--- a/companiondevice/res/values-az/strings.xml
+++ b/companiondevice/res/values-az/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Əlaqəli Cihaz"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Əlaqəli Cihaz əlavə edin"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Kompanyon cihazı qoşun"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Sürücülük təcrübənizi yaxşılaşdırmaq üçün telefonunuzu kompanyon cihaz kimi istifadə edə bilərsiniz"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Telefonda "<b>"Kompanyon Tətbiqinin"</b>" quraşdırıldığına əmin olun"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Telefonda kodu təsdiq edin"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Bunun telefondakı koda uyğun gəldiyini təsdiq edin"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Cihaz uğurla əlaqələndirilib"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Tətbiqi açın və &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; tətbiqinə qoşun"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Tətbiqi açın və təlimatları izləyin"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; unudulsun?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Bu avtomobil artıq bu cihazla birləşdirilməyəcək. Əlavə olaraq bu avtomobili Kompanyon tətbiqindən silməli olacaqsınız."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> unuduldu"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> adını unutmaq alınmadı"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Telefonda ayarlamağa davam edin"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Xəta oldu"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Təəssüf ki, bu ekranı düzgün göstərmək mümkün olmadı. Yenidən cəhd edin."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Bluetooth\'u aktiv edin"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Telefonu kompanyon cihazı kimi ayarlamaq üçün avtomobildə Bluetooth olmalıdır."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Bluetooth aktiv edilsin?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Kompanyon cihazınıza qoşulmaq üçün avtomobildə Bluetooth olmalıdır."</string>
- <string name="accept" msgid="1454710793329618813">"Qəbul edin"</string>
- <string name="reject" msgid="4315432282758892890">"Rədd edin"</string>
- <string name="confirm" msgid="3748997214719276945">"Təsdiq"</string>
- <string name="cancel" msgid="4306609731174629323">"Ləğv edin"</string>
- <string name="remove" msgid="5513398257088729188">"Silin"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Bağlantı"</string>
- <string name="forget_title" msgid="3027608547243824729">"Bu cihazı unudun"</string>
- <string name="forget" msgid="2069897665699141222">"Unudun"</string>
- <string name="disable" msgid="4619854429066283970">"Deaktiv edin"</string>
- <string name="enable" msgid="7656386199154111316">"Aktiv edin"</string>
- <string name="continue_button" msgid="2748318968566159950">"Davam edin"</string>
- <string name="retry" msgid="3783419451480721367">"Təkrar sınayın"</string>
- <string name="turn_on" msgid="4288754850470994812">"Aktiv edin"</string>
- <string name="not_now" msgid="8764692269093707622">"İndi yox"</string>
- <string name="connected" msgid="8051190714042020471">"Qoşulub"</string>
- <string name="notDetected" msgid="4115229772085594506">"Aşkarlanmadı"</string>
- <string name="disconnected" msgid="8526513868622591894">"Bağlantı kəsildi"</string>
- <string name="unknown" msgid="555736316465118024">"Naməlum"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Telefonun mətn mesajı xidməti işləyir"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Telefonun mətn mesajı xidməti aktivdir"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Kompanyon cihaz vasitəsilə mətn mesajları alınır"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Profili telefonla kiliddən çıxarın"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Kiliddən çıxarma seçimlərini ayarlamaq üçün Kompanyon Tətbiqini yoxlayın"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; cihazına profilimi kiliddən çıxarmaq üçün icazə verin"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefonunuz aktiv şəkildə qoşulmalıdır"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Bu funksiyanı aktiv etmək üçün avtomobildə və telefonda Bluetooth\'un aktiv və bir-birinin yaxınında olduğuna əmin olun"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; indi profilinizi kiliddən çıxara bilər"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Əsas profil kilidi yaradın"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Profili kiliddən çıxarmaq üçün telefonu istifadə etmək üçün yedək olaraq əsas profil kilidi lazımdır"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Tamamlamaq üçün profilinizi kiliddən çıxarın"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Yeni profil kilidi yaratmısınız. Sonra onu yenidən daxil edərək telefonun profilinizi avtomatik aça bilməsini təsdiq edin"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Bu cihazın bağlantısını kəsin"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Bu cihazı yenidən qoşun"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Telefonla kiliddən çıxarın"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Telefona profilinizi kiliddən çıxarmaq üçün icazə verin"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Bu funksiyaya icazə vermək üçün bura toxunun"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Xəta oldu"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Təəssüf ki, bu funksiyanı bu dəfə aktiv etmək mümkün olmadı. Yenidən cəhd edin."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Telefonda ekran kilidi yaradın"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Telefonda ekran kilidi ayarlanmayıb. Telefonla avtomobilin profilini kiliddən çıxarmaq üçün əvvəlcə telefonun ayarlarında ekran kilidi (həmçinin parol adlanır) yaradın."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Əlaqəli Cihaz</string>
+ <string name="add_device_title">Əlaqəli Cihaz əlavə edin</string>
+ <string name="add_associated_device_title">Kompanyon cihazı qoşun</string>
+ <string name="add_associated_device_instruction">Sürücülük təcrübənizi yaxşılaşdırmaq üçün telefonunuzu kompanyon cihaz kimi istifadə edə bilərsiniz</string>
+ <string name="associated_device_install_app">Telefonda <b>Kompanyon Tətbiqinin</b> quraşdırıldığına əmin olun</string>
+ <string name="associated_device_pairing_code_title">Telefonda kodu təsdiq edin</string>
+ <string name="associated_device_pairing_message">Bunun telefondakı koda uyğun gəldiyini təsdiq edin</string>
+ <string name="associated_device_success">Cihaz uğurla əlaqələndirilib</string>
+ <string name="associated_device_select_device">Tətbiqi açın və &lt;b&gt;%1$s&lt;/b&gt; avtomobilinə qoşulun</string>
+ <string name="associated_device_open_app">Tətbiqi açın və təlimatları izləyin</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; unudulsun?</string>
+ <string name="remove_associated_device_message">Bu avtomobil artıq bu cihazla birləşdirilməyəcək. Əlavə olaraq bu avtomobili Kompanyon tətbiqindən silməli olacaqsınız.</string>
+ <string name="device_removed_success_toast_text">%1$s unuduldu</string>
+ <string name="device_removed_failure_toast_text">%1$s adını unutmaq alınmadı</string>
+ <string name="continue_setup_toast_text">Telefonda ayarlamağa davam edin</string>
+ <string name="error_screen_title">Xəta oldu</string>
+ <string name="error_screen_message">Təəssüf ki, bu ekranı düzgün göstərmək mümkün olmadı. Yenidən sınayın.</string>
+ <string name="turn_on_bluetooth_title">Bluetooth\'u açın</string>
+ <string name="turn_on_bluetooth_message">Telefonu kompanyon cihazı kimi ayarlamaq üçün avtomobildə Bluetooth olmalıdır.</string>
+ <string name="turn_on_bluetooth_dialog_title">Bluetooth yandırılsın?</string>
+ <string name="turn_on_bluetooth_dialog_message">Kompanyon cihazınıza qoşulmaq üçün avtomobildə Bluetooth olmalıdır.</string>
+ <string name="accept">Qəbul edin</string>
+ <string name="reject">Rədd edin</string>
+ <string name="confirm">Təsdiq</string>
+ <string name="cancel">Ləğv edin</string>
+ <string name="remove">Silin</string>
+ <string name="ok">OK</string>
+ <string name="connection">Bağlantı</string>
+ <string name="forget_title">Bu cihazı unudun</string>
+ <string name="forget">Unudun</string>
+ <string name="disable">Deaktiv edin</string>
+ <string name="enable">Aktiv edin</string>
+ <string name="continue_button">Davam edin</string>
+ <string name="retry">Yenə cəhd edin</string>
+ <string name="turn_on">Aktiv edin</string>
+ <string name="not_now">İndi yox</string>
+ <string name="connected">Qoşuldu</string>
+ <string name="notDetected">Aşkarlanmadı</string>
+ <string name="disconnected">Bağlantı kəsilib</string>
+ <string name="unknown">Naməlum</string>
+ <string name="app_running_msg_channel_name">Telefonun mətn mesajı xidməti işləyir</string>
+ <string name="app_running_msg_notification_title">Telefonun mətn mesajı xidməti aktivdir</string>
+ <string name="app_running_msg_notification_content">Kompanyon cihaz vasitəsilə mətn mesajları alınır</string>
+ <string name="trusted_device_feature_title">Profili telefonla kiliddən çıxarın</string>
+ <string name="trusted_device_feature_instruction">Kiliddən çıxarma seçimlərini ayarlamaq üçün Kompanyon Tətbiqini yoxlayın</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; telefonunun profilimi kiliddən çıxarmasına icazə verin</string>
+ <string name="device_not_connected_dialog_title">Telefonunuz aktiv şəkildə qoşulmalıdır</string>
+ <string name="device_not_connected_dialog_message">Bu funksiyanı aktiv etmək üçün avtomobildə və telefonda Bluetooth\'un aktiv və bir-birinin yaxınında olduğuna əmin olun</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; indi profilinizi kiliddən çıxara bilər</string>
+ <string name="create_profile_lock_dialog_title">Əsas profil kilidi yaradın</string>
+ <string name="create_profile_lock_dialog_message">Profili kiliddən çıxarmaq üçün telefonu istifadə etmək üçün yedək olaraq əsas profil kilidi lazımdır</string>
+ <string name="unlock_profile_to_finish_title">Tamamlamaq üçün profilinizi kiliddən çıxarın</string>
+ <string name="unlock_profile_to_finish_message">Yeni profil kilidi yaratmısınız. Sonra onu yenidən daxil edərək telefonun profilinizi avtomatik aça bilməsini təsdiq edin</string>
+ <string name="disable_device_connection_text">Bu cihazın bağlantısını kəsin</string>
+ <string name="enable_device_connection_text">Bu cihazı yenidən qoşun</string>
+ <string name="trusted_device_notification_channel_name">Telefonla kiliddən çıxarın</string>
+ <string name="trusted_device_notification_title">Telefona profilinizi kiliddən çıxarmaq üçün icazə verin</string>
+ <string name="trusted_device_notification_content">Bu funksiyaya icazə vermək üçün bura toxunun</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Xəta oldu</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Təəssüf ki, bu funksiyanı bu dəfə aktiv etmək mümkün olmadı. Yenidən sınayın.</string>
+ <string name="create_phone_lock_dialog_title">Telefonda ekran kilidi yaradın</string>
+ <string name="create_phone_lock_dialog_message">Telefonda ekran kilidi ayarlanmayıb. Telefonla avtomobilin profilini kiliddən çıxarmaq üçün əvvəlcə telefonun ayarlarında ekran kilidi (həmçinin parol adlanır) yaradın.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Yeni mesaj</item>
+ <item quantity="other">%d yeni mesaj</item>
+ </plurals>
+ <string name="name_not_available">Ad əlçatan deyil</string>
</resources>
diff --git a/companiondevice/res/values-b+sr+Latn/strings.xml b/companiondevice/res/values-b+sr+Latn/strings.xml
index 58f2c53..9eebca3 100644
--- a/companiondevice/res/values-b+sr+Latn/strings.xml
+++ b/companiondevice/res/values-b+sr+Latn/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,75 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Povezani uređaj"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Dodaj povezani uređaj"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Povežite pridruženi uređaj"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Možete da koristite telefon kao pridruženi uređaj da biste upravljali doživljajem vožnje"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Uverite se da ste instalirali "<b>"prateću aplikaciju"</b>" na telefonu"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Potvrdite kôd na telefonu"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Potvrdite da se ovo podudara sa kodom koji se prikazuje na telefonu"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Povezivanje uređaja je uspelo"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Otvorite aplikaciju i povežite je sa: &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Otvorite aplikaciju i pratite uputstva"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Želite da uklonite automobil &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Ovaj automobil više neće biti uparen sa ovim uređajem. Moraćete i da uklonite ovaj automobil iz prateće aplikacije."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Telefon <xliff:g id="PHONE_NAME">%1$s</xliff:g> je zaboravljen"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Zaboravljanje telefona <xliff:g id="PHONE_NAME">%1$s</xliff:g> nije uspelo"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Nastavite sa podešavanjem na telefonu"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Došlo je do greške"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Nažalost, pravilno prikazivanje ekrana nije uspelo. Probajte ponovo."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Uključi Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Automobilu je potreban Bluetooth za podešavanje telefona kao pridruženog uređaja."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Želite li da uključite Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Automobilu je potreban Bluetooth za otključavanje pridruženog uređaja."</string>
- <string name="accept" msgid="1454710793329618813">"Prihvati"</string>
- <string name="reject" msgid="4315432282758892890">"Odbij"</string>
- <string name="confirm" msgid="3748997214719276945">"Potvrdi"</string>
- <string name="cancel" msgid="4306609731174629323">"Otkaži"</string>
- <string name="remove" msgid="5513398257088729188">"Ukloni"</string>
- <string name="ok" msgid="2825038997730899083">"Potvrdi"</string>
- <string name="connection" msgid="2798490936433656846">"Veza"</string>
- <string name="forget_title" msgid="3027608547243824729">"Zaboravi ovaj uređaj"</string>
- <string name="forget" msgid="2069897665699141222">"Zaboravi"</string>
- <string name="disable" msgid="4619854429066283970">"Onemogući"</string>
- <string name="enable" msgid="7656386199154111316">"Omogući"</string>
- <string name="continue_button" msgid="2748318968566159950">"Nastavi"</string>
- <string name="retry" msgid="3783419451480721367">"Probaj ponovo"</string>
- <string name="turn_on" msgid="4288754850470994812">"Uključi"</string>
- <string name="not_now" msgid="8764692269093707622">"Ne sada"</string>
- <string name="connected" msgid="8051190714042020471">"Povezano je"</string>
- <string name="notDetected" msgid="4115229772085594506">"Nije otkriveno"</string>
- <string name="disconnected" msgid="8526513868622591894">"Veza je prekinuta"</string>
- <string name="unknown" msgid="555736316465118024">"Nepoznato"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"SMS usluga na telefonu je pokrenuta"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"SMS usluga na telefonu je aktivna"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Prijem SMS-ova preko pridruženog uređaja"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Otključajte profil pomoću telefona"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Proverite prateću aplikaciju da biste podesili opcije za otključavanje"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Omogući telefonu &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; da otključa moj profil"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefon mora da bude aktivno povezan"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Da biste uključili ovu funkciju, uverite se da su automobil i Bluetooth uključeni i u blizini"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; sada može da otključa profil"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Podesite primarno zaključavanje profila"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Da biste otključali profil pomoću telefona, morate da podesite primarno zaključavanje profila kao rezervu"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Otključajte profil da biste završili"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Podesili ste novo zaključavanje profila. Sada ga unesite ponovo da biste potvrdili da telefon može da otključa profil automatski"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Prekinite vezu sa ovim uređajem"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Ponovo povežite ovaj uređaj"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Otključajte pomoću telefona"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Omogućite telefonu da otključa profil"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Dodirnite ovde da biste ovlastili ovu funkciju"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Došlo je do greške"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Nažalost, uključivanje ove funkcije trenutno nije uspelo. Probajte ponovo."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Podesite zaključavanje ekrana na telefonu"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Na telefonu nije podešeno zaključavanje ekrana. Da biste otključali profil automobila pomoću telefona, prvo podesite zaključavanje ekrana (poznato i kao šifra) u podešavanjima telefona."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Povezani uređaj</string>
+ <string name="add_device_title">Dodaj povezani uređaj</string>
+ <string name="add_associated_device_title">Povežite pridruženi uređaj</string>
+ <string name="add_associated_device_instruction">Možete da koristite telefon kao pridruženi uređaj da biste upravljali doživljajem vožnje</string>
+ <string name="associated_device_install_app">Uverite se da ste instalirali <b>prateću aplikaciju</b> na telefonu</string>
+ <string name="associated_device_pairing_code_title">Potvrdite kôd na telefonu</string>
+ <string name="associated_device_pairing_message">Potvrdite da se ovo podudara sa kodom koji se prikazuje na telefonu</string>
+ <string name="associated_device_success">Povezivanje uređaja je uspelo</string>
+ <string name="associated_device_select_device">Otvorite aplikaciju i povežite je sa automobilom &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Otvorite aplikaciju i pratite uputstva u njoj</string>
+ <string name="remove_associated_device_title">Želite da zaboravite: &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Ovaj automobil više neće biti uparen sa ovim uređajem. Moraćete i da uklonite ovaj automobil iz prateće aplikacije.</string>
+ <string name="device_removed_success_toast_text">Telefon %1$s je zaboravljen</string>
+ <string name="device_removed_failure_toast_text">Zaboravljanje telefona %1$s nije uspelo</string>
+ <string name="continue_setup_toast_text">Nastavite sa podešavanjem na telefonu</string>
+ <string name="error_screen_title">Došlo je do greške</string>
+ <string name="error_screen_message">Nažalost, pravilno prikazivanje ekrana nije uspelo. Probajte ponovo.</string>
+ <string name="turn_on_bluetooth_title">Uključi Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Automobilu je potreban Bluetooth za podešavanje telefona kao pridruženog uređaja.</string>
+ <string name="turn_on_bluetooth_dialog_title">Želite li da uključite Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Automobilu je potreban Bluetooth za otključavanje pridruženog uređaja.</string>
+ <string name="accept">Prihvatam</string>
+ <string name="reject">Odbij</string>
+ <string name="confirm">Potvrdi</string>
+ <string name="cancel">Otkaži</string>
+ <string name="remove">Ukloni</string>
+ <string name="ok">Važi</string>
+ <string name="connection">Veza</string>
+ <string name="forget_title">Zaboravi ovaj uređaj</string>
+ <string name="forget">Zaboravi</string>
+ <string name="disable">Onemogući</string>
+ <string name="enable">Omogući</string>
+ <string name="continue_button">Nastavi</string>
+ <string name="retry">Probaj ponovo</string>
+ <string name="turn_on">Uključi</string>
+ <string name="not_now">Ne sada</string>
+ <string name="connected">Povezano</string>
+ <string name="notDetected">Nije otkriveno</string>
+ <string name="disconnected">Prekinuta veza</string>
+ <string name="unknown">Nepoznato</string>
+ <string name="app_running_msg_channel_name">Usluga za tekstualne poruke na telefonu je pokrenuta</string>
+ <string name="app_running_msg_notification_title">Usluga za tekstualne poruke na telefonu je aktivna</string>
+ <string name="app_running_msg_notification_content">Prijem tekstualnih poruka preko pridruženog uređaja</string>
+ <string name="trusted_device_feature_title">Otključajte profil pomoću telefona</string>
+ <string name="trusted_device_feature_instruction">Proverite prateću aplikaciju da biste podesili opcije za otključavanje</string>
+ <string name="trusted_device_item_title">Dozvolite da &lt;b&gt;%1$s&lt;/b&gt; otključa moj profil</string>
+ <string name="device_not_connected_dialog_title">Telefon mora da bude aktivno povezan</string>
+ <string name="device_not_connected_dialog_message">Da biste uključili ovu funkciju, uverite se da su automobil i Bluetooth uključeni i u blizini</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; sada može da vam otključa profil</string>
+ <string name="create_profile_lock_dialog_title">Podesite primarno zaključavanje profila</string>
+ <string name="create_profile_lock_dialog_message">Da biste otključali profil pomoću telefona, morate da podesite primarno zaključavanje profila kao rezervu</string>
+ <string name="unlock_profile_to_finish_title">Otključajte profil da biste završili</string>
+ <string name="unlock_profile_to_finish_message">Podesili ste novo zaključavanje profila. Sada ga unesite ponovo da biste potvrdili da telefon može da otključa profil automatski</string>
+ <string name="disable_device_connection_text">Prekinite vezu sa ovim uređajem</string>
+ <string name="enable_device_connection_text">Ponovo povežite ovaj uređaj</string>
+ <string name="trusted_device_notification_channel_name">Otključajte pomoću telefona</string>
+ <string name="trusted_device_notification_title">Omogućite telefonu da otključa profil</string>
+ <string name="trusted_device_notification_content">Dodirnite ovde da biste odobrili ovu funkciju</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Došlo je do greške</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Nažalost, uključivanje ove funkcije zasad nije uspelo. Probajte ponovo.</string>
+ <string name="create_phone_lock_dialog_title">Podesite zaključavanje ekrana na telefonu</string>
+ <string name="create_phone_lock_dialog_message">Na telefonu nije podešeno zaključavanje ekrana. Da biste otključali profil automobila pomoću telefona, prvo podesite zaključavanje ekrana (poznato i kao šifra) u podešavanjima telefona.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d nova poruka</item>
+ <item quantity="few">%d nove poruke</item>
+ <item quantity="other">%d novih poruka</item>
+ </plurals>
+ <string name="name_not_available">Ime nije dostupno</string>
</resources>
diff --git a/companiondevice/res/values-be/strings.xml b/companiondevice/res/values-be/strings.xml
index 459f0a8..999b0eb 100644
--- a/companiondevice/res/values-be/strings.xml
+++ b/companiondevice/res/values-be/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,76 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Звязаная прылада"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Дадаць звязаную прыладу"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Падключэнне спадарожнай прылады"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Тэлефон можна выкарыстоўваць у якасці спадарожнай прылады для кіравання функцыямі аўтамабіля"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Праверце, ці ўсталявана на тэлефоне "<b>"спадарожная праграма"</b></string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Пацвердзіце код на тэлефоне"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Праверце, ці супадае гэты код з паказаным на тэлефоне"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Прылада звязана"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"У праграме падключыце &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Адкрыйце праграму і выконвайце ўказанні"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Выдаліць аўтамабіль &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Аўтамабіль больш не будзе спалучаны з гэтай прыладай. Таксама яго трэба будзе выдаліць са спадарожнай праграмы."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Сувязь з прыладай \"<xliff:g id="PHONE_NAME">%1$s</xliff:g>\" скасавана"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Не ўдалося скасаваць сувязь з прыладай \"<xliff:g id="PHONE_NAME">%1$s</xliff:g>\""</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Працягніце наладку на тэлефоне"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Нешта пайшло не так"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Праблемы з паказам даных на гэтым экране. Паўтарыце спробу."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Уключыце Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Каб можна было наладзіць тэлефон як спадарожную прыладу, на аўтамабілі павінен працаваць Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Уключыць Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Каб падключыцца да спадарожнай прылады, аўтамабілю патрабуецца Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Прыняць"</string>
- <string name="reject" msgid="4315432282758892890">"Адхіліць"</string>
- <string name="confirm" msgid="3748997214719276945">"Пацвердзіць"</string>
- <string name="cancel" msgid="4306609731174629323">"Скасаваць"</string>
- <string name="remove" msgid="5513398257088729188">"Выдаліць"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Падключэнне"</string>
- <string name="forget_title" msgid="3027608547243824729">"Скасаваць сувязь з гэтай прыладай"</string>
- <string name="forget" msgid="2069897665699141222">"Скасаваць сувязь"</string>
- <string name="disable" msgid="4619854429066283970">"Адключыць"</string>
- <string name="enable" msgid="7656386199154111316">"Уключыць"</string>
- <string name="continue_button" msgid="2748318968566159950">"Працягнуць"</string>
- <string name="retry" msgid="3783419451480721367">"Паўтарыць спробу"</string>
- <string name="turn_on" msgid="4288754850470994812">"Уключыць"</string>
- <string name="not_now" msgid="8764692269093707622">"Не зараз"</string>
- <string name="connected" msgid="8051190714042020471">"Падключана"</string>
- <string name="notDetected" msgid="4115229772085594506">"Не выяўлена"</string>
- <string name="disconnected" msgid="8526513868622591894">"Адключана"</string>
- <string name="unknown" msgid="555736316465118024">"Невядома"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Працуе сэрвіс тэкставых паведамленняў тэлефона"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Сэрвіс тэкставых паведамленняў тэлефона актыўны"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Ідзе атрыманне тэкставых паведамленняў праз спадарожную прыладу"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Разблакіроўка профілю з тэлефона"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Параметры разблакіроўкі можна наладзіць у спадарожнай праграме"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Дазволіць прыладзе &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; ажыццяўляць разблакіроўку профілю"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"У тэлефона павінна быць актыўнае падключэнне"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Каб уключыць гэту функцыю, на аўтамабілі і тэлефоне павінен быць уключаны Bluetooth і яны павінны знаходзіцца недалёка адзін ад аднаго"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"Цяпер &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; можа ажыццяўляць разблакіроўку профілю"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Наладжванне асноўнай блакіроўкі профілю"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Каб выкарыстоўваць тэлефон для разблакіроўкі профілю, трэба зрабіць асноўны спосаб блакіроўкі профілю рэзервовым"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Каб завяршыць наладку, разблакіруйце профіль"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Вы стварылі новую блакіроўку профілю. Увядзіце яе даныя яшчэ раз, каб пацвердзіць, што тэлефон можа ажыццяўляць разблакіроўку профілю аўтаматычна"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Адключэнне прылады"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Паўторнае падключэнне прылады"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Разблакіроўка з дапамогай тэлефона"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Дазвольце тэлефону ажыццяўляць разблакіроўку профілю"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Каб аўтарызаваць гэту функцыю, націсніце тут"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Нешта пайшло не так"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"На жаль, гэту функцыю ўключыць не ўдалося. Паўтарыце спробу."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Наладжванне блакіроўкі экрана на тэлефоне"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"На тэлефоне не наладжана блакіроўка экрана. Каб зрабіць магчымай разблакіроўку профілю аўтамабіля з тэлефона, спачатку задайце блакіроўку экрана (стварыце так званы \"код доступу\") у наладах тэлефона."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Звязаная прылада</string>
+ <string name="add_device_title">Дадаць звязаную прыладу</string>
+ <string name="add_associated_device_title">Падключэнне спадарожнай прылады</string>
+ <string name="add_associated_device_instruction">Тэлефон можна выкарыстоўваць у якасці спадарожнай прылады для кіравання функцыямі аўтамабіля</string>
+ <string name="associated_device_install_app">Праверце, ці ўсталявана на тэлефоне <b>спадарожная праграма</b></string>
+ <string name="associated_device_pairing_code_title">Пацвердзіце код на тэлефоне</string>
+ <string name="associated_device_pairing_message">Праверце, ці супадае гэты код з паказаным на тэлефоне</string>
+ <string name="associated_device_success">Прылада звязана</string>
+ <string name="associated_device_select_device">Падключыцеся ў праграме да аўтамабіля &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Адкрыйце праграму і выконвайце ўказанні</string>
+ <string name="remove_associated_device_title">Скасаваць сувязь з аўтамаблем &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Аўтамабіль больш не будзе спалучаны з гэтай прыладай. Таксама яго трэба будзе выдаліць са спадарожнай праграмы.</string>
+ <string name="device_removed_success_toast_text">Сувязь з прыладай \"%1$s\" скасавана</string>
+ <string name="device_removed_failure_toast_text">Не ўдалося скасаваць сувязь з прыладай \"%1$s\"</string>
+ <string name="continue_setup_toast_text">Працягніце наладку на тэлефоне</string>
+ <string name="error_screen_title">Нешта пайшло не так</string>
+ <string name="error_screen_message">Узніклі праблемы з паказам даных на гэтым экране. Паўтарыце спробу.</string>
+ <string name="turn_on_bluetooth_title">Уключыце Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Каб можна было наладзіць тэлефон як спадарожную прыладу, на аўтамабілі павінен працаваць Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Уключыць Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Каб падключыцца да спадарожнай прылады, аўтамабілю патрабуецца Bluetooth.</string>
+ <string name="accept">Прыняць</string>
+ <string name="reject">Адхіліць</string>
+ <string name="confirm">Пацвердзіць</string>
+ <string name="cancel">Скасаваць</string>
+ <string name="remove">Выдаліць</string>
+ <string name="ok">ОК</string>
+ <string name="connection">Падключэнне</string>
+ <string name="forget_title">Скасаваць сувязь з гэтай прыладай</string>
+ <string name="forget">Скасаваць сувязь</string>
+ <string name="disable">Выключыць</string>
+ <string name="enable">Уключыць</string>
+ <string name="continue_button">Далей</string>
+ <string name="retry">Паўтарыць спробу</string>
+ <string name="turn_on">Уключыць</string>
+ <string name="not_now">Не зараз</string>
+ <string name="connected">Падключана</string>
+ <string name="notDetected">Не знойдзена</string>
+ <string name="disconnected">Адключана</string>
+ <string name="unknown">Невядома</string>
+ <string name="app_running_msg_channel_name">Працуе сэрвіс тэкставых паведамленняў тэлефона</string>
+ <string name="app_running_msg_notification_title">Сэрвіс тэкставых паведамленняў тэлефона актыўны</string>
+ <string name="app_running_msg_notification_content">Ідзе атрыманне тэкставых паведамленняў праз спадарожную прыладу</string>
+ <string name="trusted_device_feature_title">Разблакіроўка профілю з тэлефона</string>
+ <string name="trusted_device_feature_instruction">Параметры разблакіроўкі можна наладзіць у спадарожнай праграме</string>
+ <string name="trusted_device_item_title">Дазволіць разблакіроўку профілю з дапамогай тэлефона &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="device_not_connected_dialog_title">У тэлефона павінна быць актыўнае падключэнне</string>
+ <string name="device_not_connected_dialog_message">Каб уключыць гэту функцыю, на аўтамабілі і тэлефоне павінен быць уключаны Bluetooth і яны павінны знаходзіцца недалёка адзін ад аднаго</string>
+ <string name="trusted_device_enrollment_success_message">Цяпер з дапамогай тэлефона &lt;b&gt;%1$s&lt;/b&gt; можна ажыццяўляць разблакіроўку профілю</string>
+ <string name="create_profile_lock_dialog_title">Наладжванне асноўнай блакіроўкі профілю</string>
+ <string name="create_profile_lock_dialog_message">Каб выкарыстоўваць тэлефон для разблакіроўкі профілю, трэба зрабіць асноўны спосаб блакіроўкі профілю рэзервовым</string>
+ <string name="unlock_profile_to_finish_title">Каб завяршыць наладку, разблакіруйце профіль</string>
+ <string name="unlock_profile_to_finish_message">Вы стварылі новую блакіроўку профілю. Увядзіце яе даныя яшчэ раз, каб пацвердзіць, што тэлефон можа ажыццяўляць разблакіроўку профілю аўтаматычна</string>
+ <string name="disable_device_connection_text">Адключэнне прылады</string>
+ <string name="enable_device_connection_text">Паўторнае падключэнне прылады</string>
+ <string name="trusted_device_notification_channel_name">Разблакіроўка з дапамогай тэлефона</string>
+ <string name="trusted_device_notification_title">Дазвольце тэлефону ажыццяўляць разблакіроўку профілю</string>
+ <string name="trusted_device_notification_content">Каб аўтарызаваць гэту функцыю, націсніце тут</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Нешта пайшло не так</string>
+ <string name="trusted_device_enrollment_error_dialog_message">На жаль, гэту функцыю ўключыць не ўдалося. Паўтарыце спробу.</string>
+ <string name="create_phone_lock_dialog_title">Наладжванне блакіроўкі экрана на тэлефоне</string>
+ <string name="create_phone_lock_dialog_message">На тэлефоне не наладжана блакіроўка экрана. Каб зрабіць магчымай разблакіроўку профілю аўтамабіля з тэлефона, спачатку задайце блакіроўку экрана (стварыце так званы \"код доступу\") у наладах тэлефона.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d новае паведамленне</item>
+ <item quantity="few">%d новыя паведамленні</item>
+ <item quantity="many">%d новых паведамленняў</item>
+ <item quantity="other">%d новага паведамлення</item>
+ </plurals>
+ <string name="name_not_available">Імя недаступнае</string>
</resources>
diff --git a/companiondevice/res/values-bg/strings.xml b/companiondevice/res/values-bg/strings.xml
index fb255de..35260c5 100644
--- a/companiondevice/res/values-bg/strings.xml
+++ b/companiondevice/res/values-bg/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Свързано устройство"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Добавяне на свързано устройство"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Свързване на придружаващо устройство"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Използвайте телефона си като придружаващо у-во, за да подобрите практическата си работа при шофиране"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Уверете се, че "<b>"придр. приложение"</b>" е инсталирано на телефона"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Потвърждаване на кода за сдвояване на телефона"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Потвърдете, че кодът съвпада с този, показан на телефона ви"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Устройството е свързано успешно"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Отворете прил. и свържете с(ъс) &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Отворете прил. и изпълнете инструкциите в него"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Да се забрави ли &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Този автомобил вече няма да бъде сдвоен с това устройство. Ще трябва да премахнете автомобила и от придружаващото приложение."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Устройството „<xliff:g id="PHONE_NAME">%1$s</xliff:g>“ е забравено"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Забравянето на „<xliff:g id="PHONE_NAME">%1$s</xliff:g>“ не бе успешно"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Продължете настройването от телефона си"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Нещо се обърка"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"За съжаление, елементите не могат да бъдат показани правилно на този екран. Моля, опитайте отново."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Включване на Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"За да настройте телефона си като придружаващото устройство, функцията за Bluetooth трябва да е включена на автомобила ви."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Да се включи ли Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"За да свържете придружаващото си устройство, функцията за Bluetooth трябва да е включена на автомобила ви."</string>
- <string name="accept" msgid="1454710793329618813">"Приемам"</string>
- <string name="reject" msgid="4315432282758892890">"Отхвърляне"</string>
- <string name="confirm" msgid="3748997214719276945">"Потвърждаване"</string>
- <string name="cancel" msgid="4306609731174629323">"Отказ"</string>
- <string name="remove" msgid="5513398257088729188">"Премахване"</string>
- <string name="ok" msgid="2825038997730899083">"ОК"</string>
- <string name="connection" msgid="2798490936433656846">"Връзка"</string>
- <string name="forget_title" msgid="3027608547243824729">"Забравяне на това устройство"</string>
- <string name="forget" msgid="2069897665699141222">"Забравяне"</string>
- <string name="disable" msgid="4619854429066283970">"Деактивиране"</string>
- <string name="enable" msgid="7656386199154111316">"Активиране"</string>
- <string name="continue_button" msgid="2748318968566159950">"Напред"</string>
- <string name="retry" msgid="3783419451480721367">"Нов опит"</string>
- <string name="turn_on" msgid="4288754850470994812">"Включване"</string>
- <string name="not_now" msgid="8764692269093707622">"Не сега"</string>
- <string name="connected" msgid="8051190714042020471">"Установена е връзка"</string>
- <string name="notDetected" msgid="4115229772085594506">"Не е открито"</string>
- <string name="disconnected" msgid="8526513868622591894">"Няма връзка"</string>
- <string name="unknown" msgid="555736316465118024">"Няма данни"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Услугата на телефона за SMS съобщения се изпълнява"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Услугата на телефона за SMS съобщения е активна"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Получаване на SMS съобщения чрез придружаващо устройство"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Отключване на профила с телефон"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Използвайте придружаващото приложение, за да зададете опции за отключване"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Разрешаване на &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; да отключва профила ми"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Телефонът ви трябва да установи връзка"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"За да включите тази функция, трябва да сте активирали Bluetooth на автомобила и телефона си и те да са близо един до друг"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"Устройството &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; вече може да отключва профила ви"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Задаване на основна опция за заключване на профила"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"За да отключвате профила си с телефон, ви е необходима основна опция за заключване на съответния профил, която да използвате като резервна"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Отключете профила си, за да завършите"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Зададохте нова опция за заключване на профила. Въведете я отново, за да потвърдите, че телефонът ви може автоматично да отключва профила ви"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Прекратяване на връзката на това устройство"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Свързване на това устройство"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Отключване с телефон"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Разрешаване на телефона да отключва профила ви"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Докоснете тук, за да упълномощите тази функция"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Нещо се обърка"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"За съжаление, тази функция не може да бъде активирана в момента. Моля, опитайте отново."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Задаване на опция за закл. на екрана на телефона"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Телефонът ви няма опция за заключване на екрана. За да отключвате профила на автомобила си с телефон, първо трябва да зададете опция за заключване на екрана (известна още като код за достъп) от настройките на съответния телефон."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Свързано устройство</string>
+ <string name="add_device_title">Добавяне на свързано устройство</string>
+ <string name="add_associated_device_title">Свързване на придружаващо устройство</string>
+ <string name="add_associated_device_instruction">Използвайте телефона си като придружаващо у-во, за да подобрите практическата си работа при шофиране</string>
+ <string name="associated_device_install_app">Уверете се, че <b>придр. приложение</b> е инсталирано на телефона</string>
+ <string name="associated_device_pairing_code_title">Потвърждаване на кода за сдвояване на телефона</string>
+ <string name="associated_device_pairing_message">Потвърдете, че кодът съвпада с този, показан на телефона ви</string>
+ <string name="associated_device_success">Устройството е свързано успешно</string>
+ <string name="associated_device_select_device">Отворете приложението и свържете с(ъс) &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Отворете приложението и изпълнете инструкциите в него</string>
+ <string name="remove_associated_device_title">Да се забрави ли &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Този автомобил вече няма да бъде сдвоен с това устройство. Ще трябва да премахнете автомобила и от придружаващото приложение.</string>
+ <string name="device_removed_success_toast_text">Устройството „%1$s“ е забравено</string>
+ <string name="device_removed_failure_toast_text">Забравянето на „%1$s“ не бе успешно</string>
+ <string name="continue_setup_toast_text">Продължете настройването от телефона си</string>
+ <string name="error_screen_title">Нещо се обърка</string>
+ <string name="error_screen_message">За съжаление, елементите не могат да бъдат показани правилно на този екран. Моля, опитайте отново.</string>
+ <string name="turn_on_bluetooth_title">Включване на Bluetooth</string>
+ <string name="turn_on_bluetooth_message">За да настроите телефона си като придружаващото устройство, функцията за Bluetooth трябва да е включена на автомобила ви.</string>
+ <string name="turn_on_bluetooth_dialog_title">Да се включи ли Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">За да свържете придружаващото си устройство, функцията за Bluetooth трябва да е включена на автомобила ви.</string>
+ <string name="accept">Приемам</string>
+ <string name="reject">Отхвърляне</string>
+ <string name="confirm">Потвърждаване</string>
+ <string name="cancel">Отказ</string>
+ <string name="remove">Премахване</string>
+ <string name="ok">OK</string>
+ <string name="connection">Връзка</string>
+ <string name="forget_title">Забравяне на това устройство</string>
+ <string name="forget">Забравяне</string>
+ <string name="disable">Деактивиране</string>
+ <string name="enable">Активиране</string>
+ <string name="continue_button">Напред</string>
+ <string name="retry">Нов опит</string>
+ <string name="turn_on">Включване</string>
+ <string name="not_now">Не сега</string>
+ <string name="connected">Свързано</string>
+ <string name="notDetected">Не е открито</string>
+ <string name="disconnected">Няма връзка</string>
+ <string name="unknown">Неизвестно</string>
+ <string name="app_running_msg_channel_name">Услугата на телефона за SMS съобщения се изпълнява</string>
+ <string name="app_running_msg_notification_title">Услугата на телефона за SMS съобщения е активна</string>
+ <string name="app_running_msg_notification_content">Получаване на SMS съобщения чрез придружаващо устройство</string>
+ <string name="trusted_device_feature_title">Отключване на профила с телефон</string>
+ <string name="trusted_device_feature_instruction">Използвайте придружаващото приложение, за да зададете опции за отключване</string>
+ <string name="trusted_device_item_title">Разрешаване на &lt;b&gt;%1$s&lt;/b&gt; да отключва потребителския ми профил</string>
+ <string name="device_not_connected_dialog_title">Телефонът ви трябва да установи връзка</string>
+ <string name="device_not_connected_dialog_message">За да включите тази функция, трябва да сте активирали Bluetooth на автомобила и телефона си и те да са близо един до друг</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; вече може да отключва потребителския ви профил</string>
+ <string name="create_profile_lock_dialog_title">Задаване на основна опция за заключване на профила</string>
+ <string name="create_profile_lock_dialog_message">За да отключвате профила си с телефон, ви е необходима основна опция за заключване на съответния профил, която да използвате като резервна</string>
+ <string name="unlock_profile_to_finish_title">Отключете профила си, за да завършите</string>
+ <string name="unlock_profile_to_finish_message">Зададохте нова опция за заключване на профила. Въведете я отново, за да потвърдите, че телефонът ви може автоматично да отключва профила ви</string>
+ <string name="disable_device_connection_text">Прекратяване на връзката на това устройство</string>
+ <string name="enable_device_connection_text">Свързване на това устройство</string>
+ <string name="trusted_device_notification_channel_name">Отключване с телефон</string>
+ <string name="trusted_device_notification_title">Разрешаване на телефона да отключва потребителския ви профил</string>
+ <string name="trusted_device_notification_content">Докоснете тук, за да упълномощите тази функция</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Нещо се обърка</string>
+ <string name="trusted_device_enrollment_error_dialog_message">За съжаление, тази функция не може да бъде активирана в момента. Моля, опитайте отново.</string>
+ <string name="create_phone_lock_dialog_title">Задаване на опция за закл. на екрана на телефона</string>
+ <string name="create_phone_lock_dialog_message">Телефонът ви няма опция за заключване на екрана. За да отключвате профила на автомобила си с телефон, първо трябва да зададете опция за заключване на екрана (известна още като код за достъп) от настройките на съответния телефон.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Ново съобщение</item>
+ <item quantity="other">%d нови съобщения</item>
+ </plurals>
+ <string name="name_not_available">Няма име</string>
</resources>
diff --git a/companiondevice/res/values-bn/strings.xml b/companiondevice/res/values-bn/strings.xml
index cb9aa6c..2e1fc66 100644
--- a/companiondevice/res/values-bn/strings.xml
+++ b/companiondevice/res/values-bn/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"আনুষঙ্গিক ডিভাইস"</string>
- <string name="add_device_title" msgid="6166003577845888151">"একটি আনুষঙ্গিক ডিভাইস যোগ করুন"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"একটি কম্প্যানিয়ন ডিভাইসের সাথে কানেক্ট করুন"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"ড্রাইভিংয়ের অভিজ্ঞতা ম্যানেজ করতে আপনার ফোনকে কম্প্যানিয়ন ডিভাইস হিসেবে ব্যবহার করতে পারেন"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"নিশ্চিত করে নিন "<b>"কম্প্যানিয়ন অ্যাপ"</b>" আপনার ফোনে ইনস্টল করা আছে"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"ফোনে কোড কনফার্ম করুন"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"আপনার ফোনে দেখানো কোডের সাথে এটি ম্যাচ করছে কিনা তা কনফার্ম করুন"</string>
- <string name="associated_device_success" msgid="584760065696870256">"ডিভাইস ভালভাবে যুক্ত করা হয়েছে"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"অ্যাপ খুলুন ও &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;-এর সাথে কানেক্ট করুন"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"অ্যাপ খুলে তাতে দেওয়া নির্দেশ ফলো করুন"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;-কে পুরোপুরি সরিয়ে দেবেন?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"এই গাড়ি আর এই ডিভাইসের সাথে পেয়ার করা যাবে না। আপনাকে অতিরিক্তভাবে এই গাড়িকে কম্প্যানিয়ন অ্যাপ থেকে সরাতে হবে।"</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g>-কে পুরোপুরি সরিয়ে দেওয়া গেছে"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g>-কে পুরোপুরি সরিয়ে দেওয়া যায়নি"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"আপনার ফোনে সেট-আপ করার কাজ চালিয়ে যান"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"কিছু সমস্যা হয়েছে"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"এই স্ক্রিনকে সঠিকভাবে ডিসপ্লে করা যায়নি। আবার চেষ্টা করুন।"</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"ব্লুটুথ চালু করুন"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"আপনার ফোনকে একটি কম্প্যানিয়ন ডিভাইস হিসেবে সেট-আপ করার জন্য আপনার গাড়িতে ব্লুটুথ থাকতে হবে।"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"ব্লুটুথ চালু করবেন?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"আপনার কম্প্যানিয়ন ডিভাইসের সাথে কানেক্ট করার জন্য আপনার গাড়িতে ব্লুটুথ থাকতে হবে।"</string>
- <string name="accept" msgid="1454710793329618813">"সম্মত হন"</string>
- <string name="reject" msgid="4315432282758892890">"বাতিল করুন"</string>
- <string name="confirm" msgid="3748997214719276945">"কনফার্ম করুন"</string>
- <string name="cancel" msgid="4306609731174629323">"বাতিল করুন"</string>
- <string name="remove" msgid="5513398257088729188">"সরিয়ে দিন"</string>
- <string name="ok" msgid="2825038997730899083">"ঠিক আছে"</string>
- <string name="connection" msgid="2798490936433656846">"কানেকশন"</string>
- <string name="forget_title" msgid="3027608547243824729">"এই ডিভাইসটিকে পুরোপুরি সরিয়ে দিন"</string>
- <string name="forget" msgid="2069897665699141222">"পুরোপুরি সরিয়ে দিন"</string>
- <string name="disable" msgid="4619854429066283970">"বন্ধ করুন"</string>
- <string name="enable" msgid="7656386199154111316">"চালু করুন"</string>
- <string name="continue_button" msgid="2748318968566159950">"কাজ চালিয়ে যান"</string>
- <string name="retry" msgid="3783419451480721367">"আবার চেষ্টা করুন"</string>
- <string name="turn_on" msgid="4288754850470994812">"চালু করুন"</string>
- <string name="not_now" msgid="8764692269093707622">"এখন নয়"</string>
- <string name="connected" msgid="8051190714042020471">"কানেক্ট করা আছে"</string>
- <string name="notDetected" msgid="4115229772085594506">"শনাক্ত করা যায়নি"</string>
- <string name="disconnected" msgid="8526513868622591894">"ডিসকানেক্ট করা হয়েছে"</string>
- <string name="unknown" msgid="555736316465118024">"অজানা"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"ফোনের টেক্সট মেসেজ পরিষেবা চলছে"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"ফোনের টেক্সট মেসেজ পরিষেবা অ্যাক্টিভ আছে"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"কম্প্যানিয়ন ডিভাইসের মাধ্যমে টেক্সট মেসেজ পাচ্ছেন"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"ফোনের মাধ্যমে প্রোফাইল আনলক করুন"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"আনলক করার বিকল্প সেট করতে আপনার কম্প্যানিয়ন অ্যাপ চেক করে দেখুন"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;-কে আমার প্রোফাইল আনলক করতে দিন"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"আপনার ফোনকে অবশ্যই সম্পূর্ণ কানেক্ট হয়ে থাকতে হবে"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"এই ফিচার চালু করতে, নিশ্চিত করে নিন আপনার গাড়ি ও ফোনের ব্লুটুথ চালু করা আছে এবং সেগুলি একে অপরের কাছাকাছি আছে"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; এখন আপনার প্রোফাইল আনলক করতে পারবে"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"একটি প্রাথমিক প্রোফাইল লক তৈরি করুন"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"প্রোফাইল আনলক করতে আপনার ফোন ব্যবহার করার জন্য, আপনার কাছে ব্যাকআপ হিসেবে একটি প্রাথমিক প্রোফাইল লক থাকতে হবে"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"শেষ করার জন্য নিজের প্রোফাইল আনলক করুন"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"আপনি একটি নতুন প্রোফাইল লক তৈরি করেছেন। আপনার ফোন অটোমেটিক আপনার প্রোফাইল আনলক করতে পারে কিনা তা কনফার্ম করতে, এর পরে এটিকে আবার ঢোকান"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"এই ডিভাইসকে ডিসকানেক্ট করুন"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"এই ডিভাইস আবার কানেক্ট করা হয়েছে"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"ফোন দিয়ে আনলক করুন"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"আপনার ফোনকে আপনার প্রোফাইল আনলক করতে দিন"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"এই ফিচারকে অনুমতি দিতে এখানে ট্যাপ করুন"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"কিছু সমস্যা হয়েছে"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"এই ফিচারটি এখন চালু করা যাচ্ছে না। আবার চেষ্টা করুন।"</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"আপনার ফোনে একটি স্ক্রিন লক তৈরি করুন"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"আপনার ফোনে স্ক্রিন লক সেট নেই। আপনার ফোন দিয়ে নিজের গাড়ির প্রোফাইল আনলক করতে, প্রথমে আপনার ফোন সেটিংসে একটি স্ক্রিন লক (যাকে পাসকোড নামেও ডাকা হয়) তৈরি করুন।"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">আনুষঙ্গিক ডিভাইস</string>
+ <string name="add_device_title">আনুষঙ্গিক ডিভাইস যোগ করুন</string>
+ <string name="add_associated_device_title">একটি কম্প্যানিয়ন ডিভাইসের সাথে কানেক্ট করুন</string>
+ <string name="add_associated_device_instruction">ড্রাইভিংয়ের অভিজ্ঞতা ম্যানেজ করতে আপনার ফোনকে কম্প্যানিয়ন ডিভাইস হিসেবে ব্যবহার করতে পারেন</string>
+ <string name="associated_device_install_app"><b>কম্প্যানিয়ন অ্যাপ</b> আপনার ফোনে ইনস্টল করা আছে কিনা দেখে নিন</string>
+ <string name="associated_device_pairing_code_title">ফোনে কোড কনফার্ম করুন</string>
+ <string name="associated_device_pairing_message">আপনার ফোনে দেখানো কোডের সাথে এটি ম্যাচ করছে কিনা তা কনফার্ম করুন</string>
+ <string name="associated_device_success">ডিভাইস ঠিকমতো যুক্ত করা হয়েছে</string>
+ <string name="associated_device_select_device">অ্যাপটি খুলুন এবং &lt;b&gt;%1$s&lt;b&gt;-এ কানেক্ট করুন</string>
+ <string name="associated_device_open_app">অ্যাপ খুলে তাতে দেওয়া নির্দেশ ফলো করুন</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; সরিয়ে দেবেন?</string>
+ <string name="remove_associated_device_message">এই গাড়ি আর এই ডিভাইসের সাথে পেয়ার করা যাবে না। আপনাকে অতিরিক্তভাবে এই গাড়িকে কম্প্যানিয়ন অ্যাপ থেকে সরাতে হবে।</string>
+ <string name="device_removed_success_toast_text">%1$s-কে পুরোপুরি সরিয়ে দেওয়া গেছে</string>
+ <string name="device_removed_failure_toast_text">%1$s-কে পুরোপুরি সরিয়ে দেওয়া যায়নি</string>
+ <string name="continue_setup_toast_text">আপনার ফোনে সেট-আপ চালিয়ে যান</string>
+ <string name="error_screen_title">কোনও সমস্যা হয়েছে</string>
+ <string name="error_screen_message">এই স্ক্রিনকে সঠিকভাবে ডিসপ্লে করা যায়নি। আবার চেষ্টা করুন।</string>
+ <string name="turn_on_bluetooth_title">ব্লুটুথ চালু করুন</string>
+ <string name="turn_on_bluetooth_message">আপনার ফোনকে একটি কম্প্যানিয়ন ডিভাইস হিসেবে সেট-আপ করার জন্য আপনার গাড়িতে ব্লুটুথ থাকতে হবে।</string>
+ <string name="turn_on_bluetooth_dialog_title">ব্লুটুথ চালু করবেন?</string>
+ <string name="turn_on_bluetooth_dialog_message">আপনার কম্প্যানিয়ন ডিভাইসের সাথে কানেক্ট করার জন্য আপনার গাড়িতে ব্লুটুথ থাকতে হবে।</string>
+ <string name="accept">সম্মতি দিন</string>
+ <string name="reject">বাতিল করুন</string>
+ <string name="confirm">কনফার্ম করুন</string>
+ <string name="cancel">বাতিল করুন</string>
+ <string name="remove">সরান</string>
+ <string name="ok">ঠিক আছে</string>
+ <string name="connection">কানেকশন</string>
+ <string name="forget_title">এই ডিভাইসটিকে পুরোপুরি সরিয়ে দিন</string>
+ <string name="forget">ভুলে যান</string>
+ <string name="disable">বন্ধ করুন</string>
+ <string name="enable">চালু করুন</string>
+ <string name="continue_button">চালিয়ে যান</string>
+ <string name="retry">আবার করে দেখুন</string>
+ <string name="turn_on">চালু করুন</string>
+ <string name="not_now">এখন নয়</string>
+ <string name="connected">কানেক্ট করা আছে</string>
+ <string name="notDetected">শনাক্ত করা যায়নি</string>
+ <string name="disconnected">কানেকশন নেই</string>
+ <string name="unknown">অজানা</string>
+ <string name="app_running_msg_channel_name">ফোনের টেক্সট মেসেজ পরিষেবা চলছে</string>
+ <string name="app_running_msg_notification_title">ফোনের টেক্সট মেসেজ পরিষেবা অ্যাক্টিভ আছে</string>
+ <string name="app_running_msg_notification_content">কম্প্যানিয়ন ডিভাইসের মাধ্যমে টেক্সট মেসেজ পাচ্ছেন</string>
+ <string name="trusted_device_feature_title">ফোনের মাধ্যমে প্রোফাইল আনলক করুন</string>
+ <string name="trusted_device_feature_instruction">আনলক করার বিকল্প সেট করতে আপনার কম্প্যানিয়ন অ্যাপ চেক করে দেখুন</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; কে \'আমার প্রোফাইল\' আনলক করার অনুমতি দিন</string>
+ <string name="device_not_connected_dialog_title">আপনার ফোনকে অবশ্যই সম্পূর্ণ কানেক্ট হয়ে থাকতে হবে</string>
+ <string name="device_not_connected_dialog_message">এই ফিচার চালু করতে, নিশ্চিত করে নিন আপনার গাড়ি ও ফোনের ব্লুটুথ চালু করা আছে এবং সেগুলি একে অপরের কাছাকাছি আছে</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; এখন আপনার প্রোফাইল আনলক করতে পারবে</string>
+ <string name="create_profile_lock_dialog_title">একটি প্রাথমিক প্রোফাইল লক তৈরি করুন</string>
+ <string name="create_profile_lock_dialog_message">প্রোফাইল আনলক করতে আপনার ফোন ব্যবহার করার জন্য, আপনার কাছে ব্যাক-আপ হিসেবে একটি প্রাথমিক প্রোফাইল লক থাকতে হবে</string>
+ <string name="unlock_profile_to_finish_title">শেষ করার জন্য নিজের প্রোফাইল আনলক করুন</string>
+ <string name="unlock_profile_to_finish_message">আপনি একটি নতুন প্রোফাইল লক তৈরি করেছেন। আপনার ফোন অটোমেটিক আপনার প্রোফাইল আনলক করতে পারে কিনা তা কনফার্ম করতে, এর পরে এটিকে আবার ঢোকান</string>
+ <string name="disable_device_connection_text">এই ডিভাইসকে ডিসকানেক্ট করুন</string>
+ <string name="enable_device_connection_text">এই ডিভাইস আবার কানেক্ট করা হয়েছে</string>
+ <string name="trusted_device_notification_channel_name">ফোন দিয়ে আনলক করুন</string>
+ <string name="trusted_device_notification_title">আপনার ফোনকে আপনার প্রোফাইল আনলক করতে দিন</string>
+ <string name="trusted_device_notification_content">এই ফিচারকে অনুমতি দিতে এখানে ট্যাপ করুন</string>
+ <string name="trusted_device_enrollment_error_dialog_title">কোনও সমস্যা হয়েছে</string>
+ <string name="trusted_device_enrollment_error_dialog_message">এই ফিচারটি এখন চালু করা যাচ্ছে না। আবার চেষ্টা করুন।</string>
+ <string name="create_phone_lock_dialog_title">আপনার ফোনে একটি স্ক্রিন লক তৈরি করুন</string>
+ <string name="create_phone_lock_dialog_message">আপনার ফোনে স্ক্রিন লক সেট নেই। আপনার ফোন দিয়ে নিজের গাড়ির প্রোফাইল আনলক করতে, প্রথমে আপনার ফোনের সেটিংসে একটি স্ক্রিন লক (যাকে পাসকোড নামেও ডাকা হয়) তৈরি করুন।</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%dটি নতুন মেসেজ</item>
+ <item quantity="other">%dটি নতুন মেসেজ</item>
+ </plurals>
+ <string name="name_not_available">নাম পাওয়া যাচ্ছে না</string>
</resources>
diff --git a/companiondevice/res/values-bs/strings.xml b/companiondevice/res/values-bs/strings.xml
index 6b95a8e..e851745 100644
--- a/companiondevice/res/values-bs/strings.xml
+++ b/companiondevice/res/values-bs/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,75 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Povezani uređaj"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Dodaj povezani uređaj"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Povežite prateći uređaj"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Telefon možete koristiti kao prateći uređaj za pomoć pri upravljanju iskustvom vožnje"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Uvjerite se da ste instalirali "<b>"prateću aplik."</b>" na telefonu"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Potvrdite kôd na telefonu"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Potvrdite da se podudara s kodom prikazanim na vašem telefonu"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Uređaj je uspješno povezan"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Otvor. aplik. i pov. se na &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Otvorite aplikaciju i slijedite uputstva"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Zaboraviti kola &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Ovaj automobil više neće biti uparen s ovim uređajem. Osim toga, morat ćete ukloniti ovaj automobil iz prateće aplikacije."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Telefon <xliff:g id="PHONE_NAME">%1$s</xliff:g> je zaboravljen"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Zaboravljanje telefona <xliff:g id="PHONE_NAME">%1$s</xliff:g> nije uspjelo"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Nastavite postavljanje na telefonu"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Nešto nije uredu"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Nažalost, pravilno prikazivanje ovog ekrana nije uspjelo. Pokušajte ponovo."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Uključite Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Vaš automobil mora koristiti Bluetooth da postavi telefon kao prateći uređaj."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Uključiti Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Vaš automobil mora koristiti Bluetooth da se poveže na prateći uređaj."</string>
- <string name="accept" msgid="1454710793329618813">"Prihvati"</string>
- <string name="reject" msgid="4315432282758892890">"Odbij"</string>
- <string name="confirm" msgid="3748997214719276945">"Potvrdi"</string>
- <string name="cancel" msgid="4306609731174629323">"Otkaži"</string>
- <string name="remove" msgid="5513398257088729188">"Ukloni"</string>
- <string name="ok" msgid="2825038997730899083">"UREDU"</string>
- <string name="connection" msgid="2798490936433656846">"Veza"</string>
- <string name="forget_title" msgid="3027608547243824729">"Zaboravite ovaj uređaj"</string>
- <string name="forget" msgid="2069897665699141222">"Zaboravi"</string>
- <string name="disable" msgid="4619854429066283970">"Onemogući"</string>
- <string name="enable" msgid="7656386199154111316">"Omogući"</string>
- <string name="continue_button" msgid="2748318968566159950">"Nastavi"</string>
- <string name="retry" msgid="3783419451480721367">"Pokušaj ponovo"</string>
- <string name="turn_on" msgid="4288754850470994812">"Uključi"</string>
- <string name="not_now" msgid="8764692269093707622">"Ne sada"</string>
- <string name="connected" msgid="8051190714042020471">"Povezano"</string>
- <string name="notDetected" msgid="4115229772085594506">"Nije otkriveno"</string>
- <string name="disconnected" msgid="8526513868622591894">"Veza je prekinuta"</string>
- <string name="unknown" msgid="555736316465118024">"Nepoznato"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Usluga slanja SMS-ova na telefonu je pokrenuta"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Usluga slanja SMS-ova na telefonu je aktivna"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Primanje SMS-ova putem pratećeg uređaja"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Otključajte profil telefonom"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Provjerite prateću aplikaciju da postavite opcije otključavanja"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Dozvoli telefonu &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; da otključa moj profil"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefon mora biti aktivno povezan"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Da uključite ovu funkciju, uvjerite se da je Bluetooth uključen u automobilu i na telefonu i da se nalaze blizu"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; sada može otključati vaš profil"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Postavite zaključavanje primarnog profila"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Da koristite telefon za otključavanje profila, potrebno vam je zaključavanje primarnog profila kao sigurnosna kopija"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Otključajte profil da završite"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Postavili ste zaključavanje novog profila. Zatim ponovo unesite šifru da potvrdite da se profil može automatski otključavati telefonom"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Prekinite vezu ovog uređaja"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Ponovo povežite ovaj uređaj"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Otključaj telefonom"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Dozvolite telefonu da otključa vaš profil"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Dodirnite ovdje da odobrite ovu funkciju"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Nešto nije uredu"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Nažalost, trenutno nije moguće uključiti ovu funkciju. Pokušajte ponovo."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Postavite zaključavanje ekrana na telefonu"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Zaključavanje ekrana nije postavljeno na telefonu. Da otključate profil automobila pomoću telefona, prvo postavite zaključavanje ekrana (poznato i kao šifra) u postavkama telefona."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Povezani uređaj</string>
+ <string name="add_device_title">Dodaj povezani uređaj</string>
+ <string name="add_associated_device_title">Povežite prateći uređaj</string>
+ <string name="add_associated_device_instruction">Telefon možete koristiti kao prateći uređaj za pomoć pri upravljanju iskustvom vožnje</string>
+ <string name="associated_device_install_app">Provjerite je li <b>prateća aplikacija</b> instalirana na telefonu</string>
+ <string name="associated_device_pairing_code_title">Potvrdite kôd na telefonu</string>
+ <string name="associated_device_pairing_message">Potvrdite da se ovaj kôd podudara s kodom prikazanim na vašem telefonu</string>
+ <string name="associated_device_success">Uređaj je uspješno povezan</string>
+ <string name="associated_device_select_device">Otvorite aplikaciju i povežite se s automobilom &lt;b&gt;%1$s&lt;b&gt;</string>
+ <string name="associated_device_open_app">Otvorite aplikaciju i slijedite uputstva</string>
+ <string name="remove_associated_device_title">Zaboraviti automobil &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Ovaj automobil više neće biti uparen s ovim uređajem. Osim toga, morat ćete ukloniti ovaj automobil iz prateće aplikacije.</string>
+ <string name="device_removed_success_toast_text">Telefon %1$s je zaboravljen</string>
+ <string name="device_removed_failure_toast_text">Zaboravljanje telefona %1$s nije uspjelo</string>
+ <string name="continue_setup_toast_text">Nastavite postavljanje na telefonu</string>
+ <string name="error_screen_title">Nešto nije uredu</string>
+ <string name="error_screen_message">Nažalost, pravilno prikazivanje ovog ekrana nije uspjelo. Pokušajte ponovo.</string>
+ <string name="turn_on_bluetooth_title">Uključite Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Vaš automobil mora koristiti Bluetooth da postavi telefon kao prateći uređaj.</string>
+ <string name="turn_on_bluetooth_dialog_title">Uključiti Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Vaš automobil mora koristiti Bluetooth da se poveže s pratećim uređajem.</string>
+ <string name="accept">Prihvati</string>
+ <string name="reject">Odbij</string>
+ <string name="confirm">Potvrdi</string>
+ <string name="cancel">Otkaži</string>
+ <string name="remove">Ukloni</string>
+ <string name="ok">Uredu</string>
+ <string name="connection">Veza</string>
+ <string name="forget_title">Zaboravi ovaj uređaj</string>
+ <string name="forget">Zaboravi</string>
+ <string name="disable">Onemogući</string>
+ <string name="enable">Omogući</string>
+ <string name="continue_button">Nastavi</string>
+ <string name="retry">Pokušaj ponovo</string>
+ <string name="turn_on">Uključi</string>
+ <string name="not_now">Ne sada</string>
+ <string name="connected">Povezano</string>
+ <string name="notDetected">Nije otkriveno</string>
+ <string name="disconnected">Veza je prekinuta</string>
+ <string name="unknown">Nepoznato</string>
+ <string name="app_running_msg_channel_name">Usluga slanja SMS-ova na telefonu je pokrenuta</string>
+ <string name="app_running_msg_notification_title">Usluga slanja SMS-ova na telefonu je aktivna</string>
+ <string name="app_running_msg_notification_content">Primanje SMS-ova putem pratećeg uređaja</string>
+ <string name="trusted_device_feature_title">Otključajte profil telefonom</string>
+ <string name="trusted_device_feature_instruction">Provjerite prateću aplikaciju da postavite opcije otključavanja</string>
+ <string name="trusted_device_item_title">Dozvolite da telefon &lt;b&gt;%1$s&lt;/b&gt; otključa moj profil</string>
+ <string name="device_not_connected_dialog_title">Telefon mora biti aktivno povezan</string>
+ <string name="device_not_connected_dialog_message">Da uključite ovu funkciju, provjerite je li Bluetooth uključen u automobilu i na telefonu i da se nalaze blizu jedno drugom</string>
+ <string name="trusted_device_enrollment_success_message">Telefon &lt;b&gt;%1$s&lt;/b&gt; sada može otključati vaš profil</string>
+ <string name="create_profile_lock_dialog_title">Postavite zaključavanje primarnog profila</string>
+ <string name="create_profile_lock_dialog_message">Da koristite telefon za otključavanje profila, potrebno vam je zaključavanje primarnog profila kao sigurnosna kopija</string>
+ <string name="unlock_profile_to_finish_title">Otključajte profil da završite</string>
+ <string name="unlock_profile_to_finish_message">Postavili ste zaključavanje novog profila. Zatim ponovo unesite šifru da potvrdite da se profil može automatski otključavati telefonom</string>
+ <string name="disable_device_connection_text">Prekinite vezu s ovim uređajem</string>
+ <string name="enable_device_connection_text">Ponovo povežite ovaj uređaj</string>
+ <string name="trusted_device_notification_channel_name">Otključaj telefonom</string>
+ <string name="trusted_device_notification_title">Dozvolite telefonu da otključa vaš profil</string>
+ <string name="trusted_device_notification_content">Dodirnite ovdje da odobrite ovu funkciju</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Nešto nije uredu</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Nažalost, trenutno nije moguće uključiti ovu funkciju. Pokušajte ponovo.</string>
+ <string name="create_phone_lock_dialog_title">Postavite zaključavanje ekrana na telefonu</string>
+ <string name="create_phone_lock_dialog_message">Zaključavanje ekrana nije postavljeno na telefonu. Da otključate profil automobila pomoću telefona, prvo postavite zaključavanje ekrana (poznato i kao šifra) u postavkama telefona.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d nova poruka</item>
+ <item quantity="few">%d nove poruke</item>
+ <item quantity="other">%d novih poruka</item>
+ </plurals>
+ <string name="name_not_available">Ime nije dostupno</string>
</resources>
diff --git a/companiondevice/res/values-ca/strings.xml b/companiondevice/res/values-ca/strings.xml
index 035d0ca..1ae9d9b 100644
--- a/companiondevice/res/values-ca/strings.xml
+++ b/companiondevice/res/values-ca/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Dispositiu associat"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Afegeix un dispositiu associat"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Connecta un dispositiu complementari"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Pots utilitzar el telèfon com a dispositiu complementari per gestionar l\'experiència de conducció."</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Assegura\'t que tens una "<b>"aplicació complementària"</b>" al telèfon"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Confirma el codi al telèfon"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Confirma que coincideix amb el codi que es mostra al teu telèfon"</string>
- <string name="associated_device_success" msgid="584760065696870256">"El dispositiu s\'ha associat correctament"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Obre l\'app i connecta\'t a &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Obre l\'app i segueix les instruccions"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Vols oblidar &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Aquest cotxe ja no estarà vinculat amb aquest dispositiu. També hauràs de suprimir el cotxe de l\'aplicació complementària."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> s\'ha oblidat"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"No s\'ha pogut oblidar <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Continua amb la configuració al telèfon"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"S\'ha produït un error"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Aquesta pantalla no s\'ha pogut mostrar correctament. Torna-ho a provar."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Activa el Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Per configurar el telèfon com a dispositiu complementari, el teu cotxe necessita el Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Vols activar el Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Per connectar el dispositiu complementari, el teu cotxe necessita el Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Accepta"</string>
- <string name="reject" msgid="4315432282758892890">"Rebutja"</string>
- <string name="confirm" msgid="3748997214719276945">"Confirma"</string>
- <string name="cancel" msgid="4306609731174629323">"Cancel·la"</string>
- <string name="remove" msgid="5513398257088729188">"Suprimeix"</string>
- <string name="ok" msgid="2825038997730899083">"Accepta"</string>
- <string name="connection" msgid="2798490936433656846">"Connexió"</string>
- <string name="forget_title" msgid="3027608547243824729">"Oblida aquest dispositiu"</string>
- <string name="forget" msgid="2069897665699141222">"Oblida"</string>
- <string name="disable" msgid="4619854429066283970">"Desactiva"</string>
- <string name="enable" msgid="7656386199154111316">"Activa"</string>
- <string name="continue_button" msgid="2748318968566159950">"Continua"</string>
- <string name="retry" msgid="3783419451480721367">"Torna-ho a provar"</string>
- <string name="turn_on" msgid="4288754850470994812">"Activa"</string>
- <string name="not_now" msgid="8764692269093707622">"Ara no"</string>
- <string name="connected" msgid="8051190714042020471">"Connectat"</string>
- <string name="notDetected" msgid="4115229772085594506">"No detectat"</string>
- <string name="disconnected" msgid="8526513868622591894">"Desconnectat"</string>
- <string name="unknown" msgid="555736316465118024">"Desconegut"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Servei de missatges de text del telèfon en execució"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Servei de missatgeria de text del telèfon actiu"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"S\'estan rebent missatges de text mitjançant un dispositiu complementari"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Desbloqueja el perfil amb el telèfon"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Ves a l\'aplicació complementària per definir les opcions de desbloqueig"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Permet que &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; desbloquegi el meu perfil"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"El telèfon ha d\'estar connectat i actiu"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Per activar aquesta funció, assegura\'t que el cotxe i el telèfon tinguin el Bluetooth activat i estiguin a prop"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"Ara &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; pot desbloquejar el teu perfil"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Crea un bloqueig de perfil principal"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Per utilitzar el telèfon per desbloquejar el teu perfil, necessites un bloqueig de perfil principal de seguretat"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Desbloqueja el teu perfil per finalitzar"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Has creat un bloqueig de perfil nou. A continuació, torna a introduir-lo per confirmar que el telèfon pot desbloquejar el teu perfil automàticament."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Desconnecta aquest dispositiu"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Torna a connectar aquest dispositiu"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Desbloqueja amb el telèfon"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Permet que el telèfon desbloquegi el teu perfil"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Toca aquí per autoritzar aquesta funció"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"S\'ha produït un error"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Aquesta funció no s\'ha pogut activar en aquest moment. Torna-ho a provar."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Crea un bloqueig de pantalla al telèfon"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"El telèfon no té definit un bloqueig de pantalla. Per desbloquejar el perfil del cotxe amb el telèfon, primer has de crear un bloqueig de pantalla (també anomenat contrasenya) a la configuració del telèfon."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Dispositiu associat</string>
+ <string name="add_device_title">Afegeix un dispositiu associat</string>
+ <string name="add_associated_device_title">Connecta un dispositiu complementari</string>
+ <string name="add_associated_device_instruction">Pots utilitzar el telèfon com a dispositiu complementari per gestionar l\'experiència de conducció</string>
+ <string name="associated_device_install_app">Assegura\'t que tens una <b>aplicació complementària</b> al telèfon</string>
+ <string name="associated_device_pairing_code_title">Confirma el codi al telèfon</string>
+ <string name="associated_device_pairing_message">Confirma que coincideix amb el codi que es mostra al teu telèfon</string>
+ <string name="associated_device_success">El dispositiu s\'ha associat correctament</string>
+ <string name="associated_device_select_device">Obre l\'aplicació i connecta\'t a &lt;b&gt;%1$s&lt;b&gt;</string>
+ <string name="associated_device_open_app">Obre l\'aplicació i segueix les instruccions que hi trobaràs</string>
+ <string name="remove_associated_device_title">Vols oblidar &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Aquest cotxe ja no estarà vinculat amb aquest dispositiu. També hauràs de suprimir el cotxe de l\'aplicació complementària.</string>
+ <string name="device_removed_success_toast_text">%1$s s\'ha oblidat</string>
+ <string name="device_removed_failure_toast_text">No s\'ha pogut oblidar %1$s</string>
+ <string name="continue_setup_toast_text">Continua amb la configuració al telèfon</string>
+ <string name="error_screen_title">S\'ha produït un error</string>
+ <string name="error_screen_message">Aquesta pantalla no s\'ha pogut mostrar correctament. Torna-ho a provar.</string>
+ <string name="turn_on_bluetooth_title">Activa el Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Per configurar el telèfon com a dispositiu complementari, el teu cotxe necessita el Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Vols activar el Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Per connectar el dispositiu complementari, el teu cotxe necessita el Bluetooth.</string>
+ <string name="accept">Accepta</string>
+ <string name="reject">Rebutja</string>
+ <string name="confirm">Confirma</string>
+ <string name="cancel">Cancel·la</string>
+ <string name="remove">Suprimeix</string>
+ <string name="ok">D\'acord</string>
+ <string name="connection">Connexió</string>
+ <string name="forget_title">Oblida aquest dispositiu</string>
+ <string name="forget">Oblida</string>
+ <string name="disable">Desactiva</string>
+ <string name="enable">Activa</string>
+ <string name="continue_button">Continua</string>
+ <string name="retry">Torna-ho a provar</string>
+ <string name="turn_on">Activa</string>
+ <string name="not_now">Ara no</string>
+ <string name="connected">Connectat</string>
+ <string name="notDetected">No detectat</string>
+ <string name="disconnected">Desconnectat</string>
+ <string name="unknown">Desconegut</string>
+ <string name="app_running_msg_channel_name">Servei de missatges de text del telèfon en execució</string>
+ <string name="app_running_msg_notification_title">Servei de missatgeria de text del telèfon actiu</string>
+ <string name="app_running_msg_notification_content">S\'estan rebent missatges de text mitjançant un dispositiu complementari</string>
+ <string name="trusted_device_feature_title">Desbloqueja el perfil amb el telèfon</string>
+ <string name="trusted_device_feature_instruction">Ves a l\'aplicació complementària per definir les opcions de desbloqueig</string>
+ <string name="trusted_device_item_title">Permet que &lt;b&gt;%1$s&lt;/b&gt; desbloquegi el meu perfil</string>
+ <string name="device_not_connected_dialog_title">El telèfon ha d\'estar connectat i actiu</string>
+ <string name="device_not_connected_dialog_message">Per activar aquesta funció, assegura\'t que el cotxe i el telèfon tinguin el Bluetooth activat i estiguin a prop</string>
+ <string name="trusted_device_enrollment_success_message">Ara &lt;b&gt;%1$s&lt;/b&gt; pot desbloquejar el teu perfil</string>
+ <string name="create_profile_lock_dialog_title">Crea un bloqueig de perfil principal</string>
+ <string name="create_profile_lock_dialog_message">Per utilitzar el telèfon per desbloquejar el teu perfil, necessites un bloqueig de perfil principal de seguretat</string>
+ <string name="unlock_profile_to_finish_title">Desbloqueja el teu perfil per finalitzar</string>
+ <string name="unlock_profile_to_finish_message">Has creat un bloqueig de perfil nou. A continuació, torna a introduir-lo per confirmar que el telèfon pot desbloquejar el teu perfil automàticament.</string>
+ <string name="disable_device_connection_text">Desconnecta aquest dispositiu</string>
+ <string name="enable_device_connection_text">Torna a connectar aquest dispositiu</string>
+ <string name="trusted_device_notification_channel_name">Desbloqueja amb el telèfon</string>
+ <string name="trusted_device_notification_title">Permet que el telèfon desbloquegi el teu perfil</string>
+ <string name="trusted_device_notification_content">Toca aquí per autoritzar aquesta funció</string>
+ <string name="trusted_device_enrollment_error_dialog_title">S\'ha produït un error</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Aquesta funció no s\'ha pogut activar en aquest moment. Torna-ho a provar.</string>
+ <string name="create_phone_lock_dialog_title">Crea un bloqueig de pantalla al telèfon</string>
+ <string name="create_phone_lock_dialog_message">El telèfon no té definit un bloqueig de pantalla. Per desbloquejar el perfil del cotxe amb el telèfon, primer has de crear un bloqueig de pantalla (també anomenat \"contrasenya\") a la configuració del telèfon.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Missatge nou</item>
+ <item quantity="other">%d missatges nous</item>
+ </plurals>
+ <string name="name_not_available">Nom no disponible</string>
</resources>
diff --git a/companiondevice/res/values-cs/strings.xml b/companiondevice/res/values-cs/strings.xml
index 166fd21..9378eb0 100644
--- a/companiondevice/res/values-cs/strings.xml
+++ b/companiondevice/res/values-cs/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,76 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Přidružené zařízení"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Přidat přidružené zařízení"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Připojení doprovodného zařízení"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Telefon můžete použít jako doprovodné zařízení, které vám pomůže spravovat funkce řízení"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Ověřte, zda je v telefonu nainstalovaná "<b>"doprovodná aplikace"</b></string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Ověření kódu v telefonu"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Ověřte, zda se kód shoduje s kódem v telefonu"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Zařízení bylo úspěšně přidruženo"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Otevřete aplikaci a připojte se k &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Postupujte podle pokynů v aplikaci"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Zapomenout auto &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Auto již s tímto zařízením nebude spárováno. Také budete muset auto odstranit z doprovodné aplikace."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Zařízení <xliff:g id="PHONE_NAME">%1$s</xliff:g> bylo zapomenuto"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Zařízení <xliff:g id="PHONE_NAME">%1$s</xliff:g> se nepodařilo zapomenout"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Pokračujte v nastavování v telefonu"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Něco se pokazilo"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Stánku se bohužel nepodařilo správně zobrazit. Zkuste to znovu."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Zapněte Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Chcete-li telefon nastavit jako doprovodné zařízení, zapněte v autě Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Zapnout Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Chcete-li se připojit k doprovodnému zařízení, zapněte v autě Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Přijmout"</string>
- <string name="reject" msgid="4315432282758892890">"Zamítnout"</string>
- <string name="confirm" msgid="3748997214719276945">"Potvrdit"</string>
- <string name="cancel" msgid="4306609731174629323">"Zrušit"</string>
- <string name="remove" msgid="5513398257088729188">"Odstranit"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Připojení"</string>
- <string name="forget_title" msgid="3027608547243824729">"Zapomenout zařízení"</string>
- <string name="forget" msgid="2069897665699141222">"Zapomenout"</string>
- <string name="disable" msgid="4619854429066283970">"Povolit"</string>
- <string name="enable" msgid="7656386199154111316">"Zakázat"</string>
- <string name="continue_button" msgid="2748318968566159950">"Pokračovat"</string>
- <string name="retry" msgid="3783419451480721367">"Zkusit znovu"</string>
- <string name="turn_on" msgid="4288754850470994812">"Zapnout"</string>
- <string name="not_now" msgid="8764692269093707622">"Teď ne"</string>
- <string name="connected" msgid="8051190714042020471">"Propojeno"</string>
- <string name="notDetected" msgid="4115229772085594506">"Nezjištěno"</string>
- <string name="disconnected" msgid="8526513868622591894">"Odpojeno"</string>
- <string name="unknown" msgid="555736316465118024">"Neznámé"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Služba textových zpráv z telefonu je spuštěna"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Služba textových zpráv z telefonu je aktivní"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Příjem textových zpráv prostřednictvím doprovodného zařízení"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Odemknutí profilu telefonem"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"V doprovodné aplikaci nastavte možnosti odemknutí"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Povolit telefonu &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; odemykat profil"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefon musí být aktivně připojen"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Chcete-li tuto funkci zapnout, zkontrolujte, zda je v autě i v telefonu zapnuto Bluetooth a obě zařízení jsou blízko u sebe"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; teď může odemykat profil"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Vytvoření zámku primárního profilu"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Chcete-li pomocí telefonu odemykat profil, musíte mít jako záložní možnost nastaven zámek primárního profilu"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Nastavení dokončíte odemknutím profilu"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Vytvořili jste nový zámek profilu. Teď ho zadejte znovu, abyste potvrdili, že telefon smí automaticky odemykat profil"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Odpojit zařízení"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Znovu připojit zařízení"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Odemknutí telefonem"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Povolte telefonu odemykat profil"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Klepnutím sem tuto funkci schválíte"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Něco se pokazilo"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Tuto funkci momentálně nelze zapnout. Zkuste to znovu."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Vytvoření zámku obrazovky v telefonu"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Telefon nemá nastaven zámek obrazovky. Chcete-li pomocí telefonu odemykat profil v autě, nejdřív v nastavení telefonu vytvořte zámek obrazovky."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Přidružené zařízení</string>
+ <string name="add_device_title">Přidat přidružené zařízení</string>
+ <string name="add_associated_device_title">Připojení doprovodného zařízení</string>
+ <string name="add_associated_device_instruction">Telefon můžete použít jako doprovodné zařízení, které vám pomůže spravovat funkce řízení</string>
+ <string name="associated_device_install_app">Ověřte, zda je v telefonu nainstalovaná <b>doprovodná aplikace</b></string>
+ <string name="associated_device_pairing_code_title">Ověření kódu v telefonu</string>
+ <string name="associated_device_pairing_message">Ověřte, zda se kód shoduje s kódem v telefonu</string>
+ <string name="associated_device_success">Zařízení bylo úspěšně přidruženo</string>
+ <string name="associated_device_select_device">Otevřete aplikaci a připojte se k autu &lt;b&gt;%1$s&lt;b&gt;</string>
+ <string name="associated_device_open_app">Postupujte podle pokynů v aplikaci</string>
+ <string name="remove_associated_device_title">Zapomenout auto &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Auto již s tímto zařízením nebude spárováno. Také budete muset auto odstranit z doprovodné aplikace.</string>
+ <string name="device_removed_success_toast_text">Zařízení %1$s bylo zapomenuto</string>
+ <string name="device_removed_failure_toast_text">Zařízení %1$s se nepodařilo zapomenout</string>
+ <string name="continue_setup_toast_text">Pokračujte v nastavování v telefonu</string>
+ <string name="error_screen_title">Něco se pokazilo</string>
+ <string name="error_screen_message">Stránku se bohužel nepodařilo správně zobrazit. Zkuste to znovu.</string>
+ <string name="turn_on_bluetooth_title">Zapněte Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Chcete-li telefon nastavit jako doprovodné zařízení, zapněte v autě Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Zapnout Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Chcete-li se připojit k doprovodnému zařízení, zapněte v autě Bluetooth.</string>
+ <string name="accept">Přijmout</string>
+ <string name="reject">Zamítnout</string>
+ <string name="confirm">Potvrdit</string>
+ <string name="cancel">Zrušit</string>
+ <string name="remove">Odstranit</string>
+ <string name="ok">OK</string>
+ <string name="connection">Připojení</string>
+ <string name="forget_title">Zapomenout zařízení</string>
+ <string name="forget">Zapomenout</string>
+ <string name="disable">Zakázat</string>
+ <string name="enable">Povolit</string>
+ <string name="continue_button">Pokračovat</string>
+ <string name="retry">Zkusit znovu</string>
+ <string name="turn_on">Zapnout</string>
+ <string name="not_now">Teď ne</string>
+ <string name="connected">Připojeno</string>
+ <string name="notDetected">Nerozpoznáno</string>
+ <string name="disconnected">Odpojeno</string>
+ <string name="unknown">Neznámé</string>
+ <string name="app_running_msg_channel_name">Služba textových zpráv z telefonu je spuštěna</string>
+ <string name="app_running_msg_notification_title">Služba textových zpráv z telefonu je aktivní</string>
+ <string name="app_running_msg_notification_content">Příjem textových zpráv prostřednictvím doprovodného zařízení</string>
+ <string name="trusted_device_feature_title">Odemknutí profilu telefonem</string>
+ <string name="trusted_device_feature_instruction">V doprovodné aplikaci nastavte možnosti odemknutí</string>
+ <string name="trusted_device_item_title">Povolit telefonu &lt;b&gt;%1$s&lt;/b&gt; odemykat můj profil</string>
+ <string name="device_not_connected_dialog_title">Telefon musí být aktivně připojen</string>
+ <string name="device_not_connected_dialog_message">Chcete-li tuto funkci zapnout, zkontrolujte, zda je v autě i v telefonu zapnuto Bluetooth a obě zařízení jsou blízko u sebe</string>
+ <string name="trusted_device_enrollment_success_message">Telefon &lt;b&gt;%1$s&lt;/b&gt; teď může odemykat můj profil</string>
+ <string name="create_profile_lock_dialog_title">Vytvoření zámku primárního profilu</string>
+ <string name="create_profile_lock_dialog_message">Chcete-li pomocí telefonu odemykat profil, musíte mít jako záložní možnost nastaven zámek primárního profilu</string>
+ <string name="unlock_profile_to_finish_title">Nastavení dokončíte odemknutím profilu</string>
+ <string name="unlock_profile_to_finish_message">Vytvořili jste nový zámek profilu. Teď ho zadejte znovu, abyste potvrdili, že telefon smí automaticky odemykat profil</string>
+ <string name="disable_device_connection_text">Odpojit zařízení</string>
+ <string name="enable_device_connection_text">Znovu připojit zařízení</string>
+ <string name="trusted_device_notification_channel_name">Odemknutí telefonem</string>
+ <string name="trusted_device_notification_title">Povolte telefonu odemykat profil</string>
+ <string name="trusted_device_notification_content">Klepnutím sem tuto funkci schválíte</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Něco se pokazilo</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Tuto funkci momentálně nelze zapnout. Zkuste to znovu.</string>
+ <string name="create_phone_lock_dialog_title">Vytvoření zámku obrazovky v telefonu</string>
+ <string name="create_phone_lock_dialog_message">Telefon nemá nastaven zámek obrazovky. Chcete-li pomocí telefonu odemykat profil v autě, nejdřív v nastavení telefonu vytvořte zámek obrazovky.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Nová zpráva</item>
+ <item quantity="few">%d nové zprávy</item>
+ <item quantity="many">%d nové zprávy</item>
+ <item quantity="other">%d nových zpráv</item>
+ </plurals>
+ <string name="name_not_available">Jméno není dostupné</string>
</resources>
diff --git a/companiondevice/res/values-da/strings.xml b/companiondevice/res/values-da/strings.xml
index c4bc0d1..17b0dfb 100644
--- a/companiondevice/res/values-da/strings.xml
+++ b/companiondevice/res/values-da/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Tilknyttet enhed"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Tilføj tilknyttet enhed"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Tilslut en ledsagende enhed"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Du kan bruge din telefon som en ledsagende enhed, der kan hjælpe dig under kørsel"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Sørg for, at "<b>"den medfølgende app"</b>" er installeret på din tlf."</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Bekræft koden på telefonen"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Bekræft, at dette stemmer overens med den kode, der vises på din telefon"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Enheden blev tilknyttet"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Åbn appen, og opret forbindelse til &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Åbn appen, og følg vejledningen i appen"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Vil du glemme &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Denne bil vil ikke længere være parret med denne enhed. Du skal også fjerne denne bil fra den medfølgende app."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> blev glemt"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> kunne ikke glemmes"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Fortsæt konfigurationen på din telefon"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Noget gik galt"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Denne skærm kunne ikke vises korrekt. Prøv igen."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Aktivér Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Din bil skal aktivere Bluetooth for at konfigurere din telefon som en ledsagende enhed."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Vil du aktivere Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Din bil skal aktivere Bluetooth for at oprette forbindelse til din ledsagende enhed."</string>
- <string name="accept" msgid="1454710793329618813">"Acceptér"</string>
- <string name="reject" msgid="4315432282758892890">"Afvis"</string>
- <string name="confirm" msgid="3748997214719276945">"Bekræft"</string>
- <string name="cancel" msgid="4306609731174629323">"Annuller"</string>
- <string name="remove" msgid="5513398257088729188">"Fjern"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Forbindelse"</string>
- <string name="forget_title" msgid="3027608547243824729">"Glem denne enhed"</string>
- <string name="forget" msgid="2069897665699141222">"Glem"</string>
- <string name="disable" msgid="4619854429066283970">"Deaktiver"</string>
- <string name="enable" msgid="7656386199154111316">"Aktivér"</string>
- <string name="continue_button" msgid="2748318968566159950">"Fortsæt"</string>
- <string name="retry" msgid="3783419451480721367">"Prøv igen"</string>
- <string name="turn_on" msgid="4288754850470994812">"Aktivér"</string>
- <string name="not_now" msgid="8764692269093707622">"Ikke nu"</string>
- <string name="connected" msgid="8051190714042020471">"Forbundet"</string>
- <string name="notDetected" msgid="4115229772085594506">"Ikke registreret"</string>
- <string name="disconnected" msgid="8526513868622591894">"Afbrudt"</string>
- <string name="unknown" msgid="555736316465118024">"Ukendt"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Tjenesten til sms-beskeder fra telefonen kører"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Tjenesten til sms-beskeder fra telefonen er aktiv"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Modtager sms-beskeder via ledsagende enhed"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Lås profilen op med telefonen"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Brug din medfølgende app til at angive indstillinger for oplåsning"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Tillad, at &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; låser min profil op"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Din telefon skal være tilsluttet"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Hvis du vil aktivere denne funktion, skal du sørge for, at din bil og telefon har aktiveret Bluetooth og er i nærheden af hinanden"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; kan nu låse din profil op"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Opret en primær profillås"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Hvis du vil bruge din telefon til at låse din profil op, skal du konfigurere en primær profillås som backup"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Lås din profil op for at afslutte"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Du har oprettet en ny profillås. Angiv den igen for at bekræfte, at din telefon kan låse din profil op automatisk."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Afbryd forbindelsen til denne enhed"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Opret forbindelse til denne enhed igen"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Lås op med telefonen"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Tillad, at din telefon låser din profil op"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Tryk her for at godkende denne funktion"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Noget gik galt"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Denne funktion kunne ikke aktiveres. Prøv igen."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Opret en skærmlås på din telefon"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Der er ikke konfigureret en skærmlås på din telefon. Hvis du vil låse bilprofilen op med din telefon, skal du først oprette en skærmlås (også kaldet en adgangskode) i indstillingerne på din telefon."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Tilknyttet enhed</string>
+ <string name="add_device_title">Tilføj tilknyttet enhed</string>
+ <string name="add_associated_device_title">Tilslut en ledsagende enhed</string>
+ <string name="add_associated_device_instruction">Du kan bruge din telefon som en ledsagende enhed, der kan hjælpe dig under kørsel</string>
+ <string name="associated_device_install_app">Sørg for, at <b>den medfølgende app</b> er installeret på telefonen</string>
+ <string name="associated_device_pairing_code_title">Bekræft koden på telefonen</string>
+ <string name="associated_device_pairing_message">Bekræft, at dette stemmer overens med den kode, der vises på din telefon</string>
+ <string name="associated_device_success">Enheden blev tilknyttet</string>
+ <string name="associated_device_select_device">Åbn appen, og opret forbindelse til &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Åbn appen, og følg vejledningen i appen</string>
+ <string name="remove_associated_device_title">Vil du glemme &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Denne bil vil ikke længere være parret med denne enhed. Du skal også fjerne denne bil fra den medfølgende app.</string>
+ <string name="device_removed_success_toast_text">%1$s blev glemt</string>
+ <string name="device_removed_failure_toast_text">%1$s kunne ikke glemmes</string>
+ <string name="continue_setup_toast_text">Fortsæt konfigurationen på din telefon</string>
+ <string name="error_screen_title">Noget gik galt</string>
+ <string name="error_screen_message">Denne skærm kunne ikke vises korrekt. Prøv igen.</string>
+ <string name="turn_on_bluetooth_title">Aktivér Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Bluetooth skal aktiveres i din bil, før din telefon kan konfigureres som en ledsagende enhed.</string>
+ <string name="turn_on_bluetooth_dialog_title">Vil du aktivere Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Bluetooth skal aktiveres i din bil, før der kan oprettes forbindelse til din ledsagende enhed.</string>
+ <string name="accept">Acceptér</string>
+ <string name="reject">Afvis</string>
+ <string name="confirm">Bekræft</string>
+ <string name="cancel">Annuller</string>
+ <string name="remove">Fjern</string>
+ <string name="ok">OK</string>
+ <string name="connection">Forbindelse</string>
+ <string name="forget_title">Glem denne enhed</string>
+ <string name="forget">Glem</string>
+ <string name="disable">Deaktiver</string>
+ <string name="enable">Aktivér</string>
+ <string name="continue_button">Fortsæt</string>
+ <string name="retry">Prøv igen</string>
+ <string name="turn_on">Aktivér</string>
+ <string name="not_now">Ikke nu</string>
+ <string name="connected">Forbundet</string>
+ <string name="notDetected">Ikke registreret</string>
+ <string name="disconnected">Afbrudt</string>
+ <string name="unknown">Ukendt</string>
+ <string name="app_running_msg_channel_name">Tjenesten til sms-beskeder fra telefonen kører</string>
+ <string name="app_running_msg_notification_title">Tjenesten til sms-beskeder fra telefonen er aktiv</string>
+ <string name="app_running_msg_notification_content">Modtager sms-beskeder via den ledsagende enhed</string>
+ <string name="trusted_device_feature_title">Lås profilen op med telefonen</string>
+ <string name="trusted_device_feature_instruction">Brug din medfølgende app til at angive indstillinger for oplåsning</string>
+ <string name="trusted_device_item_title">Tillad, at &lt;b&gt;%1$s&lt;/b&gt; låser min profil op</string>
+ <string name="device_not_connected_dialog_title">Der skal være en aktiv forbindelse til din telefon</string>
+ <string name="device_not_connected_dialog_message">Hvis du vil aktivere denne funktion, skal du sørge for, at din bil og telefon har aktiveret Bluetooth og er i nærheden af hinanden</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; kan nu låse din profil op</string>
+ <string name="create_profile_lock_dialog_title">Opret en primær profillås</string>
+ <string name="create_profile_lock_dialog_message">Hvis du vil bruge din telefon til at låse din profil op, skal du konfigurere en primær profillås som alternativ metode</string>
+ <string name="unlock_profile_to_finish_title">Lås din profil op for at afslutte</string>
+ <string name="unlock_profile_to_finish_message">Du har oprettet en ny profillås. Angiv den igen for at bekræfte, at din telefon kan låse din profil op automatisk.</string>
+ <string name="disable_device_connection_text">Afbryd forbindelsen til denne enhed</string>
+ <string name="enable_device_connection_text">Opret forbindelse til denne enhed igen</string>
+ <string name="trusted_device_notification_channel_name">Lås op med telefonen</string>
+ <string name="trusted_device_notification_title">Tillad, at din telefon låser din profil op</string>
+ <string name="trusted_device_notification_content">Tryk her for at godkende denne funktion</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Noget gik galt</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Denne funktion kunne ikke aktiveres. Prøv igen.</string>
+ <string name="create_phone_lock_dialog_title">Opret en skærmlås på din telefon</string>
+ <string name="create_phone_lock_dialog_message">Der er ikke konfigureret en skærmlås på din telefon. Hvis du vil låse bilprofilen op med din telefon, skal du først oprette en skærmlås (også kaldet en adgangskode) i indstillingerne på din telefon.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d ny besked</item>
+ <item quantity="other">%d nye beskeder</item>
+ </plurals>
+ <string name="name_not_available">Navnet er ikke tilgængeligt</string>
</resources>
diff --git a/companiondevice/res/values-de/strings.xml b/companiondevice/res/values-de/strings.xml
index a8b08ab..433dd60 100644
--- a/companiondevice/res/values-de/strings.xml
+++ b/companiondevice/res/values-de/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Zugehöriges Gerät"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Zugehöriges Gerät hinzufügen"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Begleitgerät verbinden"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Du kannst dein Smartphone als Begleitgerät verwenden und darauf die Fahreinstellungen konfigurieren"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Die "<b>"Companion App"</b>" muss auf dem Smartphone installiert sein"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Code auf Smartphone bestätigen"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Bestätige, dass dieser Code dem Code auf deinem Smartphone entspricht"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Das Gerät wurde zugeordnet"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Öffne die App und verbinde dich mit &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Öffne die App und folge der Anleitung"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; entfernen?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Dieses Auto wird nicht mehr mit diesem Dienst gekoppelt. Es muss zusätzlich noch aus der Companion App entfernt werden."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> ist nicht gekoppelt."</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"\"<xliff:g id="PHONE_NAME">%1$s</xliff:g>\" konnte nicht entfernt werden"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Fahre mit der Einrichtung auf dem Smartphone fort"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Ein Fehler ist aufgetreten"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Dieses Display konnte nicht richtig angezeigt werden. Bitte versuch es noch einmal."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Bluetooth aktivieren"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Damit du dein Smartphone als Begleitgerät einrichten kannst, muss die Bluetooth-Funktion deines Autos aktiviert sein."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Bluetooth aktivieren?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Damit eine Verbindung zum Begleitgerät hergestellt werden kann, muss die Bluetooth-Funktion deines Autos aktiviert sein."</string>
- <string name="accept" msgid="1454710793329618813">"Akzeptieren"</string>
- <string name="reject" msgid="4315432282758892890">"Ablehnen"</string>
- <string name="confirm" msgid="3748997214719276945">"Bestätigen"</string>
- <string name="cancel" msgid="4306609731174629323">"Abbrechen"</string>
- <string name="remove" msgid="5513398257088729188">"Entfernen"</string>
- <string name="ok" msgid="2825038997730899083">"Akzeptieren"</string>
- <string name="connection" msgid="2798490936433656846">"Verbindung"</string>
- <string name="forget_title" msgid="3027608547243824729">"Gerät entkoppeln"</string>
- <string name="forget" msgid="2069897665699141222">"Entfernen"</string>
- <string name="disable" msgid="4619854429066283970">"Deaktivieren"</string>
- <string name="enable" msgid="7656386199154111316">"Aktivieren"</string>
- <string name="continue_button" msgid="2748318968566159950">"Weiter"</string>
- <string name="retry" msgid="3783419451480721367">"Wiederholen"</string>
- <string name="turn_on" msgid="4288754850470994812">"Aktivieren"</string>
- <string name="not_now" msgid="8764692269093707622">"Später"</string>
- <string name="connected" msgid="8051190714042020471">"Verbunden"</string>
- <string name="notDetected" msgid="4115229772085594506">"Nicht gefunden"</string>
- <string name="disconnected" msgid="8526513868622591894">"Nicht verbunden"</string>
- <string name="unknown" msgid="555736316465118024">"Unbekannt"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"SMS-Dienst auf Smartphone läuft"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"SMS-Dienst auf Smartphone ist aktiv"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"SMS werden über Begleitgerät empfangen"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Profil mit Smartphone entsperren"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Konfiguriere die Optionen zum Entsperren über die Companion App"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Entsperren meines Profils über &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; zulassen"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Dein Smartphone muss verbunden sein"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Damit du diese Funktion aktivieren kannst, muss Bluetooth im Auto und auf deinem Smartphone eingeschaltet und das Smartphone in der Nähe des Autos sein"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"Du kannst dein Profil jetzt mit &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; entsperren"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Primäre Sperre für Profil erstellen"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Damit du dein Smartphone zum Entsperren deines Profils verwenden kannst, benötigst du für dein Profil eine primäre Sperre als Ersatz"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Profil zum Abschluss entsperren"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Du hast eine neue Profilsperre eingerichtet. Gib sie noch einmal ein, um zu bestätigen, dass dein Smartphone dein Profil automatisch entsperren darf."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Gerät trennen"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Gerät wieder verbinden"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Mit Smartphone entsperren"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Profil mit dem Smartphone entsperren"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Tippe hier, um diese Funktion zuzulassen"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Ein Fehler ist aufgetreten"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Diese Funktion kann momentan nicht aktiviert werden. Bitte versuch es noch einmal."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Displaysperre auf dem Smartphone einrichten"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Auf deinem Smartphone ist noch keine Displaysperre eingerichtet. Damit du dein Autoprofil mit dem Smartphone entsperren kannst, musst du zuerst eine Displaysperre (auch Sicherheitscode genannt) in den Einstellungen des Smartphones erstellen."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Zugehöriges Gerät</string>
+ <string name="add_device_title">Zugehöriges Gerät hinzufügen</string>
+ <string name="add_associated_device_title">Begleitgerät verbinden</string>
+ <string name="add_associated_device_instruction">Du kannst dein Smartphone als Begleitgerät verwenden und darauf die Fahreinstellungen konfigurieren</string>
+ <string name="associated_device_install_app">Die <b>Companion App</b> muss auf dem Smartphone installiert sein</string>
+ <string name="associated_device_pairing_code_title">Code auf Smartphone bestätigen</string>
+ <string name="associated_device_pairing_message">Bestätige, dass dieser Code dem Code auf deinem Smartphone entspricht</string>
+ <string name="associated_device_success">Das Gerät wurde zugeordnet</string>
+ <string name="associated_device_select_device">Die App öffnen und mit &lt;b&gt;%1$s&lt;/b&gt; verbinden</string>
+ <string name="associated_device_open_app">Öffne die App und folge der Anleitung</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; entkoppeln?</string>
+ <string name="remove_associated_device_message">Dieses Auto wird nicht mehr mit diesem Gerät gekoppelt. Es muss zusätzlich noch aus der Companion App entfernt werden.</string>
+ <string name="device_removed_success_toast_text">„%1$s“ ist nicht mehr gekoppelt</string>
+ <string name="device_removed_failure_toast_text">„%1$s“ konnte nicht entkoppelt werden</string>
+ <string name="continue_setup_toast_text">Fahre mit der Einrichtung auf dem Smartphone fort</string>
+ <string name="error_screen_title">Fehler</string>
+ <string name="error_screen_message">Dieses Display konnte nicht richtig angezeigt werden. Versuch es noch einmal.</string>
+ <string name="turn_on_bluetooth_title">Bluetooth aktivieren</string>
+ <string name="turn_on_bluetooth_message">Damit du dein Smartphone als Begleitgerät einrichten kannst, muss die Bluetooth-Funktion deines Autos aktiviert sein.</string>
+ <string name="turn_on_bluetooth_dialog_title">Bluetooth aktivieren?</string>
+ <string name="turn_on_bluetooth_dialog_message">Damit eine Verbindung zum Begleitgerät hergestellt werden kann, muss die Bluetooth-Funktion deines Autos aktiviert sein.</string>
+ <string name="accept">Annehmen</string>
+ <string name="reject">Ablehnen</string>
+ <string name="confirm">Bestätigen</string>
+ <string name="cancel">Abbrechen</string>
+ <string name="remove">Entfernen</string>
+ <string name="ok">OK</string>
+ <string name="connection">Verbindung</string>
+ <string name="forget_title">Gerät entkoppeln</string>
+ <string name="forget">Entkoppeln</string>
+ <string name="disable">Deaktivieren</string>
+ <string name="enable">Aktivieren</string>
+ <string name="continue_button">Weiter</string>
+ <string name="retry">Wiederholen</string>
+ <string name="turn_on">Aktivieren</string>
+ <string name="not_now">Später</string>
+ <string name="connected">Verbunden</string>
+ <string name="notDetected">Nicht gefunden</string>
+ <string name="disconnected">Nicht verbunden</string>
+ <string name="unknown">Unbekannt</string>
+ <string name="app_running_msg_channel_name">SMS-Dienst auf Smartphone läuft</string>
+ <string name="app_running_msg_notification_title">SMS-Dienst auf Smartphone ist aktiv</string>
+ <string name="app_running_msg_notification_content">SMS werden über Begleitgerät empfangen</string>
+ <string name="trusted_device_feature_title">Profil mit Smartphone entsperren</string>
+ <string name="trusted_device_feature_instruction">Konfiguriere die Optionen zum Entsperren über die Companion App</string>
+ <string name="trusted_device_item_title">Entsperren meines Profils über &lt;b&gt;%1$s&lt;/b&gt; zulassen</string>
+ <string name="device_not_connected_dialog_title">Dein Smartphone muss verbunden sein</string>
+ <string name="device_not_connected_dialog_message">Damit du diese Funktion aktivieren kannst, muss Bluetooth im Auto und auf deinem Smartphone eingeschaltet und das Smartphone in der Nähe des Autos sein</string>
+ <string name="trusted_device_enrollment_success_message">Du kannst dein Profil jetzt mit &lt;b&gt;%1$s&lt;/b&gt; entsperren</string>
+ <string name="create_profile_lock_dialog_title">Primäre Sperre für Profil erstellen</string>
+ <string name="create_profile_lock_dialog_message">Damit du dein Smartphone zum Entsperren deines Profils verwenden kannst, benötigst du für dein Profil eine primäre Sperre als Ersatz</string>
+ <string name="unlock_profile_to_finish_title">Profil zum Abschluss entsperren</string>
+ <string name="unlock_profile_to_finish_message">Du hast eine neue Profilsperre eingerichtet. Gib sie noch einmal ein, um zu bestätigen, dass dein Smartphone dein Profil automatisch entsperren darf</string>
+ <string name="disable_device_connection_text">Gerät trennen</string>
+ <string name="enable_device_connection_text">Gerät wieder verbinden</string>
+ <string name="trusted_device_notification_channel_name">Mit Smartphone entsperren</string>
+ <string name="trusted_device_notification_title">Profil mit dem Smartphone entsperren</string>
+ <string name="trusted_device_notification_content">Tippe hier, um diese Funktion zuzulassen</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Fehler</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Diese Funktion kann momentan nicht aktiviert werden. Versuch es noch einmal.</string>
+ <string name="create_phone_lock_dialog_title">Displaysperre auf dem Smartphone einrichten</string>
+ <string name="create_phone_lock_dialog_message">Auf deinem Smartphone ist noch keine Displaysperre eingerichtet. Damit du dein Autoprofil mit dem Smartphone entsperren kannst, musst du zuerst eine Displaysperre (auch Sicherheitscode genannt) in den Einstellungen des Smartphones erstellen.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Neue Nachricht</item>
+ <item quantity="other">%d neue Nachrichten</item>
+ </plurals>
+ <string name="name_not_available">Name nicht verfügbar</string>
</resources>
diff --git a/companiondevice/res/values-el/strings.xml b/companiondevice/res/values-el/strings.xml
index 60f1465..3379917 100644
--- a/companiondevice/res/values-el/strings.xml
+++ b/companiondevice/res/values-el/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Συσχετισμένη συσκευή"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Προσθήκη συσχετισμένης συσκευής"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Σύνδεση συνοδευτικής συσκευής"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Μπορείτε να χρησιμοποιήσετε το τηλέφωνό σας ως συνοδευτική συσκευή στην εμπειρία οδήγησής σας."</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Βεβαιωθείτε ότι η "<b>"Συνοδ. εφαρμ."</b>" είναι εγκατεστ. στο τηλέφ."</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Επιβεβαίωση κωδικού στο τηλέφωνο"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Βεβαιωθείτε ότι συμφωνεί με τον κωδικό που εμφανίζεται στο τηλέφωνό σας."</string>
- <string name="associated_device_success" msgid="584760065696870256">"Η συσκευή συσχετίστηκε με επιτυχία."</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Ανοίξτε την εφ. και συνδ. στο &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Άνοιγμα εφαρμογής και εφαρμογή οδηγιών"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Διαγραφή του &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;;"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Δεν θα γίνεται πλέον σύζευξη του αυτοκινήτου με αυτήν τη συσκευή. Επίσης, θα χρειαστεί να καταργήσετε αυτό το αυτοκίνητο από τη συνοδευτική εφαρμογή."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Το <xliff:g id="PHONE_NAME">%1$s</xliff:g> διαγράφηκε."</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Αποτυχία διαγραφής <xliff:g id="PHONE_NAME">%1$s</xliff:g>."</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Συνέχεια ρύθμισης στο τηλέφωνό σας"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Παρουσιάστηκε κάποιο πρόβλημα"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Δυστυχώς, αυτή η οθόνη δεν μπόρεσε να εμφανιστεί σωστά. Δοκιμάστε ξανά."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Ενεργοποίηση Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Για να ορίσετε το τηλέφωνό σας ως συνοδευτική συσκευή, το αυτοκίνητό σας πρέπει να διαθέτει Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Ενεργοποίηση Bluetooth;"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Για να συνδεθείτε στη συνοδευτική συσκευή, το αυτοκίνητό σας πρέπει να διαθέτει Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Αποδοχή"</string>
- <string name="reject" msgid="4315432282758892890">"Απόρριψη"</string>
- <string name="confirm" msgid="3748997214719276945">"Επιβεβαίωση"</string>
- <string name="cancel" msgid="4306609731174629323">"Ακύρωση"</string>
- <string name="remove" msgid="5513398257088729188">"Κατάργηση"</string>
- <string name="ok" msgid="2825038997730899083">"ΟΚ"</string>
- <string name="connection" msgid="2798490936433656846">"Σύνδεση"</string>
- <string name="forget_title" msgid="3027608547243824729">"Διαγραφή αυτής της συσκευής"</string>
- <string name="forget" msgid="2069897665699141222">"Διαγραφή"</string>
- <string name="disable" msgid="4619854429066283970">"Απενεργοποίηση"</string>
- <string name="enable" msgid="7656386199154111316">"Ενεργοποίηση"</string>
- <string name="continue_button" msgid="2748318968566159950">"Συνέχεια"</string>
- <string name="retry" msgid="3783419451480721367">"Δοκιμάστε ξανά"</string>
- <string name="turn_on" msgid="4288754850470994812">"Ενεργοποίηση"</string>
- <string name="not_now" msgid="8764692269093707622">"Όχι τώρα"</string>
- <string name="connected" msgid="8051190714042020471">"Συνδέθηκε"</string>
- <string name="notDetected" msgid="4115229772085594506">"Δεν εντοπίστηκε"</string>
- <string name="disconnected" msgid="8526513868622591894">"Αποσυνδεδεμένο"</string>
- <string name="unknown" msgid="555736316465118024">"Άγνωστο"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Εκτελείται η υπηρεσία μηνυμάτων κειμένου τηλεφώνου"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Η υπηρ. μηνυμάτων κειμένου τηλεφώνου είναι ενεργή."</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Λήψη μηνυμάτων κειμένου μέσω συνοδευτικής συσκευής"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Ξεκλείδωμα προφίλ με τηλέφωνο"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Ελέγξτε τη συνοδευτική εφαρμογή για να ορίσετε τις ρυθμίσεις ξεκλειδώματος."</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Να επιτρέπεται στο &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; να ξεκλειδώνει το προφίλ μου"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Το τηλέφωνό σας πρέπει να είναι ενεργά συνδεδεμένο"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Για να ενεργοπ. αυτήν τη λειτουργία, βεβαιωθείτε ότι το Bluetooth είναι ενεργό στο αυτοκ. και στο τηλέφωνό σας και ότι βρίσκονται κοντά μεταξύ τους."</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"Το &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; μπορεί πλέον να ξεκλειδώσει το προφίλ σας"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Δημιουργία κύριου κλειδώματος προφίλ"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Για να χρησιμοποιήσετε το τηλέφωνό σας ώστε να ξεκλειδώσετε το προφίλ σας, χρειάζεστε ένα κύριο κλείδωμα προφίλ ως αντίγραφο ασφαλείας."</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Ξεκλειδώστε το προφίλ για ολοκλ. της διαδικασίας"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Δημιουργήσατε ένα νέο κλείδωμα προφίλ. Στη συνέχεια, εισαγάγετέ το ξανά για να επιβεβαιώσετε ότι το τηλέφ. μπορεί ξεκλειδώνει αυτόματα το προφίλ σας."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Αποσυνδέστε αυτήν τη συσκευή."</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Συνδέστε ξανά αυτήν τη συσκευή."</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Ξεκλείδωμα με τηλέφωνο"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Να επιτρέπεται στο τηλέφωνό σας να ξεκλειδώνει το προφίλ σας"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Πατήστε εδώ για να εξουσιοδοτήσετε αυτήν τη λειτουργία."</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Παρουσιάστηκε κάποιο πρόβλημα"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Δυστυχώς, δεν είναι δυνατή η ενεργοποίηση αυτής της λειτουργίας προς το παρόν. Δοκιμάστε ξανά."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Δημιουργία κλειδώματος οθόνης στο τηλέφωνό σας"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Δεν έχει οριστεί κλείδωμα οθόνης στο τηλέφωνό σας. Για να ξεκλειδώσετε το προφίλ αυτοκινήτου με το τηλέφωνό σας, δημιουργήστε πρώτα ένα κλείδωμα οθόνης (γνωστό και ως κωδικός πρόσβασης) στις ρυθμίσεις του τηλεφώνου σας."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Συσχετισμένη συσκευή</string>
+ <string name="add_device_title">Προσθήκη συσχετισμένης συσκευής</string>
+ <string name="add_associated_device_title">Σύνδεση συνοδευτικής συσκευής</string>
+ <string name="add_associated_device_instruction">Μπορείτε να χρησιμοποιήσετε το τηλέφωνό σας ως συνοδευτική συσκευή στην εμπειρία οδήγησής σας.</string>
+ <string name="associated_device_install_app">Βεβαιωθείτε ότι εγκαταστάθηκε η <b>Συνοδευτική εφαρμογή</b>.</string>
+ <string name="associated_device_pairing_code_title">Επιβεβαίωση κωδικού στο τηλέφωνο</string>
+ <string name="associated_device_pairing_message">Βεβαιωθείτε ότι συμφωνεί με τον κωδικό που εμφανίζεται στο τηλέφωνό σας.</string>
+ <string name="associated_device_success">Η συσκευή συσχετίστηκε με επιτυχία.</string>
+ <string name="associated_device_select_device">Ανοίξτε την εφαρμογή και συνδεθείτε στο &lt;b&gt;%1$s&lt;/b&gt;.</string>
+ <string name="associated_device_open_app">Άνοιγμα εφαρμογής και εφαρμογή οδηγιών</string>
+ <string name="remove_associated_device_title">Κατάργηση απομνημόνευσης &lt;b&gt;%1$s&lt;/b&gt;;</string>
+ <string name="remove_associated_device_message">Δεν θα γίνεται πλέον σύζευξη του αυτοκινήτου με αυτήν τη συσκευή. Επίσης, θα χρειαστεί να καταργήσετε αυτό το αυτοκίνητο από τη συνοδευτική εφαρμογή.</string>
+ <string name="device_removed_success_toast_text">Το %1$s διαγράφηκε.</string>
+ <string name="device_removed_failure_toast_text">Αποτυχία κατάργησης απομνημόνευσης %1$s.</string>
+ <string name="continue_setup_toast_text">Συνέχεια ρύθμισης στο τηλέφωνό σας</string>
+ <string name="error_screen_title">Παρουσιάστηκε κάποιο πρόβλημα</string>
+ <string name="error_screen_message">Δυστυχώς, αυτή η οθόνη δεν μπόρεσε να εμφανιστεί σωστά. Δοκιμάστε ξανά.</string>
+ <string name="turn_on_bluetooth_title">Ενεργοποίηση Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Για να ορίσετε το τηλέφωνό σας ως συνοδευτική συσκευή, το αυτοκίνητό σας πρέπει να διαθέτει Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Ενεργοποίηση Bluetooth;</string>
+ <string name="turn_on_bluetooth_dialog_message">Για να συνδεθείτε στη συνοδευτική συσκευή, το αυτοκίνητό σας πρέπει να διαθέτει Bluetooth.</string>
+ <string name="accept">Αποδοχή</string>
+ <string name="reject">Απόρριψη</string>
+ <string name="confirm">Επιβεβαίωση</string>
+ <string name="cancel">Ακύρωση</string>
+ <string name="remove">Κατάργηση</string>
+ <string name="ok">ΟΚ</string>
+ <string name="connection">Σύνδεση</string>
+ <string name="forget_title">Διαγραφή αυτής της συσκευής</string>
+ <string name="forget">Κατάργηση απομνημ.</string>
+ <string name="disable">Απενεργοποίηση</string>
+ <string name="enable">Ενεργοποίηση</string>
+ <string name="continue_button">Συνέχεια</string>
+ <string name="retry">Επανάληψη</string>
+ <string name="turn_on">Ενεργοποίηση</string>
+ <string name="not_now">Όχι τώρα</string>
+ <string name="connected">Συνδέθηκε</string>
+ <string name="notDetected">Δεν εντοπίστηκε</string>
+ <string name="disconnected">Αποσυνδέθηκε</string>
+ <string name="unknown">Άγνωστη</string>
+ <string name="app_running_msg_channel_name">Εκτελείται η υπηρεσία μηνυμάτων κειμένου τηλεφώνου</string>
+ <string name="app_running_msg_notification_title">Η υπηρ. μηνυμάτων κειμένου τηλεφώνου είναι ενεργή.</string>
+ <string name="app_running_msg_notification_content">Λήψη μηνυμάτων κειμένου μέσω συνοδευτικής συσκευής</string>
+ <string name="trusted_device_feature_title">Ξεκλείδωμα προφίλ με τηλέφωνο</string>
+ <string name="trusted_device_feature_instruction">Ελέγξτε τη συνοδευτική εφαρμογή για να ορίσετε τις ρυθμίσεις ξεκλειδώματος.</string>
+ <string name="trusted_device_item_title">Να επιτρέπεται στο τηλέφωνο &lt;b&gt;%1$s&lt;/b&gt; να ξεκλειδώνει το προφίλ μου</string>
+ <string name="device_not_connected_dialog_title">Το τηλέφωνό σας πρέπει να είναι ενεργά συνδεδεμένο</string>
+ <string name="device_not_connected_dialog_message">Για την ενεργοποίηση της λειτουργίας, βεβαιωθείτε ότι το Bluetooth είναι ενεργό σε αυτοκίνητο και τηλέφωνο και ότι βρίσκονται κοντά μεταξύ τους.</string>
+ <string name="trusted_device_enrollment_success_message">Το τηλέφωνο &lt;b&gt;%1$s&lt;/b&gt; μπορεί πλέον να ξεκλειδώνει το προφίλ σας</string>
+ <string name="create_profile_lock_dialog_title">Δημιουργία κύριου κλειδώματος προφίλ</string>
+ <string name="create_profile_lock_dialog_message">Για να χρησιμοποιήσετε το τηλέφωνό σας ώστε να ξεκλειδώσετε το προφίλ σας, χρειάζεστε ένα κύριο κλείδωμα προφίλ ως αντίγραφο ασφαλείας.</string>
+ <string name="unlock_profile_to_finish_title">Ξεκλειδώστε το προφίλ για ολοκλ. της διαδικασίας</string>
+ <string name="unlock_profile_to_finish_message">Δημιουργήσατε ένα νέο κλείδωμα προφίλ. Έπειτα, εισαγάγετέ το ξανά για να επιβεβαιώσετε ότι το τηλέφωνο μπορεί ξεκλειδώνει αυτόματα το προφίλ σας.</string>
+ <string name="disable_device_connection_text">Αποσυνδέστε αυτήν τη συσκευή.</string>
+ <string name="enable_device_connection_text">Συνδέστε ξανά αυτήν τη συσκευή.</string>
+ <string name="trusted_device_notification_channel_name">Ξεκλείδωμα με τηλέφωνο</string>
+ <string name="trusted_device_notification_title">Να επιτρέπεται στο τηλέφωνό σας να ξεκλειδώνει το προφίλ σας</string>
+ <string name="trusted_device_notification_content">Πατήστε εδώ για να εξουσιοδοτήσετε αυτήν τη λειτουργία.</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Παρουσιάστηκε κάποιο πρόβλημα</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Δυστυχώς, δεν είναι δυνατή η ενεργοποίηση αυτής της λειτουργίας προς το παρόν. Δοκιμάστε ξανά.</string>
+ <string name="create_phone_lock_dialog_title">Δημιουργία κλειδώματος οθόνης στο τηλέφωνό σας</string>
+ <string name="create_phone_lock_dialog_message">Δεν έχει οριστεί κλείδωμα οθόνης στο τηλέφωνό σας. Για να ξεκλειδώσετε το προφίλ αυτοκινήτου με το τηλέφωνό σας, δημιουργήστε πρώτα ένα κλείδωμα οθόνης (γνωστό και ως κωδικός πρόσβασης) στις ρυθμίσεις του τηλεφώνου σας.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Νέο μήνυμα</item>
+ <item quantity="other">%d νέα μηνύματα</item>
+ </plurals>
+ <string name="name_not_available">Το όνομα δεν είναι διαθέσιμο.</string>
</resources>
diff --git a/companiondevice/res/values-en-rAU/strings.xml b/companiondevice/res/values-en-rAU/strings.xml
index 8d55f89..cca71eb 100644
--- a/companiondevice/res/values-en-rAU/strings.xml
+++ b/companiondevice/res/values-en-rAU/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Associated device"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Add associated device"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Connect a companion device"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"You can use your phone as a companion device to help manage your driving experience"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Make sure that you have "<b>"Companion app"</b>" installed on phone"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Confirm code on phone"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Confirm that this matches the code shown on your phone"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Device has been associated successfully"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Open app &amp; connect to &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Open app and follow instructions in app"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Forget &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"This car will no longer be paired with this device. You will additionally need to remove this car from the Companion app."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> forgotten"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Failed to forget <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Continue setup on your phone"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Something went wrong"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Unfortunately, this screen couldn\'t display properly. Please try again."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Turn on Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"To set up your phone as a companion device, your car needs Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Turn on Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"To connect to your companion device, your car needs Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Accept"</string>
- <string name="reject" msgid="4315432282758892890">"Reject"</string>
- <string name="confirm" msgid="3748997214719276945">"Confirm"</string>
- <string name="cancel" msgid="4306609731174629323">"Cancel"</string>
- <string name="remove" msgid="5513398257088729188">"Remove"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Connection"</string>
- <string name="forget_title" msgid="3027608547243824729">"Forget this device"</string>
- <string name="forget" msgid="2069897665699141222">"Forget"</string>
- <string name="disable" msgid="4619854429066283970">"Disable"</string>
- <string name="enable" msgid="7656386199154111316">"Enable"</string>
- <string name="continue_button" msgid="2748318968566159950">"Continue"</string>
- <string name="retry" msgid="3783419451480721367">"Try again"</string>
- <string name="turn_on" msgid="4288754850470994812">"Turn on"</string>
- <string name="not_now" msgid="8764692269093707622">"Not now"</string>
- <string name="connected" msgid="8051190714042020471">"Connected"</string>
- <string name="notDetected" msgid="4115229772085594506">"Not detected"</string>
- <string name="disconnected" msgid="8526513868622591894">"Disconnected"</string>
- <string name="unknown" msgid="555736316465118024">"Unknown"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Phone text message service running"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Phone text messaging service is active"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Receiving text messages via companion device"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Unlock profile with phone"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Check your Companion app to set unlocking options"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Let &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; unlock my profile"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Your phone must be actively connected"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"To turn on this feature, make sure that your car and phone have Bluetooth turned on and are near each other"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; can now unlock your profile"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Create a primary profile lock"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"To use your phone to unlock your profile, you need a primary profile lock as a backup"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Unlock your profile to finish"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"You\'ve created a new profile lock. Next, enter it again to confirm that your phone can unlock your profile automatically"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Disconnect this device"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Reconnect this device"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Unlock with phone"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Let your phone unlock your profile"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Tap here to authorise this feature"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Something went wrong"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Unfortunately, this feature could not be turned on at this time. Please try again."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Create a screen lock on your phone"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Your phone doesn\'t have a screen lock set. To unlock your car profile with your phone, first create a screen lock (also known as passcode) in your phones settings."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Associated device</string>
+ <string name="add_device_title">Add associated device</string>
+ <string name="add_associated_device_title">Connect a companion device</string>
+ <string name="add_associated_device_instruction">You can use your phone as a companion device to help manage your driving experience</string>
+ <string name="associated_device_install_app">Make sure you have <b>Companion app</b> installed on your phone</string>
+ <string name="associated_device_pairing_code_title">Confirm code on phone</string>
+ <string name="associated_device_pairing_message">Confirm that this matches the code shown on your phone</string>
+ <string name="associated_device_success">Device has been associated successfully</string>
+ <string name="associated_device_select_device">Open the app and connect to &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Open app and follow instructions in app</string>
+ <string name="remove_associated_device_title">Forget &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">This car will no longer be paired with this device. You will additionally need to remove this car from the Companion app.</string>
+ <string name="device_removed_success_toast_text">%1$s forgotten</string>
+ <string name="device_removed_failure_toast_text">Failed to forget %1$s</string>
+ <string name="continue_setup_toast_text">Continue setup on your phone</string>
+ <string name="error_screen_title">Something went wrong</string>
+ <string name="error_screen_message">Unfortunately, this screen couldn\'t display properly. Please try again.</string>
+ <string name="turn_on_bluetooth_title">Turn on Bluetooth</string>
+ <string name="turn_on_bluetooth_message">To set up your phone as a companion device, your car needs Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Turn on Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">To connect to your companion device, your car needs Bluetooth.</string>
+ <string name="accept">Accept</string>
+ <string name="reject">Reject</string>
+ <string name="confirm">Confirm</string>
+ <string name="cancel">Cancel</string>
+ <string name="remove">Remove</string>
+ <string name="ok">OK</string>
+ <string name="connection">Connection</string>
+ <string name="forget_title">Forget this device</string>
+ <string name="forget">Forget</string>
+ <string name="disable">Disable</string>
+ <string name="enable">Enable</string>
+ <string name="continue_button">Continue</string>
+ <string name="retry">Try again</string>
+ <string name="turn_on">Turn on</string>
+ <string name="not_now">Not now</string>
+ <string name="connected">Connected</string>
+ <string name="notDetected">Not detected</string>
+ <string name="disconnected">Disconnected</string>
+ <string name="unknown">Unknown</string>
+ <string name="app_running_msg_channel_name">Phone text message service running</string>
+ <string name="app_running_msg_notification_title">Phone text messaging service is active</string>
+ <string name="app_running_msg_notification_content">Receiving text messages via companion device</string>
+ <string name="trusted_device_feature_title">Unlock profile with phone</string>
+ <string name="trusted_device_feature_instruction">Check your Companion app to set unlocking options</string>
+ <string name="trusted_device_item_title">Let &lt;b&gt;%1$s&lt;/b&gt; unlock my profile</string>
+ <string name="device_not_connected_dialog_title">Your phone must be actively connected</string>
+ <string name="device_not_connected_dialog_message">To turn on this feature, make sure that your car and phone have Bluetooth turned on and are near each other</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; can now unlock your profile</string>
+ <string name="create_profile_lock_dialog_title">Create a primary profile lock</string>
+ <string name="create_profile_lock_dialog_message">To use your phone to unlock your profile, you need a primary profile lock as a backup</string>
+ <string name="unlock_profile_to_finish_title">Unlock your profile to finish</string>
+ <string name="unlock_profile_to_finish_message">You\'ve created a new profile lock. Next, enter it again to confirm that your phone can unlock your profile automatically</string>
+ <string name="disable_device_connection_text">Disconnect this device</string>
+ <string name="enable_device_connection_text">Reconnect this device</string>
+ <string name="trusted_device_notification_channel_name">Unlock with phone</string>
+ <string name="trusted_device_notification_title">Let your phone unlock your profile</string>
+ <string name="trusted_device_notification_content">Tap here to authorise this feature</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Something went wrong</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Unfortunately, this feature could not be turned on at this time. Please try again.</string>
+ <string name="create_phone_lock_dialog_title">Create a screen lock on your phone</string>
+ <string name="create_phone_lock_dialog_message">Your phone doesn\'t have a screen lock set. To unlock your car profile with your phone, first create a screen lock (also known as a passcode) in your phone\'s settings.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">New message</item>
+ <item quantity="other">%d new messages</item>
+ </plurals>
+ <string name="name_not_available">Name not available</string>
</resources>
diff --git a/companiondevice/res/values-en-rCA/strings.xml b/companiondevice/res/values-en-rCA/strings.xml
index 8d55f89..cca71eb 100644
--- a/companiondevice/res/values-en-rCA/strings.xml
+++ b/companiondevice/res/values-en-rCA/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Associated device"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Add associated device"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Connect a companion device"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"You can use your phone as a companion device to help manage your driving experience"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Make sure that you have "<b>"Companion app"</b>" installed on phone"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Confirm code on phone"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Confirm that this matches the code shown on your phone"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Device has been associated successfully"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Open app &amp; connect to &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Open app and follow instructions in app"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Forget &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"This car will no longer be paired with this device. You will additionally need to remove this car from the Companion app."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> forgotten"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Failed to forget <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Continue setup on your phone"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Something went wrong"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Unfortunately, this screen couldn\'t display properly. Please try again."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Turn on Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"To set up your phone as a companion device, your car needs Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Turn on Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"To connect to your companion device, your car needs Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Accept"</string>
- <string name="reject" msgid="4315432282758892890">"Reject"</string>
- <string name="confirm" msgid="3748997214719276945">"Confirm"</string>
- <string name="cancel" msgid="4306609731174629323">"Cancel"</string>
- <string name="remove" msgid="5513398257088729188">"Remove"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Connection"</string>
- <string name="forget_title" msgid="3027608547243824729">"Forget this device"</string>
- <string name="forget" msgid="2069897665699141222">"Forget"</string>
- <string name="disable" msgid="4619854429066283970">"Disable"</string>
- <string name="enable" msgid="7656386199154111316">"Enable"</string>
- <string name="continue_button" msgid="2748318968566159950">"Continue"</string>
- <string name="retry" msgid="3783419451480721367">"Try again"</string>
- <string name="turn_on" msgid="4288754850470994812">"Turn on"</string>
- <string name="not_now" msgid="8764692269093707622">"Not now"</string>
- <string name="connected" msgid="8051190714042020471">"Connected"</string>
- <string name="notDetected" msgid="4115229772085594506">"Not detected"</string>
- <string name="disconnected" msgid="8526513868622591894">"Disconnected"</string>
- <string name="unknown" msgid="555736316465118024">"Unknown"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Phone text message service running"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Phone text messaging service is active"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Receiving text messages via companion device"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Unlock profile with phone"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Check your Companion app to set unlocking options"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Let &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; unlock my profile"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Your phone must be actively connected"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"To turn on this feature, make sure that your car and phone have Bluetooth turned on and are near each other"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; can now unlock your profile"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Create a primary profile lock"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"To use your phone to unlock your profile, you need a primary profile lock as a backup"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Unlock your profile to finish"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"You\'ve created a new profile lock. Next, enter it again to confirm that your phone can unlock your profile automatically"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Disconnect this device"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Reconnect this device"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Unlock with phone"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Let your phone unlock your profile"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Tap here to authorise this feature"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Something went wrong"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Unfortunately, this feature could not be turned on at this time. Please try again."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Create a screen lock on your phone"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Your phone doesn\'t have a screen lock set. To unlock your car profile with your phone, first create a screen lock (also known as passcode) in your phones settings."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Associated device</string>
+ <string name="add_device_title">Add associated device</string>
+ <string name="add_associated_device_title">Connect a companion device</string>
+ <string name="add_associated_device_instruction">You can use your phone as a companion device to help manage your driving experience</string>
+ <string name="associated_device_install_app">Make sure you have <b>Companion app</b> installed on your phone</string>
+ <string name="associated_device_pairing_code_title">Confirm code on phone</string>
+ <string name="associated_device_pairing_message">Confirm that this matches the code shown on your phone</string>
+ <string name="associated_device_success">Device has been associated successfully</string>
+ <string name="associated_device_select_device">Open the app and connect to &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Open app and follow instructions in app</string>
+ <string name="remove_associated_device_title">Forget &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">This car will no longer be paired with this device. You will additionally need to remove this car from the Companion app.</string>
+ <string name="device_removed_success_toast_text">%1$s forgotten</string>
+ <string name="device_removed_failure_toast_text">Failed to forget %1$s</string>
+ <string name="continue_setup_toast_text">Continue setup on your phone</string>
+ <string name="error_screen_title">Something went wrong</string>
+ <string name="error_screen_message">Unfortunately, this screen couldn\'t display properly. Please try again.</string>
+ <string name="turn_on_bluetooth_title">Turn on Bluetooth</string>
+ <string name="turn_on_bluetooth_message">To set up your phone as a companion device, your car needs Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Turn on Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">To connect to your companion device, your car needs Bluetooth.</string>
+ <string name="accept">Accept</string>
+ <string name="reject">Reject</string>
+ <string name="confirm">Confirm</string>
+ <string name="cancel">Cancel</string>
+ <string name="remove">Remove</string>
+ <string name="ok">OK</string>
+ <string name="connection">Connection</string>
+ <string name="forget_title">Forget this device</string>
+ <string name="forget">Forget</string>
+ <string name="disable">Disable</string>
+ <string name="enable">Enable</string>
+ <string name="continue_button">Continue</string>
+ <string name="retry">Try again</string>
+ <string name="turn_on">Turn on</string>
+ <string name="not_now">Not now</string>
+ <string name="connected">Connected</string>
+ <string name="notDetected">Not detected</string>
+ <string name="disconnected">Disconnected</string>
+ <string name="unknown">Unknown</string>
+ <string name="app_running_msg_channel_name">Phone text message service running</string>
+ <string name="app_running_msg_notification_title">Phone text messaging service is active</string>
+ <string name="app_running_msg_notification_content">Receiving text messages via companion device</string>
+ <string name="trusted_device_feature_title">Unlock profile with phone</string>
+ <string name="trusted_device_feature_instruction">Check your Companion app to set unlocking options</string>
+ <string name="trusted_device_item_title">Let &lt;b&gt;%1$s&lt;/b&gt; unlock my profile</string>
+ <string name="device_not_connected_dialog_title">Your phone must be actively connected</string>
+ <string name="device_not_connected_dialog_message">To turn on this feature, make sure that your car and phone have Bluetooth turned on and are near each other</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; can now unlock your profile</string>
+ <string name="create_profile_lock_dialog_title">Create a primary profile lock</string>
+ <string name="create_profile_lock_dialog_message">To use your phone to unlock your profile, you need a primary profile lock as a backup</string>
+ <string name="unlock_profile_to_finish_title">Unlock your profile to finish</string>
+ <string name="unlock_profile_to_finish_message">You\'ve created a new profile lock. Next, enter it again to confirm that your phone can unlock your profile automatically</string>
+ <string name="disable_device_connection_text">Disconnect this device</string>
+ <string name="enable_device_connection_text">Reconnect this device</string>
+ <string name="trusted_device_notification_channel_name">Unlock with phone</string>
+ <string name="trusted_device_notification_title">Let your phone unlock your profile</string>
+ <string name="trusted_device_notification_content">Tap here to authorise this feature</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Something went wrong</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Unfortunately, this feature could not be turned on at this time. Please try again.</string>
+ <string name="create_phone_lock_dialog_title">Create a screen lock on your phone</string>
+ <string name="create_phone_lock_dialog_message">Your phone doesn\'t have a screen lock set. To unlock your car profile with your phone, first create a screen lock (also known as a passcode) in your phone\'s settings.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">New message</item>
+ <item quantity="other">%d new messages</item>
+ </plurals>
+ <string name="name_not_available">Name not available</string>
</resources>
diff --git a/companiondevice/res/values-en-rGB/strings.xml b/companiondevice/res/values-en-rGB/strings.xml
index 8d55f89..cca71eb 100644
--- a/companiondevice/res/values-en-rGB/strings.xml
+++ b/companiondevice/res/values-en-rGB/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Associated device"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Add associated device"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Connect a companion device"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"You can use your phone as a companion device to help manage your driving experience"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Make sure that you have "<b>"Companion app"</b>" installed on phone"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Confirm code on phone"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Confirm that this matches the code shown on your phone"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Device has been associated successfully"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Open app &amp; connect to &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Open app and follow instructions in app"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Forget &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"This car will no longer be paired with this device. You will additionally need to remove this car from the Companion app."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> forgotten"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Failed to forget <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Continue setup on your phone"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Something went wrong"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Unfortunately, this screen couldn\'t display properly. Please try again."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Turn on Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"To set up your phone as a companion device, your car needs Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Turn on Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"To connect to your companion device, your car needs Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Accept"</string>
- <string name="reject" msgid="4315432282758892890">"Reject"</string>
- <string name="confirm" msgid="3748997214719276945">"Confirm"</string>
- <string name="cancel" msgid="4306609731174629323">"Cancel"</string>
- <string name="remove" msgid="5513398257088729188">"Remove"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Connection"</string>
- <string name="forget_title" msgid="3027608547243824729">"Forget this device"</string>
- <string name="forget" msgid="2069897665699141222">"Forget"</string>
- <string name="disable" msgid="4619854429066283970">"Disable"</string>
- <string name="enable" msgid="7656386199154111316">"Enable"</string>
- <string name="continue_button" msgid="2748318968566159950">"Continue"</string>
- <string name="retry" msgid="3783419451480721367">"Try again"</string>
- <string name="turn_on" msgid="4288754850470994812">"Turn on"</string>
- <string name="not_now" msgid="8764692269093707622">"Not now"</string>
- <string name="connected" msgid="8051190714042020471">"Connected"</string>
- <string name="notDetected" msgid="4115229772085594506">"Not detected"</string>
- <string name="disconnected" msgid="8526513868622591894">"Disconnected"</string>
- <string name="unknown" msgid="555736316465118024">"Unknown"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Phone text message service running"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Phone text messaging service is active"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Receiving text messages via companion device"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Unlock profile with phone"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Check your Companion app to set unlocking options"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Let &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; unlock my profile"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Your phone must be actively connected"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"To turn on this feature, make sure that your car and phone have Bluetooth turned on and are near each other"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; can now unlock your profile"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Create a primary profile lock"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"To use your phone to unlock your profile, you need a primary profile lock as a backup"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Unlock your profile to finish"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"You\'ve created a new profile lock. Next, enter it again to confirm that your phone can unlock your profile automatically"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Disconnect this device"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Reconnect this device"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Unlock with phone"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Let your phone unlock your profile"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Tap here to authorise this feature"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Something went wrong"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Unfortunately, this feature could not be turned on at this time. Please try again."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Create a screen lock on your phone"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Your phone doesn\'t have a screen lock set. To unlock your car profile with your phone, first create a screen lock (also known as passcode) in your phones settings."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Associated device</string>
+ <string name="add_device_title">Add associated device</string>
+ <string name="add_associated_device_title">Connect a companion device</string>
+ <string name="add_associated_device_instruction">You can use your phone as a companion device to help manage your driving experience</string>
+ <string name="associated_device_install_app">Make sure you have <b>Companion app</b> installed on your phone</string>
+ <string name="associated_device_pairing_code_title">Confirm code on phone</string>
+ <string name="associated_device_pairing_message">Confirm that this matches the code shown on your phone</string>
+ <string name="associated_device_success">Device has been associated successfully</string>
+ <string name="associated_device_select_device">Open the app and connect to &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Open app and follow instructions in app</string>
+ <string name="remove_associated_device_title">Forget &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">This car will no longer be paired with this device. You will additionally need to remove this car from the Companion app.</string>
+ <string name="device_removed_success_toast_text">%1$s forgotten</string>
+ <string name="device_removed_failure_toast_text">Failed to forget %1$s</string>
+ <string name="continue_setup_toast_text">Continue setup on your phone</string>
+ <string name="error_screen_title">Something went wrong</string>
+ <string name="error_screen_message">Unfortunately, this screen couldn\'t display properly. Please try again.</string>
+ <string name="turn_on_bluetooth_title">Turn on Bluetooth</string>
+ <string name="turn_on_bluetooth_message">To set up your phone as a companion device, your car needs Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Turn on Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">To connect to your companion device, your car needs Bluetooth.</string>
+ <string name="accept">Accept</string>
+ <string name="reject">Reject</string>
+ <string name="confirm">Confirm</string>
+ <string name="cancel">Cancel</string>
+ <string name="remove">Remove</string>
+ <string name="ok">OK</string>
+ <string name="connection">Connection</string>
+ <string name="forget_title">Forget this device</string>
+ <string name="forget">Forget</string>
+ <string name="disable">Disable</string>
+ <string name="enable">Enable</string>
+ <string name="continue_button">Continue</string>
+ <string name="retry">Try again</string>
+ <string name="turn_on">Turn on</string>
+ <string name="not_now">Not now</string>
+ <string name="connected">Connected</string>
+ <string name="notDetected">Not detected</string>
+ <string name="disconnected">Disconnected</string>
+ <string name="unknown">Unknown</string>
+ <string name="app_running_msg_channel_name">Phone text message service running</string>
+ <string name="app_running_msg_notification_title">Phone text messaging service is active</string>
+ <string name="app_running_msg_notification_content">Receiving text messages via companion device</string>
+ <string name="trusted_device_feature_title">Unlock profile with phone</string>
+ <string name="trusted_device_feature_instruction">Check your Companion app to set unlocking options</string>
+ <string name="trusted_device_item_title">Let &lt;b&gt;%1$s&lt;/b&gt; unlock my profile</string>
+ <string name="device_not_connected_dialog_title">Your phone must be actively connected</string>
+ <string name="device_not_connected_dialog_message">To turn on this feature, make sure that your car and phone have Bluetooth turned on and are near each other</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; can now unlock your profile</string>
+ <string name="create_profile_lock_dialog_title">Create a primary profile lock</string>
+ <string name="create_profile_lock_dialog_message">To use your phone to unlock your profile, you need a primary profile lock as a backup</string>
+ <string name="unlock_profile_to_finish_title">Unlock your profile to finish</string>
+ <string name="unlock_profile_to_finish_message">You\'ve created a new profile lock. Next, enter it again to confirm that your phone can unlock your profile automatically</string>
+ <string name="disable_device_connection_text">Disconnect this device</string>
+ <string name="enable_device_connection_text">Reconnect this device</string>
+ <string name="trusted_device_notification_channel_name">Unlock with phone</string>
+ <string name="trusted_device_notification_title">Let your phone unlock your profile</string>
+ <string name="trusted_device_notification_content">Tap here to authorise this feature</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Something went wrong</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Unfortunately, this feature could not be turned on at this time. Please try again.</string>
+ <string name="create_phone_lock_dialog_title">Create a screen lock on your phone</string>
+ <string name="create_phone_lock_dialog_message">Your phone doesn\'t have a screen lock set. To unlock your car profile with your phone, first create a screen lock (also known as a passcode) in your phone\'s settings.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">New message</item>
+ <item quantity="other">%d new messages</item>
+ </plurals>
+ <string name="name_not_available">Name not available</string>
</resources>
diff --git a/companiondevice/res/values-en-rIN/strings.xml b/companiondevice/res/values-en-rIN/strings.xml
index 8d55f89..cca71eb 100644
--- a/companiondevice/res/values-en-rIN/strings.xml
+++ b/companiondevice/res/values-en-rIN/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Associated device"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Add associated device"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Connect a companion device"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"You can use your phone as a companion device to help manage your driving experience"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Make sure that you have "<b>"Companion app"</b>" installed on phone"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Confirm code on phone"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Confirm that this matches the code shown on your phone"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Device has been associated successfully"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Open app &amp; connect to &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Open app and follow instructions in app"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Forget &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"This car will no longer be paired with this device. You will additionally need to remove this car from the Companion app."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> forgotten"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Failed to forget <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Continue setup on your phone"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Something went wrong"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Unfortunately, this screen couldn\'t display properly. Please try again."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Turn on Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"To set up your phone as a companion device, your car needs Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Turn on Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"To connect to your companion device, your car needs Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Accept"</string>
- <string name="reject" msgid="4315432282758892890">"Reject"</string>
- <string name="confirm" msgid="3748997214719276945">"Confirm"</string>
- <string name="cancel" msgid="4306609731174629323">"Cancel"</string>
- <string name="remove" msgid="5513398257088729188">"Remove"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Connection"</string>
- <string name="forget_title" msgid="3027608547243824729">"Forget this device"</string>
- <string name="forget" msgid="2069897665699141222">"Forget"</string>
- <string name="disable" msgid="4619854429066283970">"Disable"</string>
- <string name="enable" msgid="7656386199154111316">"Enable"</string>
- <string name="continue_button" msgid="2748318968566159950">"Continue"</string>
- <string name="retry" msgid="3783419451480721367">"Try again"</string>
- <string name="turn_on" msgid="4288754850470994812">"Turn on"</string>
- <string name="not_now" msgid="8764692269093707622">"Not now"</string>
- <string name="connected" msgid="8051190714042020471">"Connected"</string>
- <string name="notDetected" msgid="4115229772085594506">"Not detected"</string>
- <string name="disconnected" msgid="8526513868622591894">"Disconnected"</string>
- <string name="unknown" msgid="555736316465118024">"Unknown"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Phone text message service running"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Phone text messaging service is active"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Receiving text messages via companion device"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Unlock profile with phone"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Check your Companion app to set unlocking options"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Let &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; unlock my profile"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Your phone must be actively connected"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"To turn on this feature, make sure that your car and phone have Bluetooth turned on and are near each other"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; can now unlock your profile"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Create a primary profile lock"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"To use your phone to unlock your profile, you need a primary profile lock as a backup"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Unlock your profile to finish"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"You\'ve created a new profile lock. Next, enter it again to confirm that your phone can unlock your profile automatically"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Disconnect this device"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Reconnect this device"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Unlock with phone"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Let your phone unlock your profile"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Tap here to authorise this feature"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Something went wrong"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Unfortunately, this feature could not be turned on at this time. Please try again."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Create a screen lock on your phone"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Your phone doesn\'t have a screen lock set. To unlock your car profile with your phone, first create a screen lock (also known as passcode) in your phones settings."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Associated device</string>
+ <string name="add_device_title">Add associated device</string>
+ <string name="add_associated_device_title">Connect a companion device</string>
+ <string name="add_associated_device_instruction">You can use your phone as a companion device to help manage your driving experience</string>
+ <string name="associated_device_install_app">Make sure you have <b>Companion app</b> installed on your phone</string>
+ <string name="associated_device_pairing_code_title">Confirm code on phone</string>
+ <string name="associated_device_pairing_message">Confirm that this matches the code shown on your phone</string>
+ <string name="associated_device_success">Device has been associated successfully</string>
+ <string name="associated_device_select_device">Open the app and connect to &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Open app and follow instructions in app</string>
+ <string name="remove_associated_device_title">Forget &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">This car will no longer be paired with this device. You will additionally need to remove this car from the Companion app.</string>
+ <string name="device_removed_success_toast_text">%1$s forgotten</string>
+ <string name="device_removed_failure_toast_text">Failed to forget %1$s</string>
+ <string name="continue_setup_toast_text">Continue setup on your phone</string>
+ <string name="error_screen_title">Something went wrong</string>
+ <string name="error_screen_message">Unfortunately, this screen couldn\'t display properly. Please try again.</string>
+ <string name="turn_on_bluetooth_title">Turn on Bluetooth</string>
+ <string name="turn_on_bluetooth_message">To set up your phone as a companion device, your car needs Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Turn on Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">To connect to your companion device, your car needs Bluetooth.</string>
+ <string name="accept">Accept</string>
+ <string name="reject">Reject</string>
+ <string name="confirm">Confirm</string>
+ <string name="cancel">Cancel</string>
+ <string name="remove">Remove</string>
+ <string name="ok">OK</string>
+ <string name="connection">Connection</string>
+ <string name="forget_title">Forget this device</string>
+ <string name="forget">Forget</string>
+ <string name="disable">Disable</string>
+ <string name="enable">Enable</string>
+ <string name="continue_button">Continue</string>
+ <string name="retry">Try again</string>
+ <string name="turn_on">Turn on</string>
+ <string name="not_now">Not now</string>
+ <string name="connected">Connected</string>
+ <string name="notDetected">Not detected</string>
+ <string name="disconnected">Disconnected</string>
+ <string name="unknown">Unknown</string>
+ <string name="app_running_msg_channel_name">Phone text message service running</string>
+ <string name="app_running_msg_notification_title">Phone text messaging service is active</string>
+ <string name="app_running_msg_notification_content">Receiving text messages via companion device</string>
+ <string name="trusted_device_feature_title">Unlock profile with phone</string>
+ <string name="trusted_device_feature_instruction">Check your Companion app to set unlocking options</string>
+ <string name="trusted_device_item_title">Let &lt;b&gt;%1$s&lt;/b&gt; unlock my profile</string>
+ <string name="device_not_connected_dialog_title">Your phone must be actively connected</string>
+ <string name="device_not_connected_dialog_message">To turn on this feature, make sure that your car and phone have Bluetooth turned on and are near each other</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; can now unlock your profile</string>
+ <string name="create_profile_lock_dialog_title">Create a primary profile lock</string>
+ <string name="create_profile_lock_dialog_message">To use your phone to unlock your profile, you need a primary profile lock as a backup</string>
+ <string name="unlock_profile_to_finish_title">Unlock your profile to finish</string>
+ <string name="unlock_profile_to_finish_message">You\'ve created a new profile lock. Next, enter it again to confirm that your phone can unlock your profile automatically</string>
+ <string name="disable_device_connection_text">Disconnect this device</string>
+ <string name="enable_device_connection_text">Reconnect this device</string>
+ <string name="trusted_device_notification_channel_name">Unlock with phone</string>
+ <string name="trusted_device_notification_title">Let your phone unlock your profile</string>
+ <string name="trusted_device_notification_content">Tap here to authorise this feature</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Something went wrong</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Unfortunately, this feature could not be turned on at this time. Please try again.</string>
+ <string name="create_phone_lock_dialog_title">Create a screen lock on your phone</string>
+ <string name="create_phone_lock_dialog_message">Your phone doesn\'t have a screen lock set. To unlock your car profile with your phone, first create a screen lock (also known as a passcode) in your phone\'s settings.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">New message</item>
+ <item quantity="other">%d new messages</item>
+ </plurals>
+ <string name="name_not_available">Name not available</string>
</resources>
diff --git a/companiondevice/res/values-en-rXC/strings.xml b/companiondevice/res/values-en-rXC/strings.xml
index f3a3b56..04e5b56 100644
--- a/companiondevice/res/values-en-rXC/strings.xml
+++ b/companiondevice/res/values-en-rXC/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‏‎‏‎Associated Device‎‏‎‎‏‎"</string>
- <string name="add_device_title" msgid="6166003577845888151">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‎Add Associated Device‎‏‎‎‏‎"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎Connect a companion device‎‏‎‎‏‎"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎You can use your phone as a companion device to help manage your driving experience‎‏‎‎‏‎"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‎Make sure you have ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎Companion App‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ installed on your phone‎‏‎‎‏‎"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎Confirm code on phone‎‏‎‎‏‎"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎Confirm that this matches the code shown on your phone‎‏‎‎‏‎"</string>
- <string name="associated_device_success" msgid="584760065696870256">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎Device has been associated successfully‎‏‎‎‏‎"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎Open the app and connect to &lt;b&gt;‎‏‎‎‏‏‎<xliff:g id="CAR_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎&lt;b&gt;‎‏‎‎‏‎"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎Open the app and follow instructions in the app‎‏‎‎‏‎"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎Forget &lt;b&gt;‎‏‎‎‏‏‎<xliff:g id="CAR_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎&lt;/b&gt;?‎‏‎‎‏‎"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‎‎‎This car will no longer be paired with this device. You will additionally need to remove this car from the Companion app.‎‏‎‎‏‎"</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="PHONE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ forgotten‎‏‎‎‏‎"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‎Failed to forget ‎‏‎‎‏‏‎<xliff:g id="PHONE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎‏‎Continue setup on your phone‎‏‎‎‏‎"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎Something went wrong‎‏‎‎‏‎"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎Unfortunately, this screen couldn\'t display properly. Please try again.‎‏‎‎‏‎"</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎Turn on Bluetooth‎‏‎‎‏‎"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎To set up your phone as a companion device, your car needs Bluetooth.‎‏‎‎‏‎"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‏‎Turn on Bluetooth?‎‏‎‎‏‎"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎To connect to your companion device, your car needs Bluetooth.‎‏‎‎‏‎"</string>
- <string name="accept" msgid="1454710793329618813">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎Accept‎‏‎‎‏‎"</string>
- <string name="reject" msgid="4315432282758892890">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‎‎Reject‎‏‎‎‏‎"</string>
- <string name="confirm" msgid="3748997214719276945">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎Confirm‎‏‎‎‏‎"</string>
- <string name="cancel" msgid="4306609731174629323">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎Cancel‎‏‎‎‏‎"</string>
- <string name="remove" msgid="5513398257088729188">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎‎‎Remove‎‏‎‎‏‎"</string>
- <string name="ok" msgid="2825038997730899083">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎OK‎‏‎‎‏‎"</string>
- <string name="connection" msgid="2798490936433656846">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎Connection‎‏‎‎‏‎"</string>
- <string name="forget_title" msgid="3027608547243824729">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‎‏‏‏‏‎‎‏‎‏‏‎‎‏‎‏‏‎‎‏‎Forget this device‎‏‎‎‏‎"</string>
- <string name="forget" msgid="2069897665699141222">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎Forget‎‏‎‎‏‎"</string>
- <string name="disable" msgid="4619854429066283970">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‏‎‏‏‏‏‎‎‎‎‏‎‎Disable‎‏‎‎‏‎"</string>
- <string name="enable" msgid="7656386199154111316">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‎Enable‎‏‎‎‏‎"</string>
- <string name="continue_button" msgid="2748318968566159950">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎‏‎‎‏‎‎‏‏‏‎‎Continue‎‏‎‎‏‎"</string>
- <string name="retry" msgid="3783419451480721367">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎Try again‎‏‎‎‏‎"</string>
- <string name="turn_on" msgid="4288754850470994812">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎Turn on‎‏‎‎‏‎"</string>
- <string name="not_now" msgid="8764692269093707622">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎Not now‎‏‎‎‏‎"</string>
- <string name="connected" msgid="8051190714042020471">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎Connected‎‏‎‎‏‎"</string>
- <string name="notDetected" msgid="4115229772085594506">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎Not detected‎‏‎‎‏‎"</string>
- <string name="disconnected" msgid="8526513868622591894">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‎Disconnected‎‏‎‎‏‎"</string>
- <string name="unknown" msgid="555736316465118024">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎Unknown‎‏‎‎‏‎"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‏‎Phone text message service running‎‏‎‎‏‎"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‎Phone text messaging service is active‎‏‎‎‏‎"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎Receiving text messages via companion device‎‏‎‎‏‎"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‎Unlock profile with phone‎‏‎‎‏‎"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎Check your Companion App to set unlocking options‎‏‎‎‏‎"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‎‏‎Let &lt;b&gt;‎‏‎‎‏‏‎<xliff:g id="PHONE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎&lt;/b&gt; unlock my profile‎‏‎‎‏‎"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎Your phone must be actively connected‎‏‎‎‏‎"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎‎‎To turn on this feature, make sure your car and phone have bluetooth turned on and are near each other‎‏‎‎‏‎"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‎&lt;b&gt;‎‏‎‎‏‏‎<xliff:g id="PHONE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎&lt;/b&gt; can now unlock your profile‎‏‎‎‏‎"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‎‎‎‎‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‎Create a primary profile lock‎‏‎‎‏‎"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎To use your phone to unlock your profile, you need a primary profile lock as a backup‎‏‎‎‏‎"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎Unlock your profile to finish‎‏‎‎‏‎"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎You\'ve created a new profile lock. Next, enter it again to confirm that your phone can unlock your profile automatically‎‏‎‎‏‎"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‎‎Disconnect this device‎‏‎‎‏‎"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎Reconnect this device‎‏‎‎‏‎"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎‏‎Unlock with phone‎‏‎‎‏‎"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎Let your phone unlock your profile‎‏‎‎‏‎"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‎‎Tap here to authorize this feature‎‏‎‎‏‎"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‏‏‎‎Something went wrong‎‏‎‎‏‎"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‎Unfortunately, this feature could not be turned on at this time. Please try again.‎‏‎‎‏‎"</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎Create a screen lock on your phone‎‏‎‎‏‎"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎‏‎‏‏‏‎‏‏‎Your phone doesn\'t have a screen lock set. To unlock your car profile with your phone, first create a screen lock (also known as passcode) in your phones settings.‎‏‎‎‏‎"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‎‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎Associated Device‎‏‎‎‏‎</string>
+ <string name="add_device_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎Add Associated Device‎‏‎‎‏‎</string>
+ <string name="add_associated_device_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎Connect a companion device‎‏‎‎‏‎</string>
+ <string name="add_associated_device_instruction">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎You can use your phone as a companion device to help manage your driving experience‎‏‎‎‏‎</string>
+ <string name="associated_device_install_app">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎Make sure you have ‎‏‎‎‏‏‎<b>‎‏‎‎‏‏‏‎Companion App‎‏‎‎‏‏‎</b>‎‏‎‎‏‏‏‎ installed on your phone‎‏‎‎‏‎</string>
+ <string name="associated_device_pairing_code_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎Confirm code on phone‎‏‎‎‏‎</string>
+ <string name="associated_device_pairing_message">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‎Confirm that this matches the code shown on your phone‎‏‎‎‏‎</string>
+ <string name="associated_device_success">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎Device has been associated successfully‎‏‎‎‏‎</string>
+ <string name="associated_device_select_device">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‎Open the app and connect to &lt;b&gt;‎‏‎‎‏‏‎%1$s‎‏‎‎‏‏‏‎&lt;/b&gt;‎‏‎‎‏‎</string>
+ <string name="associated_device_open_app">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‏‎‎Open the app and follow instructions in the app‎‏‎‎‏‎</string>
+ <string name="remove_associated_device_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‎‎‎‎Forget &lt;b&gt;‎‏‎‎‏‏‎%1$s‎‏‎‎‏‏‏‎&lt;/b&gt;?‎‏‎‎‏‎</string>
+ <string name="remove_associated_device_message">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‏‎‎This car will no longer be paired with this device. You will additionally need to remove this car from the Companion app.‎‏‎‎‏‎</string>
+ <string name="device_removed_success_toast_text">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎%1$s‎‏‎‎‏‏‏‎ forgotten‎‏‎‎‏‎</string>
+ <string name="device_removed_failure_toast_text">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎Failed to forget ‎‏‎‎‏‏‎%1$s‎‏‎‎‏‏‏‎‎‏‎‎‏‎</string>
+ <string name="continue_setup_toast_text">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎Continue setup on your phone‎‏‎‎‏‎</string>
+ <string name="error_screen_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎Something went wrong‎‏‎‎‏‎</string>
+ <string name="error_screen_message">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‎‏‏‏‎‎Unfortunately, this screen couldn\'t display properly. Please try again.‎‏‎‎‏‎</string>
+ <string name="turn_on_bluetooth_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎Turn on Bluetooth‎‏‎‎‏‎</string>
+ <string name="turn_on_bluetooth_message">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎To set up your phone as a companion device, your car needs Bluetooth.‎‏‎‎‏‎</string>
+ <string name="turn_on_bluetooth_dialog_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎Turn on Bluetooth?‎‏‎‎‏‎</string>
+ <string name="turn_on_bluetooth_dialog_message">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎To connect to your companion device, your car needs Bluetooth.‎‏‎‎‏‎</string>
+ <string name="accept">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎‎‎Accept‎‏‎‎‏‎</string>
+ <string name="reject">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎Reject‎‏‎‎‏‎</string>
+ <string name="confirm">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎Confirm‎‏‎‎‏‎</string>
+ <string name="cancel">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎Cancel‎‏‎‎‏‎</string>
+ <string name="remove">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎Remove‎‏‎‎‏‎</string>
+ <string name="ok">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎OK‎‏‎‎‏‎</string>
+ <string name="connection">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎Connection‎‏‎‎‏‎</string>
+ <string name="forget_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎Forget this device‎‏‎‎‏‎</string>
+ <string name="forget">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‎‏‎‎‏‎‎Forget‎‏‎‎‏‎</string>
+ <string name="disable">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‎‎Disable‎‏‎‎‏‎</string>
+ <string name="enable">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎Enable‎‏‎‎‏‎</string>
+ <string name="continue_button">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‎Continue‎‏‎‎‏‎</string>
+ <string name="retry">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‏‏‎‎‏‏‎‎Try again‎‏‎‎‏‎</string>
+ <string name="turn_on">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‏‎Turn on‎‏‎‎‏‎</string>
+ <string name="not_now">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎Not now‎‏‎‎‏‎</string>
+ <string name="connected">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‏‎Connected‎‏‎‎‏‎</string>
+ <string name="notDetected">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎Not detected‎‏‎‎‏‎</string>
+ <string name="disconnected">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎Disconnected‎‏‎‎‏‎</string>
+ <string name="unknown">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎Unknown‎‏‎‎‏‎</string>
+ <string name="app_running_msg_channel_name">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‏‏‎‎‎‏‎‎‎‏‎‏‎‎‎‏‎Phone text message service running‎‏‎‎‏‎</string>
+ <string name="app_running_msg_notification_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‏‎‎Phone text messaging service is active‎‏‎‎‏‎</string>
+ <string name="app_running_msg_notification_content">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎Receiving text messages via companion device‎‏‎‎‏‎</string>
+ <string name="trusted_device_feature_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‎‎Unlock profile with phone‎‏‎‎‏‎</string>
+ <string name="trusted_device_feature_instruction">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎Check your Companion App to set unlocking options‎‏‎‎‏‎</string>
+ <string name="trusted_device_item_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎Let &lt;b&gt;‎‏‎‎‏‏‎%1$s‎‏‎‎‏‏‏‎&lt;/b&gt; unlock my profile‎‏‎‎‏‎</string>
+ <string name="device_not_connected_dialog_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‎‏‏‎‎Your phone must be actively connected‎‏‎‎‏‎</string>
+ <string name="device_not_connected_dialog_message">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎To turn on this feature, make sure your car and phone have bluetooth turned on and are near each other‎‏‎‎‏‎</string>
+ <string name="trusted_device_enrollment_success_message">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‏‎‎‎&lt;b&gt;‎‏‎‎‏‏‎%1$s‎‏‎‎‏‏‏‎&lt;/b&gt; can now unlock your profile‎‏‎‎‏‎</string>
+ <string name="create_profile_lock_dialog_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎Create a primary profile lock‎‏‎‎‏‎</string>
+ <string name="create_profile_lock_dialog_message">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎To use your phone to unlock your profile, you need a primary profile lock as a backup‎‏‎‎‏‎</string>
+ <string name="unlock_profile_to_finish_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎‎Unlock your profile to finish‎‏‎‎‏‎</string>
+ <string name="unlock_profile_to_finish_message">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎You\'ve created a new profile lock. Next, enter it again to confirm that your phone can unlock your profile automatically‎‏‎‎‏‎</string>
+ <string name="disable_device_connection_text">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‎‏‎Disconnect this device‎‏‎‎‏‎</string>
+ <string name="enable_device_connection_text">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎Reconnect this device‎‏‎‎‏‎</string>
+ <string name="trusted_device_notification_channel_name">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎Unlock with phone‎‏‎‎‏‎</string>
+ <string name="trusted_device_notification_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‎Let your phone unlock your profile‎‏‎‎‏‎</string>
+ <string name="trusted_device_notification_content">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‎‏‏‎Tap here to authorize this feature‎‏‎‎‏‎</string>
+ <string name="trusted_device_enrollment_error_dialog_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎Something went wrong‎‏‎‎‏‎</string>
+ <string name="trusted_device_enrollment_error_dialog_message">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎Unfortunately, this feature could not be turned on at this time. Please try again.‎‏‎‎‏‎</string>
+ <string name="create_phone_lock_dialog_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎Create a screen lock on your phone‎‏‎‎‏‎</string>
+ <string name="create_phone_lock_dialog_message">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‏‎Your phone doesn\'t have a screen lock set. To unlock your car profile with your phone, first create a screen lock (also known as passcode) in your phone\'s settings.‎‏‎‎‏‎</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎New message‎‏‎‎‏‎</item>
+ <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎%d‎‏‎‎‏‏‏‎ new messages‎‏‎‎‏‎</item>
+ </plurals>
+ <string name="name_not_available">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎Name not available‎‏‎‎‏‎</string>
</resources>
diff --git a/companiondevice/res/values-es-rUS/strings.xml b/companiondevice/res/values-es-rUS/strings.xml
index a091127..27f6481 100644
--- a/companiondevice/res/values-es-rUS/strings.xml
+++ b/companiondevice/res/values-es-rUS/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Dispositivo asociado"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Agregar un dispositivo asociado"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Conecta un dispositivo complementario"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Usa el teléfono como dispositivo complementario para administrar tu experiencia de conducción"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"La "<b>"aplicación complementaria"</b>" debe estar instalada"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Confirma el código en el teléfono"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Confirma que el código sea el mismo que aparece en el teléfono"</string>
- <string name="associated_device_success" msgid="584760065696870256">"El dispositivo se asoció correctamente"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Abre app y conecta a &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Abre la app y sigue las instrucciones"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"¿Quieres borrar &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&amp;gt?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Este vehículo ya no estará vinculado a este dispositivo. Además, deberás quitar este vehículo de la aplicación complementaria."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Se borró <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"No se pudo borrar <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Continúa con la configuración en el teléfono"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Ocurrió un error"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Desafortunadamente, esta pantalla no se pudo mostrar correctamente. Vuelve a intentarlo."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Activa Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Para configurar el teléfono como dispositivo complementario, tu vehículo necesita Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"¿Deseas habilitar la conexión Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Para conectarse a tu dispositivo complementario, el vehículo necesita Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Aceptar"</string>
- <string name="reject" msgid="4315432282758892890">"Rechazar"</string>
- <string name="confirm" msgid="3748997214719276945">"Confirmar"</string>
- <string name="cancel" msgid="4306609731174629323">"Cancelar"</string>
- <string name="remove" msgid="5513398257088729188">"Quitar"</string>
- <string name="ok" msgid="2825038997730899083">"Aceptar"</string>
- <string name="connection" msgid="2798490936433656846">"Conexión"</string>
- <string name="forget_title" msgid="3027608547243824729">"Borrar este dispositivo"</string>
- <string name="forget" msgid="2069897665699141222">"Borrar"</string>
- <string name="disable" msgid="4619854429066283970">"Inhabilitar"</string>
- <string name="enable" msgid="7656386199154111316">"Habilitar"</string>
- <string name="continue_button" msgid="2748318968566159950">"Continuar"</string>
- <string name="retry" msgid="3783419451480721367">"Reintentar"</string>
- <string name="turn_on" msgid="4288754850470994812">"Activar"</string>
- <string name="not_now" msgid="8764692269093707622">"Ahora no"</string>
- <string name="connected" msgid="8051190714042020471">"Conectado"</string>
- <string name="notDetected" msgid="4115229772085594506">"No se detectó"</string>
- <string name="disconnected" msgid="8526513868622591894">"Desconectado"</string>
- <string name="unknown" msgid="555736316465118024">"Desconocido"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Servicio de mensajes de texto telefónicos en ejecución"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Servicio de mensajes de texto telefónicos activo"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Recepción de mensajes de texto en el dispositivo complementario"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Desbloquear el perfil con el teléfono"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Revisa tu aplicación complementaria para configurar las opciones de desbloqueo"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Permitir que &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; desbloquee mi perfil"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"El teléfono debe estar conectado de forma activa"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Para activar esta función, asegúrate de que el vehículo y el teléfono tengan Bluetooth activado y estén cerca uno del otro"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; ahora puede desbloquear tu perfil"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Crea un bloqueo de perfil primario"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Si quieres usar el teléfono para desbloquear tu perfil, necesitas un bloqueo de perfil primario como una copia de seguridad"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Desbloquea tu perfil para finalizar"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Creaste un nuevo bloqueo de perfil. Ahora, vuelve a ingresarlo para confirmar que el teléfono puede desbloquear tu perfil de forma automática."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Desconecta este dispositivo"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Reconecta este dispositivo"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Desbloqueo con teléfono"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Permite que el teléfono desbloquee tu perfil"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Presiona aquí para autorizar esta función"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Ocurrió un error"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Desafortunadamente, esta función no se pudo activar en este momento. Vuelve a intentarlo."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Crea un bloqueo de pantalla en el teléfono"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Tu teléfono no tiene configurado un bloqueo de pantalla. Para desbloquear el perfil del vehículo con tu teléfono, crea un bloqueo de pantalla (también conocido como contraseña) en la configuración del teléfono."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Dispositivo asociado</string>
+ <string name="add_device_title">Agregar un dispositivo asociado</string>
+ <string name="add_associated_device_title">Conecta un dispositivo complementario</string>
+ <string name="add_associated_device_instruction">Usa el teléfono como dispositivo complementario para administrar tu experiencia de conducción</string>
+ <string name="associated_device_install_app">Asegúrate de que la <b>aplicación complementaria</b> esté instalada</string>
+ <string name="associated_device_pairing_code_title">Confirma el código en el teléfono</string>
+ <string name="associated_device_pairing_message">Confirma que el código sea el mismo que aparece en el teléfono</string>
+ <string name="associated_device_success">Se asoció correctamente el dispositivo</string>
+ <string name="associated_device_select_device">Abre la app y conéctate a &lt;b&gt;%1$s&lt;b&gt;</string>
+ <string name="associated_device_open_app">Abre la app y sigue las instrucciones</string>
+ <string name="remove_associated_device_title">¿Quieres olvidar &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">El vehículo ya no estará vinculado a este dispositivo. Además, deberás quitar el vehículo de la aplicación complementaria.</string>
+ <string name="device_removed_success_toast_text">Se olvidó %1$s</string>
+ <string name="device_removed_failure_toast_text">No se pudo olvidar %1$s</string>
+ <string name="continue_setup_toast_text">Continúa con la configuración en el teléfono</string>
+ <string name="error_screen_title">Ocurrió un error</string>
+ <string name="error_screen_message">No se pudo mostrar correctamente esta pantalla. Vuelve a intentarlo.</string>
+ <string name="turn_on_bluetooth_title">Activar Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Para configurar el teléfono como dispositivo complementario, tu vehículo necesita Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">¿Deseas activar la conexión Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Para conectarse a tu dispositivo complementario, el vehículo necesita tener activado el Bluetooth.</string>
+ <string name="accept">Aceptar</string>
+ <string name="reject">Rechazar</string>
+ <string name="confirm">Confirmar</string>
+ <string name="cancel">Cancelar</string>
+ <string name="remove">Quitar</string>
+ <string name="ok">Aceptar</string>
+ <string name="connection">Conexión</string>
+ <string name="forget_title">Olvidar este dispositivo</string>
+ <string name="forget">Olvidar</string>
+ <string name="disable">Inhabilitar</string>
+ <string name="enable">Habilitar</string>
+ <string name="continue_button">Continuar</string>
+ <string name="retry">Reintentar</string>
+ <string name="turn_on">Activar</string>
+ <string name="not_now">Ahora no</string>
+ <string name="connected">Conectado</string>
+ <string name="notDetected">No se detectó</string>
+ <string name="disconnected">Desconectado</string>
+ <string name="unknown">Desconocido</string>
+ <string name="app_running_msg_channel_name">Se está ejecutando el servicio de mensajes de texto telefónicos</string>
+ <string name="app_running_msg_notification_title">Servicio de mensajes de texto telefónicos activo</string>
+ <string name="app_running_msg_notification_content">Se están recibiendo mensajes de texto mediante el dispositivo complementario</string>
+ <string name="trusted_device_feature_title">Desbloquea tu perfil con el teléfono</string>
+ <string name="trusted_device_feature_instruction">Revisa la aplicación complementaria para configurar las opciones de desbloqueo</string>
+ <string name="trusted_device_item_title">Permitir que &lt;b&gt;%1$s&lt;/b&gt; desbloquee mi perfil</string>
+ <string name="device_not_connected_dialog_title">El teléfono debe estar conectado de forma activa</string>
+ <string name="device_not_connected_dialog_message">Para activar esta función, asegúrate de que el vehículo y el teléfono tengan el Bluetooth activado y estén cerca uno del otro</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; ahora puede desbloquear tu perfil</string>
+ <string name="create_profile_lock_dialog_title">Crear un bloqueo de perfil principal</string>
+ <string name="create_profile_lock_dialog_message">Si quieres usar el teléfono para desbloquear tu perfil, necesitas un bloqueo de perfil principal como copia de seguridad</string>
+ <string name="unlock_profile_to_finish_title">Desbloquea tu perfil para finalizar</string>
+ <string name="unlock_profile_to_finish_message">Creaste un nuevo bloqueo de perfil. Ahora, vuelve a ingresarlo para confirmar que el teléfono puede desbloquear tu perfil de forma automática.</string>
+ <string name="disable_device_connection_text">Desconectar este dispositivo</string>
+ <string name="enable_device_connection_text">Volver a conectar este dispositivo</string>
+ <string name="trusted_device_notification_channel_name">Desbloqueo con teléfono</string>
+ <string name="trusted_device_notification_title">Permite que el teléfono desbloquee tu perfil</string>
+ <string name="trusted_device_notification_content">Presiona aquí para autorizar esta función</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Ocurrió un error</string>
+ <string name="trusted_device_enrollment_error_dialog_message">No se puede activar la función en este momento. Vuelve a intentarlo.</string>
+ <string name="create_phone_lock_dialog_title">Crea un bloqueo de pantalla en el teléfono</string>
+ <string name="create_phone_lock_dialog_message">Tu teléfono no tiene configurado un bloqueo de pantalla. Para desbloquear el perfil del vehículo con tu teléfono, crea un bloqueo de pantalla (también conocido como contraseña) en la configuración del teléfono.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Mensaje nuevo</item>
+ <item quantity="other">%d mensajes nuevos</item>
+ </plurals>
+ <string name="name_not_available">Nombre no disponible</string>
</resources>
diff --git a/companiondevice/res/values-es/strings.xml b/companiondevice/res/values-es/strings.xml
index 69b0e2b..3075c09 100644
--- a/companiondevice/res/values-es/strings.xml
+++ b/companiondevice/res/values-es/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Disp. asociado"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Añadir dispositivo asociado"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Conectar un dispositivo complementario"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Puedes usar tu móvil como dispositivo complementario para gestionar mejor tu experiencia al volante"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Comprueba si has instalado la "<b>"app complementaria"</b>" en tu móvil"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Confirmar código en el teléfono"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Confirma que el código de tu teléfono es el mismo"</string>
- <string name="associated_device_success" msgid="584760065696870256">"El dispositivo se ha asociado correctamente"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Abre la app y conéctate a &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Abre la aplicación y sigue las instrucciones"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"¿Olvidar &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Este coche ya no estará vinculado con el dispositivo. También tendrás que quitar este coche de la aplicación complementaria."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Se ha olvidado este dispositivo: <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"No se ha podido olvidar este dispositivo: <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Sigue con la configuración en tu teléfono"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Se ha producido un error"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Lo sentimos, pero la pantalla no se ha podido mostrar correctamente. Inténtalo de nuevo."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Activar Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Para configurar tu teléfono como dispositivo complementario, tu coche necesita Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"¿Activar Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Para conectarse con el dispositivo complementario, tu coche necesita Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Aceptar"</string>
- <string name="reject" msgid="4315432282758892890">"Rechazar"</string>
- <string name="confirm" msgid="3748997214719276945">"Confirmar"</string>
- <string name="cancel" msgid="4306609731174629323">"Cancelar"</string>
- <string name="remove" msgid="5513398257088729188">"Quitar"</string>
- <string name="ok" msgid="2825038997730899083">"Aceptar"</string>
- <string name="connection" msgid="2798490936433656846">"Conexión"</string>
- <string name="forget_title" msgid="3027608547243824729">"Olvidar este dispositivo"</string>
- <string name="forget" msgid="2069897665699141222">"Olvidar"</string>
- <string name="disable" msgid="4619854429066283970">"Inhabilitar"</string>
- <string name="enable" msgid="7656386199154111316">"Habilitar"</string>
- <string name="continue_button" msgid="2748318968566159950">"Continuar"</string>
- <string name="retry" msgid="3783419451480721367">"Reintentar"</string>
- <string name="turn_on" msgid="4288754850470994812">"Activar"</string>
- <string name="not_now" msgid="8764692269093707622">"Ahora no"</string>
- <string name="connected" msgid="8051190714042020471">"Conectado"</string>
- <string name="notDetected" msgid="4115229772085594506">"No detectado"</string>
- <string name="disconnected" msgid="8526513868622591894">"Desconectado"</string>
- <string name="unknown" msgid="555736316465118024">"Desconocido"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Servicio de mensajes de texto del teléfono ejecutándose"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Servicio de mensajes de texto del teléfono activo"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Recibiendo mensajes de texto mediante un dispositivo complementario"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Desbloquear perfil con el teléfono"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Mira la aplicación complementaria para configurar las opciones de desbloqueo"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Permitir que &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; desbloquee mi perfil"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Tu teléfono debe estar conectado de forma activa"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Para activar esta función, comprueba que el coche y el teléfono tienen el Bluetooth activado y están cerca el uno del otro"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; ahora puede desbloquear tu perfil"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Crear un bloqueo del perfil principal"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Para desbloquear tu perfil con tu teléfono, debes crear un bloqueo del perfil principal como alternativa"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Desbloquea tu perfil para terminar"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Has creado un nuevo bloqueo de perfil. Vuelve a entrar y confirma que tu teléfono puede desbloquear el perfil automáticamente"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Desconectar este dispositivo"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Volver a conectar este dispositivo"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Desbloquear con el teléfono"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Permite que tu teléfono desbloquee tu perfil"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Toca aquí para autorizar esta función"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Se ha producido un error"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Lo sentimos, pero no se ha podido activar la función. Inténtalo de nuevo."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Crear un bloqueo de pantalla en tu teléfono"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"No se ha configurado el bloqueo de pantalla en el teléfono. Para desbloquear tu perfil del coche con el teléfono, primero crea un bloqueo de pantalla (también llamado contraseña) en los ajustes de tu teléfono."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Dispositivo asociado</string>
+ <string name="add_device_title">Añadir dispositivo asociado</string>
+ <string name="add_associated_device_title">Conecta un dispositivo complementario</string>
+ <string name="add_associated_device_instruction">Usa tu teléfono como dispositivo complementario para gestionar mejor tu experiencia al volante</string>
+ <string name="associated_device_install_app">Mira si tienes la <b>aplicación complementaria</b> en tu teléfono</string>
+ <string name="associated_device_pairing_code_title">Confirma el código del teléfono</string>
+ <string name="associated_device_pairing_message">Confirma que en tu teléfono aparece el mismo código</string>
+ <string name="associated_device_success">Dispositivo asociado correctamente</string>
+ <string name="associated_device_select_device">Abre la aplicación y conéctate a &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Abre la aplicación y sigue las instrucciones</string>
+ <string name="remove_associated_device_title">¿Olvidar &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Este coche dejará de estar vinculado con el dispositivo. También tendrás que quitar el coche de la aplicación complementaria.</string>
+ <string name="device_removed_success_toast_text">%1$s olvidado</string>
+ <string name="device_removed_failure_toast_text">No se ha podido olvidar el dispositivo %1$s</string>
+ <string name="continue_setup_toast_text">Continúa la configuración en tu teléfono</string>
+ <string name="error_screen_title">Se ha producido un error</string>
+ <string name="error_screen_message">No se ha podido mostrar correctamente esta pantalla. Inténtalo de nuevo.</string>
+ <string name="turn_on_bluetooth_title">Activa el Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Para configurar tu teléfono como dispositivo complementario, tu coche necesita el Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">¿Activar Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Para conectarse a tu dispositivo complementario, tu coche necesita el Bluetooth.</string>
+ <string name="accept">Aceptar</string>
+ <string name="reject">Rechazar</string>
+ <string name="confirm">Confirmar</string>
+ <string name="cancel">Cancelar</string>
+ <string name="remove">Quitar</string>
+ <string name="ok">Aceptar</string>
+ <string name="connection">Conexión</string>
+ <string name="forget_title">Olvidar este dispositivo</string>
+ <string name="forget">Olvidar</string>
+ <string name="disable">Inhabilitar</string>
+ <string name="enable">Habilitar</string>
+ <string name="continue_button">Continuar</string>
+ <string name="retry">Reintentar</string>
+ <string name="turn_on">Activar</string>
+ <string name="not_now">Ahora no</string>
+ <string name="connected">Conectado</string>
+ <string name="notDetected">No detectado</string>
+ <string name="disconnected">Desconectado</string>
+ <string name="unknown">Desconocido</string>
+ <string name="app_running_msg_channel_name">Servicio de mensajes de texto del teléfono ejecutándose</string>
+ <string name="app_running_msg_notification_title">Servicio de mensajes de texto del teléfono activo</string>
+ <string name="app_running_msg_notification_content">Recibiendo mensajes de texto a través de un dispositivo complementario</string>
+ <string name="trusted_device_feature_title">Desbloquear perfil con el teléfono</string>
+ <string name="trusted_device_feature_instruction">Configura las opciones de desbloqueo en la aplicación complementaria</string>
+ <string name="trusted_device_item_title">Permitir que &lt;b&gt;%1$s&lt;/b&gt; desbloquee mi perfil</string>
+ <string name="device_not_connected_dialog_title">Tu teléfono debe estar conectado de forma activa</string>
+ <string name="device_not_connected_dialog_message">Para activar esta función, comprueba que tu coche y tu teléfono tengan el Bluetooth activado y estén cerca el uno del otro</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; ahora puede desbloquear tu perfil</string>
+ <string name="create_profile_lock_dialog_title">Crea un bloqueo de perfil principal</string>
+ <string name="create_profile_lock_dialog_message">Para desbloquear tu perfil con tu teléfono, tienes que definir un bloqueo de perfil principal como alternativa</string>
+ <string name="unlock_profile_to_finish_title">Desbloquea tu perfil para terminar</string>
+ <string name="unlock_profile_to_finish_message">Has creado un bloqueo de perfil. Introdúcelo de nuevo para confirmar que tu teléfono puede desbloquear el perfil automáticamente</string>
+ <string name="disable_device_connection_text">Desconectar este dispositivo</string>
+ <string name="enable_device_connection_text">Volver a conectar este dispositivo</string>
+ <string name="trusted_device_notification_channel_name">Desbloquear con el teléfono</string>
+ <string name="trusted_device_notification_title">Permite que tu teléfono desbloquee tu perfil</string>
+ <string name="trusted_device_notification_content">Toca aquí para autorizar esta función</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Se ha producido un error</string>
+ <string name="trusted_device_enrollment_error_dialog_message">No se ha podido activar la función. Inténtalo de nuevo.</string>
+ <string name="create_phone_lock_dialog_title">Crea un bloqueo de pantalla en tu teléfono</string>
+ <string name="create_phone_lock_dialog_message">Tu teléfono no tiene configurado ningún bloqueo de pantalla. Para desbloquear el perfil de tu coche con tu teléfono, primero crea un bloqueo de pantalla (también llamado \"contraseña\") en los ajustes de tu teléfono.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Mensaje nuevo</item>
+ <item quantity="other">%d mensajes nuevos</item>
+ </plurals>
+ <string name="name_not_available">Nombre no disponible</string>
</resources>
diff --git a/companiondevice/res/values-et/strings.xml b/companiondevice/res/values-et/strings.xml
index 72fb507..c2081c0 100644
--- a/companiondevice/res/values-et/strings.xml
+++ b/companiondevice/res/values-et/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Seotud seade"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Lisa seotud seade"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Kaasseadme ühendamine"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Sõidukogemuse haldamiseks saate oma telefoni kasutada kaasseadmena"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Veenduge, et "<b>"kaasrakendus"</b>" oleks teie telefoni installitud"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Kinnitage kood telefonis"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Kinnitage, et see ühtib teie telefonis kuvatud koodiga"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Seadme seostamine õnnestus"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Avage rakendus ja ühendage autoga &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Avage rakendus ja järgige seal juhiseid"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Kas unustada &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"See auto ei ole enam selle seadmega seotud. Lisaks sellele peate selle auto kaasrakendusest eemaldama."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> unustati"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Telefoni <xliff:g id="PHONE_NAME">%1$s</xliff:g> unustamine ebaõnnestus"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Jätkake seadistamist oma telefonis"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Midagi läks valesti"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Kahjuks ei õnnestunud seda ekraanikuva õigesti kuvada. Proovige uuesti."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Lülita Bluetooth sisse"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Telefoni seadistamiseks kaasseadmena vajab auto Bluetoothi."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Kas lülitada Bluetooth sisse?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Kaasseadme ühendamiseks vajab auto Bluetoothi."</string>
- <string name="accept" msgid="1454710793329618813">"Nõustu"</string>
- <string name="reject" msgid="4315432282758892890">"Keeldu"</string>
- <string name="confirm" msgid="3748997214719276945">"Kinnita"</string>
- <string name="cancel" msgid="4306609731174629323">"Tühista"</string>
- <string name="remove" msgid="5513398257088729188">"Eemalda"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Ühendus"</string>
- <string name="forget_title" msgid="3027608547243824729">"Unusta see seade"</string>
- <string name="forget" msgid="2069897665699141222">"Unusta"</string>
- <string name="disable" msgid="4619854429066283970">"Keela"</string>
- <string name="enable" msgid="7656386199154111316">"Luba"</string>
- <string name="continue_button" msgid="2748318968566159950">"Jätka"</string>
- <string name="retry" msgid="3783419451480721367">"Proovi uuesti"</string>
- <string name="turn_on" msgid="4288754850470994812">"Lülita sisse"</string>
- <string name="not_now" msgid="8764692269093707622">"Mitte praegu"</string>
- <string name="connected" msgid="8051190714042020471">"Ühendatud"</string>
- <string name="notDetected" msgid="4115229772085594506">"Ei tuvastatud"</string>
- <string name="disconnected" msgid="8526513868622591894">"Pole ühendatud"</string>
- <string name="unknown" msgid="555736316465118024">"Teadmata"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Telefoni tekstsõnumiteenus töötab"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Telefoni tekstsõnumiteenus on aktiivne"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Tekstsõnumeid võetakse vastu kaasseadme kaudu"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Profiili avamine telefoniga"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Kontrollige avamise valikute määramiseks kaasrakendust"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Luba telefonil &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; minu profiil avada"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Teie telefon peab olema aktiivselt ühendatud"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Selle funktsiooni sisselülitamiseks veenduge, et Bluetooth oleks teie autos ja telefonis sisse lülitatud ning auto ja telefon oleksid lähestiku"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; saab nüüd teie profiili avada"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Peamise profiililuku loomine"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Selleks et oma profiili avamiseks telefoni kasutada, peab varuvalikuna olema seadistatud peamine profiililukk"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Lõpetamiseks avage oma profiil"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Lõite uue profiililuku. Järgmiseks sisestage see uuesti ja veenduge, et teie telefon saaks profiili automaatselt avada"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Katkesta selle seadme ühendus"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Ühenda see seade uuesti"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Avamine telefoniga"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Lubage telefonil oma profiil avada"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Puudutage sellele funktsioonile volituse andmiseks siin"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Midagi läks valesti"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Kahjuks ei saanud seda funktsiooni praegu sisse lülitada. Proovige uuesti."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Telefonis ekraaniluku loomine"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Teie telefonis ei ole ekraanilukku seadistatud. Telefoniga auto profiili avamiseks looge oma telefoni seadetes esmalt ekraanilukk (seda nimetatakse ka pääsukoodiks)."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Seotud seade</string>
+ <string name="add_device_title">Lisa seotud seade</string>
+ <string name="add_associated_device_title">Kaasseadme ühendamine</string>
+ <string name="add_associated_device_instruction">Sõidukogemuse haldamiseks saate oma telefoni kasutada kaasseadmena</string>
+ <string name="associated_device_install_app">Veenduge, et <b>kaasrakendus</b> oleks teie telefoni installitud</string>
+ <string name="associated_device_pairing_code_title">Kinnitage kood telefonis</string>
+ <string name="associated_device_pairing_message">Veenduge, et see ühtiks teie telefonis kuvatud koodiga</string>
+ <string name="associated_device_success">Seadme seostamine õnnestus</string>
+ <string name="associated_device_select_device">Avage rakendus ja ühendage autoga &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Avage rakendus ja järgige seal juhiseid</string>
+ <string name="remove_associated_device_title">Kas soovite auto &lt;b&gt;%1$s&lt;/b&gt; unustada?</string>
+ <string name="remove_associated_device_message">See auto ei ole enam selle seadmega seotud. Lisaks sellele peate selle auto kaasrakendusest eemaldama.</string>
+ <string name="device_removed_success_toast_text">%1$s unustati</string>
+ <string name="device_removed_failure_toast_text">Telefoni %1$s unustamine ebaõnnestus</string>
+ <string name="continue_setup_toast_text">Jätkake seadistamist oma telefonis</string>
+ <string name="error_screen_title">Midagi läks valesti</string>
+ <string name="error_screen_message">Kahjuks ei õnnestunud seda ekraanikuva õigesti kuvada. Proovige uuesti.</string>
+ <string name="turn_on_bluetooth_title">Lülitage Bluetooth sisse</string>
+ <string name="turn_on_bluetooth_message">Telefoni seadistamiseks kaasseadmena vajab auto Bluetoothi.</string>
+ <string name="turn_on_bluetooth_dialog_title">Kas lülitada Bluetooth sisse?</string>
+ <string name="turn_on_bluetooth_dialog_message">Kaasseadme ühendamiseks vajab auto Bluetoothi.</string>
+ <string name="accept">Nõustu</string>
+ <string name="reject">Keeldu</string>
+ <string name="confirm">Kinnita</string>
+ <string name="cancel">Tühista</string>
+ <string name="remove">Eemalda</string>
+ <string name="ok">OK</string>
+ <string name="connection">Ühendus</string>
+ <string name="forget_title">Unusta see seade</string>
+ <string name="forget">Unusta</string>
+ <string name="disable">Keela</string>
+ <string name="enable">Luba</string>
+ <string name="continue_button">Jätka</string>
+ <string name="retry">Proovi uuesti</string>
+ <string name="turn_on">Lülita sisse</string>
+ <string name="not_now">Mitte praegu</string>
+ <string name="connected">Ühendatud</string>
+ <string name="notDetected">Ei tuvastatud</string>
+ <string name="disconnected">Pole ühendatud</string>
+ <string name="unknown">Teadmata</string>
+ <string name="app_running_msg_channel_name">Telefoni tekstsõnumiteenus töötab</string>
+ <string name="app_running_msg_notification_title">Telefoni tekstsõnumiteenus on aktiivne</string>
+ <string name="app_running_msg_notification_content">Tekstsõnumeid võetakse vastu kaasseadme kaudu</string>
+ <string name="trusted_device_feature_title">Profiili avamine telefoniga</string>
+ <string name="trusted_device_feature_instruction">Kontrollige avamise valikute määramiseks kaasrakendust</string>
+ <string name="trusted_device_item_title">Luba telefonil &lt;b&gt;%1$s&lt;/b&gt; minu profiil avada</string>
+ <string name="device_not_connected_dialog_title">Teie telefon peab olema aktiivselt ühendatud</string>
+ <string name="device_not_connected_dialog_message">Selle funktsiooni sisselülitamiseks veenduge, et Bluetooth oleks teie autos ja telefonis sisse lülitatud ning auto ja telefon oleksid lähestiku</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; saab nüüd teie profiili avada</string>
+ <string name="create_profile_lock_dialog_title">Peamise profiililuku loomine</string>
+ <string name="create_profile_lock_dialog_message">Selleks et oma profiili avamiseks telefoni kasutada, peab varuvalikuna olema seadistatud peamine profiililukk</string>
+ <string name="unlock_profile_to_finish_title">Lõpetamiseks avage oma profiil</string>
+ <string name="unlock_profile_to_finish_message">Lõite uue profiililuku. Järgmiseks sisestage see uuesti ja veenduge, et teie telefon saaks profiili automaatselt avada</string>
+ <string name="disable_device_connection_text">Katkesta selle seadme ühendus</string>
+ <string name="enable_device_connection_text">Ühenda see seade uuesti</string>
+ <string name="trusted_device_notification_channel_name">Avamine telefoniga</string>
+ <string name="trusted_device_notification_title">Lubage telefonil oma profiil avada</string>
+ <string name="trusted_device_notification_content">Puudutage sellele funktsioonile volituse andmiseks siin</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Midagi läks valesti</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Kahjuks ei saanud seda funktsiooni praegu sisse lülitada. Proovige uuesti.</string>
+ <string name="create_phone_lock_dialog_title">Telefonis ekraaniluku loomine</string>
+ <string name="create_phone_lock_dialog_message">Teie telefonis ei ole ekraanilukku seadistatud. Telefoniga auto profiili avamiseks looge oma telefoni seadetes esmalt ekraanilukk (seda nimetatakse ka pääsukoodiks).</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Uus sõnum</item>
+ <item quantity="other">%d uut sõnumit</item>
+ </plurals>
+ <string name="name_not_available">Nimi pole saadaval</string>
</resources>
diff --git a/companiondevice/res/values-eu/strings.xml b/companiondevice/res/values-eu/strings.xml
index 78fb1c9..2d4c97c 100644
--- a/companiondevice/res/values-eu/strings.xml
+++ b/companiondevice/res/values-eu/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Erlazionatutako gailua"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Gehitu erlazionatutako gailu bat"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Konektatu gailu osagarri bat"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Telefonoa gailu laguntzaile gisa erabil dezakezu, gidatzeko modua kudeatzeko"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Ziurtatu "<b>"aplikazio osagarria"</b>" daukazula telefonoan"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Berretsi telefonoko kodea"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Berretsi telefonoko kodea horrekin bat datorrela"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Erlazionatu da gailua"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Ireki aplikazioa eta konektatu &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; autora"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Ireki aplikazioa eta jarraitu argibideei"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; ahaztu nahi duzu?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Aurrerantzean, auto hau ez da parekatuko gailu honekin. Aplikazio osagarritik ere kendu beharko duzu autoa."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Ahaztu da <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Ezin izan da ahaztu <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Jarraitu konfiguratzen telefonoan"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Arazoren bat izan da"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Tamalez, ezin izan da behar bezala bistaratu pantaila. Saiatu berriro."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Aktibatu Bluetooth-a"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Telefonoa gailu osagarri gisa konfiguratzeko, autoak Bluetooth-a aktibatuta eduki behar du"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Bluetooth-a aktibatu nahi duzu?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Gailu osagarria konektatzeko, autoak Bluetooth-a aktibatuta eduki behar du"</string>
- <string name="accept" msgid="1454710793329618813">"Onartu"</string>
- <string name="reject" msgid="4315432282758892890">"Baztertu"</string>
- <string name="confirm" msgid="3748997214719276945">"Berretsi"</string>
- <string name="cancel" msgid="4306609731174629323">"Utzi"</string>
- <string name="remove" msgid="5513398257088729188">"Kendu"</string>
- <string name="ok" msgid="2825038997730899083">"Ados"</string>
- <string name="connection" msgid="2798490936433656846">"Konexioa"</string>
- <string name="forget_title" msgid="3027608547243824729">"Ahaztu gailua"</string>
- <string name="forget" msgid="2069897665699141222">"Ahaztu"</string>
- <string name="disable" msgid="4619854429066283970">"Desgaitu"</string>
- <string name="enable" msgid="7656386199154111316">"Gaitu"</string>
- <string name="continue_button" msgid="2748318968566159950">"Egin aurrera"</string>
- <string name="retry" msgid="3783419451480721367">"Saiatu berriro"</string>
- <string name="turn_on" msgid="4288754850470994812">"Aktibatu"</string>
- <string name="not_now" msgid="8764692269093707622">"Orain ez"</string>
- <string name="connected" msgid="8051190714042020471">"Konektatuta"</string>
- <string name="notDetected" msgid="4115229772085594506">"Ez da hauteman"</string>
- <string name="disconnected" msgid="8526513868622591894">"Deskonektatuta"</string>
- <string name="unknown" msgid="555736316465118024">"Ezezaguna"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Telefonoaren testu-mezuen zerbitzua abian"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Telefonoaren testu-mezuen zerbitzua aktibo"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Gailu osagarriaren bidez jasoko dira testu-mezuak"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Desblokeatu profila telefonoaren bidez"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Desblokeatzeko aukerak ezartzeko, erabili aplikazio osagarria"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Utzi &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; telefonoari nire profila desblokeatzen"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefonoaren konexioak aktibatuta egon behar du"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Eginbide hau aktibatzeko, ziurtatu autoak nahiz telefonoak Bluetooth-a aktibatuta daukatela eta elkarrengandik gertu daudela"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; telefonoaren bidez zure profila desblokea daiteke orain"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Sortu profilaren blokeo nagusi bat"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Telefonoa erabili nahi baduzu profila desblokeatzeko, profilaren blokeo nagusi bat behar duzu ordezko aukera gisa"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Amaitzeko, desblokeatu profila"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Sortu duzu profilaren blokeoa. Orain, idatz ezazu berriro, telefonoak profila automatikoki desblokea dezakeela berresteko."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Deskonektatu gailua"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Konektatu berriro gailua"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Desblokeatu telefonoaren bidez"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Utzi telefonoari zure profila desblokeatzen"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Eginbide hau erabiltzeko baimena emateko, sakatu hau"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Arazoren bat izan da"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Tamalez, ezin izan da aktibatu eginbidea. Saiatu berriro."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Sortu pantailaren blokeo bat telefonorako"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Telefonoak ez dauka ezarrita pantailaren blokeorik. Autoaren profila telefonoaren bidez desblokeatzeko, sortu pantailaren blokeo bat (pasakode gisa ere ezaguna)."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Erlazionatutako gailua</string>
+ <string name="add_device_title">Gehitu erlazionatutako gailu bat</string>
+ <string name="add_associated_device_title">Konektatu gailu osagarri bat</string>
+ <string name="add_associated_device_instruction">Telefonoa gailu osagarri gisa erabil dezakezu, gidatzeko modua kudeatzeko</string>
+ <string name="associated_device_install_app">Ziurtatu <b>Companion App</b> daukazula telefonoan</string>
+ <string name="associated_device_pairing_code_title">Berretsi telefonoko kodea</string>
+ <string name="associated_device_pairing_message">Berretsi telefonoko kodea horrekin bat datorrela</string>
+ <string name="associated_device_success">Erlazionatu da gailua</string>
+ <string name="associated_device_select_device">Ireki aplikazioa eta konektatu &lt;b&gt;%1$s&lt;/b&gt; autora</string>
+ <string name="associated_device_open_app">Ireki aplikazioa eta jarraitu argibideei</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; ahaztu nahi duzu?</string>
+ <string name="remove_associated_device_message">Aurrerantzean, auto hau ez da parekatuko gailu honekin. Companion App-etik ere kendu beharko duzu autoa.</string>
+ <string name="device_removed_success_toast_text">Ahaztu da %1$s</string>
+ <string name="device_removed_failure_toast_text">Ezin izan da ahaztu %1$s</string>
+ <string name="continue_setup_toast_text">Jarraitu konfiguratzen telefonoan</string>
+ <string name="error_screen_title">Arazoren bat izan da</string>
+ <string name="error_screen_message">Tamalez, ezin izan da behar bezala bistaratu pantaila. Saiatu berriro.</string>
+ <string name="turn_on_bluetooth_title">Aktibatu Bluetooth-a</string>
+ <string name="turn_on_bluetooth_message">Telefonoa gailu osagarri gisa konfiguratzeko, autoak Bluetooth-a aktibatuta eduki behar du.</string>
+ <string name="turn_on_bluetooth_dialog_title">Bluetooth-a aktibatu nahi duzu?</string>
+ <string name="turn_on_bluetooth_dialog_message">Gailu osagarria konektatzeko, autoak Bluetooth-a aktibatuta eduki behar du.</string>
+ <string name="accept">Onartu</string>
+ <string name="reject">Baztertu</string>
+ <string name="confirm">Berretsi</string>
+ <string name="cancel">Utzi</string>
+ <string name="remove">Kendu</string>
+ <string name="ok">Ados</string>
+ <string name="connection">Konexioa</string>
+ <string name="forget_title">Ahaztu gailua</string>
+ <string name="forget">Ahaztu</string>
+ <string name="disable">Desgaitu</string>
+ <string name="enable">Gaitu</string>
+ <string name="continue_button">Egin aurrera</string>
+ <string name="retry">Saiatu berriro</string>
+ <string name="turn_on">Aktibatu</string>
+ <string name="not_now">Orain ez</string>
+ <string name="connected">Konektatuta</string>
+ <string name="notDetected">Ez da hauteman</string>
+ <string name="disconnected">Deskonektatuta</string>
+ <string name="unknown">Ezezaguna</string>
+ <string name="app_running_msg_channel_name">Telefonoaren testu-mezuen zerbitzua abian</string>
+ <string name="app_running_msg_notification_title">Telefonoaren testu-mezuen zerbitzua aktibo</string>
+ <string name="app_running_msg_notification_content">Gailu osagarriaren bidez jasoko dira testu-mezuak</string>
+ <string name="trusted_device_feature_title">Desblokeatu profila telefonoaren bidez</string>
+ <string name="trusted_device_feature_instruction">Desblokeatzeko aukerak ezartzeko, erabili Companion App</string>
+ <string name="trusted_device_item_title">Utzi &lt;b&gt;%1$s&lt;/b&gt; telefonoari nire profila desblokeatzen</string>
+ <string name="device_not_connected_dialog_title">Telefonoaren konexioak aktibatuta egon behar du</string>
+ <string name="device_not_connected_dialog_message">Eginbide hau aktibatzeko, ziurtatu autoak nahiz telefonoak Bluetooth-a aktibatuta daukatela eta elkarrengandik gertu daudela</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; telefonoak zure profila desblokea dezake orain</string>
+ <string name="create_profile_lock_dialog_title">Sortu profilaren blokeo nagusi bat</string>
+ <string name="create_profile_lock_dialog_message">Telefonoa erabili nahi baduzu profila desblokeatzeko, profilaren blokeo nagusi bat behar duzu ordezko aukera gisa</string>
+ <string name="unlock_profile_to_finish_title">Amaitzeko, desblokeatu profila</string>
+ <string name="unlock_profile_to_finish_message">Sortu duzu profilaren blokeoa. Orain, idatz ezazu berriro, telefonoak profila automatikoki desblokea dezakeela berresteko.</string>
+ <string name="disable_device_connection_text">Deskonektatu gailua</string>
+ <string name="enable_device_connection_text">Konektatu berriro gailua</string>
+ <string name="trusted_device_notification_channel_name">Desblokeatu telefonoaren bidez</string>
+ <string name="trusted_device_notification_title">Utzi telefonoari zure profila desblokeatzen</string>
+ <string name="trusted_device_notification_content">Eginbide hau erabiltzeko baimena emateko, sakatu hau</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Arazoren bat izan da</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Ezin izan da aktibatu eginbidea. Saiatu berriro.</string>
+ <string name="create_phone_lock_dialog_title">Sortu pantailaren blokeo bat telefonorako</string>
+ <string name="create_phone_lock_dialog_message">Telefonoak ez dauka ezarrita pantailaren blokeorik. Autoaren profila telefonoaren bidez desblokeatzeko, sortu pantailaren blokeo bat (pasakode gisa ere ezaguna) telefonoaren ezarpenetan.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Mezu berria</item>
+ <item quantity="other">%d mezu berri</item>
+ </plurals>
+ <string name="name_not_available">Izena ez dago erabilgarri</string>
</resources>
diff --git a/companiondevice/res/values-fa/strings.xml b/companiondevice/res/values-fa/strings.xml
index e0006c9..b9e5c5a 100644
--- a/companiondevice/res/values-fa/strings.xml
+++ b/companiondevice/res/values-fa/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"دستگاه مرتبط"</string>
- <string name="add_device_title" msgid="6166003577845888151">"افزودن دستگاه مرتبط"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"اتصال دستگاه همراه"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"برای کمک به مدیریت تجربه رانندگی، می‌توانید از تلفن خود به‌عنوان دستگاه همراه استفاده کنید"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"مطمئن شوید "<b>"برنامه همراه"</b>" را در تلفنتان نصب کرده‌اید"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"تأیید کد در تلفن"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"تأیید کنید که این کد مطابق کدی است که در تلفنتان نشان داده شده است"</string>
- <string name="associated_device_success" msgid="584760065696870256">"دستگاه باموفقیت مرتبط شده است"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"برنامه را باز کنید و به &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; وصل شوید"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"برنامه را باز کنید و دستورالعمل‌های درون آن را دنبال کنید"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; فراموش شود؟"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"این خودرو دیگر با این دستگاه مرتبط نمی‌شود. به‌علاوه، باید این خودرو را از برنامه همراه بردارید."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> فراموش شد"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> فراموش نشد"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"ادامه راه‌اندازی در تلفن"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"مشکلی پیش آمد"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"متأسفانه، این صفحه‌نمایش به‌درستی نشان داده نمی‌شود. لطفاً دوباره امتحان کنید."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"روشن کردن بلوتوث"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"برای راه‌اندازی تلفن به‌عنوان دستگاه همراه، خودرویتان به بلوتوث نیاز دارد."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"بلوتوث روشن شود؟"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"برای وصل شدن به دستگاه همراه، خودرویتان به بلوتوث نیاز دارد."</string>
- <string name="accept" msgid="1454710793329618813">"پذیرفتن"</string>
- <string name="reject" msgid="4315432282758892890">"رد کردن"</string>
- <string name="confirm" msgid="3748997214719276945">"تأیید"</string>
- <string name="cancel" msgid="4306609731174629323">"لغو"</string>
- <string name="remove" msgid="5513398257088729188">"برداشتن"</string>
- <string name="ok" msgid="2825038997730899083">"تأیید"</string>
- <string name="connection" msgid="2798490936433656846">"اتصال"</string>
- <string name="forget_title" msgid="3027608547243824729">"فراموش کردن این دستگاه"</string>
- <string name="forget" msgid="2069897665699141222">"فراموش کردن"</string>
- <string name="disable" msgid="4619854429066283970">"غیرفعال کردن"</string>
- <string name="enable" msgid="7656386199154111316">"فعال کردن"</string>
- <string name="continue_button" msgid="2748318968566159950">"ادامه"</string>
- <string name="retry" msgid="3783419451480721367">"امتحان مجدد"</string>
- <string name="turn_on" msgid="4288754850470994812">"روشن کردن"</string>
- <string name="not_now" msgid="8764692269093707622">"حالا نه"</string>
- <string name="connected" msgid="8051190714042020471">"متصل"</string>
- <string name="notDetected" msgid="4115229772085594506">"چیزی شناسایی نشد"</string>
- <string name="disconnected" msgid="8526513868622591894">"اتصال قطع شد"</string>
- <string name="unknown" msgid="555736316465118024">"ناشناس"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"سرویس پیامک تلفن درحال اجرا است"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"سرویس پیامک تلفن فعال است"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"درحال دریافت پیامک‌ها ازطریق دستگاه همراه"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"باز کردن قفل نمایه با تلفن"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"برای تنظیم گزینه‌های باز کردن قفل، برنامه همراه را بررسی کنید"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"برای باز کردن قفل نمایه به &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; اجازه داده شود"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"تلفنتان باید فعالانه متصل باشد"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"برای روشن کردن این ویژگی، مطمئن شوید بلوتوث خودرو و تلفنتان روشن است و نزدیک یکدیگر هستند"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"اکنون &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; می‌تواند قفل نمایه شما را باز کند"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"ایجاد قفل نمایه اصلی"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"برای باز کردن قفل نمایه بااستفاده از تلفن، به قفل نمایه اصلی به‌عنوان پشتیبان نیاز دارید"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"برای اتمام این مرحله، قفل نمایه خود را باز کنید"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"قفل نمایه جدیدی ایجاد کرده‌اید. سپس برای تأیید اینکه تلفنتان می‌تواند به‌طور خودکار قفل نمایه را باز کند، آن را دوباره وارد کنید"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"قطع اتصال این دستگاه"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"اتصال مجدد این دستگاه"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"باز کردن قفل با تلفن"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"اجازه به تلفن برای باز کردن قفل نمایه"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"برای اجازه به این ویژگی، اینجا ضربه بزنید"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"مشکلی پیش آمد"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"متأسفانه، در این لحظه امکان روشن کردن این ویژگی وجود ندارد. لطفاً دوباره امتحان کنید."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"ایجاد قفل صفحه در تلفن"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"قفل صفحه تلفن شما تنظیم نشده است. برای باز کردن قفل نمایه خودرو با تلفن، ابتدا در تنظیمات تلفن خود قفل صفحه (گذرنویسه هم گفته می‌شود) ایجاد کنید."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">دستگاه مرتبط</string>
+ <string name="add_device_title">افزودن دستگاه مرتبط</string>
+ <string name="add_associated_device_title">اتصال دستگاه همراه</string>
+ <string name="add_associated_device_instruction">برای کمک به مدیریت تجربه رانندگی‌تان، می‌توانید از تلفن خود به‌عنوان دستگاه همراه استفاده کنید</string>
+ <string name="associated_device_install_app">مطمئن شوید <b>برنامه همراه</b> را در تلفنتان نصب کرده‌اید</string>
+ <string name="associated_device_pairing_code_title">تأیید کد در تلفن</string>
+ <string name="associated_device_pairing_message">تأیید کنید این کد با کدی است که در تلفنتان نشان داده شده است مطابقت دارد</string>
+ <string name="associated_device_success">دستگاه باموفقیت مرتبط شد</string>
+ <string name="associated_device_select_device">برنامه را باز کنید و به &lt;b&gt;%1$s&lt;/b&gt; متصل شوید</string>
+ <string name="associated_device_open_app">برنامه را باز کنید و دستورالعمل‌های درون آن را دنبال کنید</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; فراموش شود؟</string>
+ <string name="remove_associated_device_message">این خودرو دیگر با این دستگاه مرتبط نخواهد بود. به‌علاوه، باید این خودرو را از برنامه همراه بردارید.</string>
+ <string name="device_removed_success_toast_text">%1$s فراموش شد</string>
+ <string name="device_removed_failure_toast_text">%1$s فراموش نشد</string>
+ <string name="continue_setup_toast_text">ادامه راه‌اندازی در تلفن</string>
+ <string name="error_screen_title">مشکلی پیش آمد</string>
+ <string name="error_screen_message">متأسفانه، این صفحه‌نمایش به‌درستی نشان داده نمی‌شود. لطفاً دوباره امتحان کنید.</string>
+ <string name="turn_on_bluetooth_title">روشن کردن بلوتوث</string>
+ <string name="turn_on_bluetooth_message">برای تنظیم تلفن به‌عنوان دستگاه همراه، خودرویتان به بلوتوث نیاز دارد.</string>
+ <string name="turn_on_bluetooth_dialog_title">بلوتوث روشن شود؟</string>
+ <string name="turn_on_bluetooth_dialog_message">برای وصل شدن به دستگاه همراه، خودرویتان به بلوتوث نیاز دارد.</string>
+ <string name="accept">پذیرفتن</string>
+ <string name="reject">رد کردن</string>
+ <string name="confirm">تأیید کردن</string>
+ <string name="cancel">لغو کردن</string>
+ <string name="remove">برداشتن</string>
+ <string name="ok">تأیید</string>
+ <string name="connection">اتصال</string>
+ <string name="forget_title">فراموش کردن این دستگاه</string>
+ <string name="forget">فراموش شود</string>
+ <string name="disable">غیرفعال کردن</string>
+ <string name="enable">فعال کردن</string>
+ <string name="continue_button">ادامه دادن</string>
+ <string name="retry">امتحان مجدد</string>
+ <string name="turn_on">روشن کردن</string>
+ <string name="not_now">الآن نه</string>
+ <string name="connected">متصل</string>
+ <string name="notDetected">چیزی شناسایی نشد</string>
+ <string name="disconnected">قطع اتصال</string>
+ <string name="unknown">نامشخص</string>
+ <string name="app_running_msg_channel_name">سرویس پیامک تلفن درحال اجرا است</string>
+ <string name="app_running_msg_notification_title">سرویس پیامک تلفن فعال است</string>
+ <string name="app_running_msg_notification_content">درحال دریافت پیامک‌ها ازطریق دستگاه همراه</string>
+ <string name="trusted_device_feature_title">باز کردن قفل نمایه با تلفن</string>
+ <string name="trusted_device_feature_instruction">برای تنظیم گزینه‌های باز کردن قفل، «برنامه همراه» را بررسی کنید</string>
+ <string name="trusted_device_item_title">به &lt;b&gt;%1$s&lt;/b&gt; اجازه دهید قفل نمایه‌تان را باز کند</string>
+ <string name="device_not_connected_dialog_title">تلفنتان باید اتصال فعالی داشته باشد</string>
+ <string name="device_not_connected_dialog_message">برای روشن کردن این ویژگی، مطمئن شوید بلوتوث خودرو و تلفن روشن است و نزدیک یکدیگر هستند</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; اکنون می‌تواند قفل نمایه‌تان را باز کند</string>
+ <string name="create_profile_lock_dialog_title">ایجاد قفل نمایه اصلی</string>
+ <string name="create_profile_lock_dialog_message">برای باز کردن قفل نمایه بااستفاده از تلفن، به قفل نمایه اصلی به‌عنوان پشتیبان نیاز دارید</string>
+ <string name="unlock_profile_to_finish_title">برای اتمام این مرحله، قفل نمایه‌تان را باز کنید</string>
+ <string name="unlock_profile_to_finish_message">قفل نمایه جدیدی ایجاد کرده‌اید. در مرحله بعد، برای تأیید اینکه تلفنتان می‌تواند به‌طور خودکار قفل نمایه را باز کند، آن را دوباره وارد کنید</string>
+ <string name="disable_device_connection_text">قطع اتصال این دستگاه</string>
+ <string name="enable_device_connection_text">اتصال مجدد این دستگاه</string>
+ <string name="trusted_device_notification_channel_name">باز کردن قفل با تلفن</string>
+ <string name="trusted_device_notification_title">اجازه به تلفن برای باز کردن قفل نمایه</string>
+ <string name="trusted_device_notification_content">برای اجازه به این ویژگی، اینجا ضربه بزنید</string>
+ <string name="trusted_device_enrollment_error_dialog_title">مشکلی پیش آمد</string>
+ <string name="trusted_device_enrollment_error_dialog_message">متأسفانه، در این لحظه امکان روشن کردن این ویژگی وجود ندارد. لطفاً دوباره امتحان کنید.</string>
+ <string name="create_phone_lock_dialog_title">ایجاد قفل صفحه در تلفن</string>
+ <string name="create_phone_lock_dialog_message">قفل صفحه تلفن شما تنظیم نشده است. برای باز کردن قفل نمایه خودرو با تلفن، ابتدا در تنظیمات تلفن خود قفل صفحه (گذرنویسه هم گفته می‌شود) ایجاد کنید.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d پیام جدید</item>
+ <item quantity="other">%d پیام جدید</item>
+ </plurals>
+ <string name="name_not_available">نام دردسترس نیست</string>
</resources>
diff --git a/companiondevice/res/values-fi/strings.xml b/companiondevice/res/values-fi/strings.xml
index c9392c6..191e9c6 100644
--- a/companiondevice/res/values-fi/strings.xml
+++ b/companiondevice/res/values-fi/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Yhdistetty laite"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Lisää yhdistetty laite"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Yhdistä kumppanilaite"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Voit käyttää puhelintasi kumppanilaitteena ajokokemuksen apuna"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Varmista, että puhelimeesi on asennettu "<b>"kumppanisovellus"</b></string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Vahvista koodi puhelimella"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Vahvista, että tämä vastaa puhelimessa näkyvää koodia"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Laitteen yhdistäminen onnistui"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Avaa sovellus ja yhdistä: &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Avaa sovellus ja seuraa sen ohjeita"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Unohdetaanko &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Tämän auton ja laitteen välille ei enää muodosteta laiteparia. Lisäksi sinun on poistettava tämä auto kumppanisovelluksesta."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> unohdettu"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Unohtaminen ei onnistunut: <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Jatka käyttöönottoa puhelimella"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Jotain meni pieleen"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Näyttöä ei voitu näyttää oikein. Yritä uudelleen."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Laita Bluetooth päälle"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Jotta puhelin voidaan määrittää kumppanilaitteeksi, autossa on oltava Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Laitetaanko Bluetooth päälle?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Jotta auto voi yhdistää kumppanilaitteeseen, siinä on oltava Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Hyväksy"</string>
- <string name="reject" msgid="4315432282758892890">"Hylkää"</string>
- <string name="confirm" msgid="3748997214719276945">"Vahvista"</string>
- <string name="cancel" msgid="4306609731174629323">"Peruuta"</string>
- <string name="remove" msgid="5513398257088729188">"Poista"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Yhteys"</string>
- <string name="forget_title" msgid="3027608547243824729">"Unohda tämä laite"</string>
- <string name="forget" msgid="2069897665699141222">"Unohda"</string>
- <string name="disable" msgid="4619854429066283970">"Poista käytöstä"</string>
- <string name="enable" msgid="7656386199154111316">"Ota käyttöön"</string>
- <string name="continue_button" msgid="2748318968566159950">"Jatka"</string>
- <string name="retry" msgid="3783419451480721367">"Yritä uudelleen"</string>
- <string name="turn_on" msgid="4288754850470994812">"Laita päälle"</string>
- <string name="not_now" msgid="8764692269093707622">"Ei nyt"</string>
- <string name="connected" msgid="8051190714042020471">"Yhdistetty"</string>
- <string name="notDetected" msgid="4115229772085594506">"Ei havaittu"</string>
- <string name="disconnected" msgid="8526513868622591894">"Yhteys katkaistu"</string>
- <string name="unknown" msgid="555736316465118024">"Tuntematon"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Puhelimen tekstiviestipalvelu käynnissä"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Puhelimen tekstiviestipalvelu on aktiivinen"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Tekstiviestejä vastaanotetaan kumppanilaitteen kautta"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Avaa profiilin lukitus puhelimella"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Määritä lukituksen avausasetukset kumppanisovelluksessa"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; saa avata profiilini lukituksen"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Puhelimen on oltava yhdistetty aktiivisesti"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Jos haluat ottaa tämän ominaisuuden käyttöön, varmista että puhelimen ja auton Bluetooth on päällä ja ne ovat lähellä toisiaan"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; voi nyt avata profiilisi lukituksen"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Luo ensisijainen profiilin lukitus"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Jotta voit avata profiilin lukituksen puhelimella, tarvitset varalle ensisijaisen profiilin lukituksen"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Viimeistele avaamalla profiilisi lukitus"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Olet luonut uuden profiilin lukituksen. Lisää se uudelleen vahvistaaksesi, että puhelimesi voi avata profiilisi lukituksen automaattisesti."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Katkaise tämän laitteen yhteys"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Yhdistä tähän laitteeseen uudestaan"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Avaa lukitus puhelimella"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Anna puhelimen avata profiilisi lukitus"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Valtuuta tämä ominaisuus napauttamalla tätä"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Jotain meni pieleen"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Tätä ominaisuutta ei voitu ottaa käyttöön tällä hetkellä. Yritä uudelleen."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Luo näytön lukitus puhelimella"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Puhelimeen ei ole asetettu näytön lukitusta. Jos haluat avata auton profiilin lukituksen puhelimella, luo ensin näytön lukitus (tunnetaan myös nimellä tunnuskoodi) puhelimen asetuksissa."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Yhdistetty laite</string>
+ <string name="add_device_title">Lisää yhdistetty laite</string>
+ <string name="add_associated_device_title">Yhdistä kumppanilaite</string>
+ <string name="add_associated_device_instruction">Voit käyttää puhelintasi kumppanilaitteena ajokokemuksen apuna</string>
+ <string name="associated_device_install_app">Varmista, että puhelimeesi on asennettu <b>kumppanisovellus</b></string>
+ <string name="associated_device_pairing_code_title">Vahvista koodi puhelimella</string>
+ <string name="associated_device_pairing_message">Vahvista, että tämä vastaa puhelimessa näkyvää koodia</string>
+ <string name="associated_device_success">Laitteen yhdistäminen onnistui</string>
+ <string name="associated_device_select_device">Avaa sovellus ja yhdistä &lt;b&gt;%1$s&lt;b&gt;</string>
+ <string name="associated_device_open_app">Avaa sovellus ja seuraa sen ohjeita</string>
+ <string name="remove_associated_device_title">Unohdetaanko &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Tämän auton ja laitteen välille ei enää muodosteta laiteparia. Lisäksi sinun on poistettava tämä auto kumppanisovelluksesta.</string>
+ <string name="device_removed_success_toast_text">%1$s unohdettu</string>
+ <string name="device_removed_failure_toast_text">Unohtaminen ei onnistunut: %1$s</string>
+ <string name="continue_setup_toast_text">Jatka käyttöönottoa puhelimella</string>
+ <string name="error_screen_title">Jotain meni vikaan</string>
+ <string name="error_screen_message">Näyttöä ei voitu näyttää oikein. Yritä uudelleen.</string>
+ <string name="turn_on_bluetooth_title">Laita Bluetooth päälle</string>
+ <string name="turn_on_bluetooth_message">Jotta puhelin voidaan määrittää kumppanilaitteeksi, autossa on oltava Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Laitetaanko Bluetooth päälle?</string>
+ <string name="turn_on_bluetooth_dialog_message">Jotta auto voi yhdistää kumppanilaitteeseen, siinä on oltava Bluetooth.</string>
+ <string name="accept">Hyväksy</string>
+ <string name="reject">Hylkää</string>
+ <string name="confirm">Vahvista</string>
+ <string name="cancel">Peru</string>
+ <string name="remove">Poista</string>
+ <string name="ok">OK</string>
+ <string name="connection">Yhteys</string>
+ <string name="forget_title">Unohda tämä laite</string>
+ <string name="forget">Unohda</string>
+ <string name="disable">Poista käytöstä</string>
+ <string name="enable">Ota käyttöön</string>
+ <string name="continue_button">Jatka</string>
+ <string name="retry">Yritä uudelleen</string>
+ <string name="turn_on">Laita päälle</string>
+ <string name="not_now">Ei nyt</string>
+ <string name="connected">Yhdistetty</string>
+ <string name="notDetected">Ei havaittu</string>
+ <string name="disconnected">Yhteys katkaistu</string>
+ <string name="unknown">Tuntematon</string>
+ <string name="app_running_msg_channel_name">Puhelimen tekstiviestipalvelu käynnissä</string>
+ <string name="app_running_msg_notification_title">Puhelimen tekstiviestipalvelu on aktiivinen</string>
+ <string name="app_running_msg_notification_content">Tekstiviestejä vastaanotetaan kumppanilaitteen kautta</string>
+ <string name="trusted_device_feature_title">Avaa profiilin lukitus puhelimella</string>
+ <string name="trusted_device_feature_instruction">Valitse lukituksen avausasetukset kumppanisovelluksessa</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; saa avata profiilini lukituksen</string>
+ <string name="device_not_connected_dialog_title">Puhelimen on oltava yhdistetty aktiivisesti</string>
+ <string name="device_not_connected_dialog_message">Jos haluat ottaa tämän ominaisuuden käyttöön, varmista että puhelimen ja auton Bluetooth on päällä ja ne ovat lähellä toisiaan</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; voi nyt avata profiilisi lukituksen</string>
+ <string name="create_profile_lock_dialog_title">Luo ensisijainen profiilin lukitus</string>
+ <string name="create_profile_lock_dialog_message">Jotta voit avata profiilin lukituksen puhelimella, tarvitset varalle ensisijaisen profiilin lukituksen</string>
+ <string name="unlock_profile_to_finish_title">Viimeistele avaamalla profiilisi lukitus</string>
+ <string name="unlock_profile_to_finish_message">Olet luonut uuden profiilin lukituksen. Lisää se uudelleen vahvistaaksesi, että puhelimesi voi avata profiilisi lukituksen automaattisesti.</string>
+ <string name="disable_device_connection_text">Katkaise tämän laitteen yhteys</string>
+ <string name="enable_device_connection_text">Yhdistä tähän laitteeseen uudestaan</string>
+ <string name="trusted_device_notification_channel_name">Avaa lukitus puhelimella</string>
+ <string name="trusted_device_notification_title">Anna puhelimen avata profiilisi lukitus</string>
+ <string name="trusted_device_notification_content">Valtuuta tämä ominaisuus napauttamalla tästä</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Jotain meni vikaan</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Tätä ominaisuutta ei voitu laittaa päälle tällä hetkellä. Yritä uudelleen.</string>
+ <string name="create_phone_lock_dialog_title">Luo näytön lukitus puhelimella</string>
+ <string name="create_phone_lock_dialog_message">Puhelimeen ei ole asetettu näytön lukitusta. Jos haluat avata auton profiilin lukituksen puhelimella, luo ensin näytön lukitus (tunnetaan myös nimellä tunnuskoodi) puhelimen asetuksissa.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Uusi viesti</item>
+ <item quantity="other">%d uutta viestiä</item>
+ </plurals>
+ <string name="name_not_available">Nimi ei ole saatavilla</string>
</resources>
diff --git a/companiondevice/res/values-fr-rCA/strings.xml b/companiondevice/res/values-fr-rCA/strings.xml
index 49b0931..3cf201c 100644
--- a/companiondevice/res/values-fr-rCA/strings.xml
+++ b/companiondevice/res/values-fr-rCA/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Appareil associé"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Ajouter un appareil associé"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Connecter un appareil compagnon"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Vous pouvez utiliser votre téléphone comme appareil compagnon pour vous aider à gérer votre expérience"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Assurez-vous d\'avoir installé l\'"<b>"appli compagnon"</b>" sur votre tél."</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Confirmer le code sur votre téléphone"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Confirmez si ce code correspond à celui affiché sur votre téléphone"</string>
- <string name="associated_device_success" msgid="584760065696870256">"L\'association avec l\'appareil a réussi"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Ouvrez l\'application et connectez-la à &lt;b&amp;gt<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Ouvrez l\'appli et suivez les instructions"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Oublier &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Cette voiture ne sera plus associée avec cet appareil. Vous devrez aussi supprimer cette voiture dans l\'application compagnon."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> a été oublié"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Échec de l\'oubli de <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Continuez la configuration sur votre téléphone"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Un problème est survenu"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Malheureusement, cet écran n\'a pas pu s\'afficher correctement. Veuillez réessayer."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Activer le Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Pour configurer votre téléphone comme appareil compagnon, vous devez activer le Bluetooth dans votre voiture."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Activer le Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Pour connecter votre appareil compagnon, vous devez activer le Bluetooth dans votre voiture."</string>
- <string name="accept" msgid="1454710793329618813">"Accepter"</string>
- <string name="reject" msgid="4315432282758892890">"Refuser"</string>
- <string name="confirm" msgid="3748997214719276945">"Confirmer"</string>
- <string name="cancel" msgid="4306609731174629323">"Annuler"</string>
- <string name="remove" msgid="5513398257088729188">"Supprimer"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Connexion"</string>
- <string name="forget_title" msgid="3027608547243824729">"Oublier cet appareil"</string>
- <string name="forget" msgid="2069897665699141222">"Oublier"</string>
- <string name="disable" msgid="4619854429066283970">"Désactiver"</string>
- <string name="enable" msgid="7656386199154111316">"Activer"</string>
- <string name="continue_button" msgid="2748318968566159950">"Continuer"</string>
- <string name="retry" msgid="3783419451480721367">"Réessayer"</string>
- <string name="turn_on" msgid="4288754850470994812">"Activer"</string>
- <string name="not_now" msgid="8764692269093707622">"Pas maintenant"</string>
- <string name="connected" msgid="8051190714042020471">"Connecté"</string>
- <string name="notDetected" msgid="4115229772085594506">"Non détecté"</string>
- <string name="disconnected" msgid="8526513868622591894">"Déconnecté"</string>
- <string name="unknown" msgid="555736316465118024">"Inconnu"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Le service de messagerie texte du téléphone est en cours d\'exécution"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Le service de messagerie texte du téléphone est actif"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"La réception des messages texte s\'effectue par l\'appareil compagnon"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Déverrouiller le profil avec le téléphone"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Vous pouvez définir les options de déverrouillage dans l\'application compagnon"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Autoriser « <xliff:g id="PHONE_NAME">%1$s</xliff:g> » à déverrouiller mon profil"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Votre téléphone doit être connecté"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Pour activer cette fonctionnalité, assurez-vous que le Bluetooth est activé sur la voiture et le téléphone, et qu\'ils sont à proximité l\'un de l\'autre"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"« <xliff:g id="PHONE_NAME">%1$s</xliff:g> » peut maintenant déverrouiller votre profil"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Configurer un mode de verrouillage pour le profil"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Pour utiliser votre téléphone afin de déverrouiller votre profil, vous devez utiliser un mode de verrouillage de profil comme mesure de sécurité"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Pour terminer, déverrouiller votre profil"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Vous avez configuré un nouveau verrouillage de profil. Entrez-le de nouveau pour confirmer que votre téléphone peut le déverrouiller automatiquement"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Déconnecter cet appareil"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Reconnecter cet appareil"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Déverrouiller avec le téléphone"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Autoriser votre téléphone à déverrouiller votre profil"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Touchez ici pour autoriser l\'utilisation de cette fonctionnalité"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Un problème est survenu"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Malheureusement, cette fonctionnalité ne peut pas être activée pour le moment. Veuillez réessayer."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Configurer un verrouill. d\'écran sur votre téléphone"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Le verrouillage d\'écran n\'est pas configuré sur votre téléphone. Pour déverrouiller le profil de votre voiture avec votre téléphone, commencez par configurer un verrouillage d\'écran dans les paramètres de votre téléphone."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Appareil associé</string>
+ <string name="add_device_title">Ajouter un appareil associé</string>
+ <string name="add_associated_device_title">Connecter un appareil compagnon</string>
+ <string name="add_associated_device_instruction">Vous pouvez utiliser votre téléphone comme appareil compagnon pour vous aider à gérer votre expérience</string>
+ <string name="associated_device_install_app">Assurez-vous d\'avoir installé l\'<b>appli compagnon</b> sur votre tél.</string>
+ <string name="associated_device_pairing_code_title">Confirmer le code sur votre téléphone</string>
+ <string name="associated_device_pairing_message">Confirmez si ce code correspond à celui affiché sur votre téléphone</string>
+ <string name="associated_device_success">L\'association avec l\'appareil a réussi</string>
+ <string name="associated_device_select_device">Ouvrez l\'application et connectez-la à &lt;b&gt;%1$s&lt;b&gt;</string>
+ <string name="associated_device_open_app">Ouvrez l\'application et suivez les instructions</string>
+ <string name="remove_associated_device_title">Oublier &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Cette voiture ne sera plus associée avec cet appareil. Vous devrez aussi supprimer cette voiture dans l\'application compagnon.</string>
+ <string name="device_removed_success_toast_text">%1$s a été oublié</string>
+ <string name="device_removed_failure_toast_text">Échec de l\'oubli de %1$s</string>
+ <string name="continue_setup_toast_text">Continuez la configuration sur votre téléphone</string>
+ <string name="error_screen_title">Un problème est survenu</string>
+ <string name="error_screen_message">Malheureusement, cet écran n\'a pas pu s\'afficher correctement. Veuillez réessayer.</string>
+ <string name="turn_on_bluetooth_title">Activer le Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Pour configurer votre téléphone comme appareil compagnon, vous devez activer le Bluetooth dans votre voiture.</string>
+ <string name="turn_on_bluetooth_dialog_title">Activer le Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Pour connecter votre appareil compagnon, vous devez activer le Bluetooth dans votre voiture.</string>
+ <string name="accept">Accepter</string>
+ <string name="reject">Refuser</string>
+ <string name="confirm">Confirmer</string>
+ <string name="cancel">Annuler</string>
+ <string name="remove">Retirer</string>
+ <string name="ok">OK</string>
+ <string name="connection">Connexion</string>
+ <string name="forget_title">Oublier cet appareil</string>
+ <string name="forget">Oublier</string>
+ <string name="disable">Désactiver</string>
+ <string name="enable">Activer</string>
+ <string name="continue_button">Continuer</string>
+ <string name="retry">Réessayer</string>
+ <string name="turn_on">Activer</string>
+ <string name="not_now">Pas maintenant</string>
+ <string name="connected">Connecté</string>
+ <string name="notDetected">Non détecté</string>
+ <string name="disconnected">Déconnecté</string>
+ <string name="unknown">Inconnu</string>
+ <string name="app_running_msg_channel_name">Le service de messagerie texte du téléphone est en cours d\'exécution</string>
+ <string name="app_running_msg_notification_title">Le service de messagerie texte du téléphone est actif</string>
+ <string name="app_running_msg_notification_content">La réception des messages texte s\'effectue par l\'appareil compagnon</string>
+ <string name="trusted_device_feature_title">Déverrouiller le profil avec le téléphone</string>
+ <string name="trusted_device_feature_instruction">Vous pouvez définir les options de déverrouillage dans l\'application compagnon</string>
+ <string name="trusted_device_item_title">Autoriser &lt;b&gt;%1$s&lt;/b&gt; à déverrouiller mon profil</string>
+ <string name="device_not_connected_dialog_title">Votre téléphone doit être connecté</string>
+ <string name="device_not_connected_dialog_message">Pour activer cette fonctionnalité, assurez-vous que le Bluetooth est activé sur la voiture et le téléphone, et qu\'ils sont à proximité l\'un de l\'autre</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; peut maintenant déverrouiller votre profil</string>
+ <string name="create_profile_lock_dialog_title">Configurer un mode de verrouillage pour le profil</string>
+ <string name="create_profile_lock_dialog_message">Pour utiliser votre téléphone afin de déverrouiller votre profil, vous devez utiliser un mode de verrouillage de profil comme mesure de sécurité</string>
+ <string name="unlock_profile_to_finish_title">Pour terminer, déverrouiller votre profil</string>
+ <string name="unlock_profile_to_finish_message">Vous avez configuré un nouveau verrouillage de profil. Entrez-le de nouveau pour confirmer que votre téléphone peut le déverrouiller automatiquement</string>
+ <string name="disable_device_connection_text">Déconnecter cet appareil</string>
+ <string name="enable_device_connection_text">Reconnecter cet appareil</string>
+ <string name="trusted_device_notification_channel_name">Déverrouiller avec le téléphone</string>
+ <string name="trusted_device_notification_title">Autoriser votre téléphone à déverrouiller votre profil</string>
+ <string name="trusted_device_notification_content">Touchez ici pour autoriser l\'utilisation de cette fonctionnalité</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Un problème est survenu</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Malheureusement, cette fonctionnalité ne peut pas être activée pour le moment. Veuillez réessayer.</string>
+ <string name="create_phone_lock_dialog_title">Configurer un verrouill. d\'écran sur votre téléphone</string>
+ <string name="create_phone_lock_dialog_message">Le verrouillage d\'écran n\'est pas configuré sur votre téléphone. Pour déverrouiller le profil de votre voiture avec votre téléphone, commencez par configurer un verrouillage d\'écran (aussi appelé mot de passe) dans les paramètres de votre téléphone.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d nouveau message</item>
+ <item quantity="other">%d nouveaux messages</item>
+ </plurals>
+ <string name="name_not_available">Nom indisponible</string>
</resources>
diff --git a/companiondevice/res/values-fr/strings.xml b/companiondevice/res/values-fr/strings.xml
index d625be4..deeac61 100644
--- a/companiondevice/res/values-fr/strings.xml
+++ b/companiondevice/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Appareil associé"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Ajouter un appareil associé"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Connecter un appareil associé"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Vous pouvez utiliser votre téléphone comme appareil associé pour gérer votre expérience de conduite"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Assurez-vous que l\'"<b>"application associée"</b>" est installée"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Confirmer le code sur le téléphone"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Assurez-vous que ce code correspond bien à celui affiché sur votre téléphone"</string>
- <string name="associated_device_success" msgid="584760065696870256">"L\'appareil a bien été associé"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Ouvrez l\'appli et connectez-vous à <xliff:g id="CAR_NAME">%1$s</xliff:g>"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Ouvrez l\'appli et suivez les instructions"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Supprimer &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; ?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Ce véhicule ne sera plus associé à cet appareil. Vous devrez également le supprimer de l\'application associée."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Le téléphone \"<xliff:g id="PHONE_NAME">%1$s</xliff:g>\" a été supprimé"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Échec de la suppression du téléphone \"<xliff:g id="PHONE_NAME">%1$s</xliff:g>\""</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Continuez la configuration sur votre téléphone"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Un problème est survenu"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Malheureusement, cet écran n\'a pas pu s\'afficher correctement. Veuillez réessayer."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Activer le Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Pour configurer votre téléphone en tant qu\'appareil associé, votre véhicule doit être équipé du Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Activer le Bluetooth ?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Pour que vous puissiez vous connecter à votre appareil associé, votre véhicule doit être équipé du Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Accepter"</string>
- <string name="reject" msgid="4315432282758892890">"Refuser"</string>
- <string name="confirm" msgid="3748997214719276945">"Confirmer"</string>
- <string name="cancel" msgid="4306609731174629323">"Annuler"</string>
- <string name="remove" msgid="5513398257088729188">"Supprimer"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Connexion"</string>
- <string name="forget_title" msgid="3027608547243824729">"Supprimer cet appareil"</string>
- <string name="forget" msgid="2069897665699141222">"Supprimer"</string>
- <string name="disable" msgid="4619854429066283970">"Désactiver"</string>
- <string name="enable" msgid="7656386199154111316">"Activer"</string>
- <string name="continue_button" msgid="2748318968566159950">"Continuer"</string>
- <string name="retry" msgid="3783419451480721367">"Réessayer"</string>
- <string name="turn_on" msgid="4288754850470994812">"Activer"</string>
- <string name="not_now" msgid="8764692269093707622">"Pas maintenant"</string>
- <string name="connected" msgid="8051190714042020471">"Associé"</string>
- <string name="notDetected" msgid="4115229772085594506">"Non détecté"</string>
- <string name="disconnected" msgid="8526513868622591894">"Déconnecté"</string>
- <string name="unknown" msgid="555736316465118024">"Inconnu"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Service de SMS du téléphone en cours d\'exécution"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Le service de SMS du téléphone est actif"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Recevoir des SMS via l\'appareil associé"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Déverr. profil avec le téléphone"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Consultez votre application associée pour définir les options de déverrouillage"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Autoriser &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; à déverrouiller mon profil"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"La connexion de votre téléphone doit être active"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Pour activer cette fonctionnalité, placez votre téléphone à proximité de votre voiture et assurez-vous que le Bluetooth est activé sur les deux"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; peut à présent déverrouiller votre profil"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Définir un verrouillage de profil principal"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Pour pouvoir déverrouiller votre profil avec votre téléphone, vous devez définir un verrouillage de profil principal de secours"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Déverrouiller votre profil pour terminer"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Vous avez défini un autre verrouillage de profil. Ressaisissez-le pour confirmer que votre téléphone peut déverrouiller votre profil automatiquement."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Déconnecter cet appareil"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Reconnecter cet appareil"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Déverrouiller avec le téléphone"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Autoriser le téléphone à déverrouiller le profil"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Appuyez ici pour activer cette fonctionnalité"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Un problème est survenu"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Malheureusement, cette fonctionnalité n\'a pas pu être activée. Veuillez réessayer."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Définir le verrouillage de l\'écran"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Le verrouillage de l\'écran n\'est pas configuré sur votre téléphone. Pour déverrouiller le profil du véhicule sur votre téléphone, commencez par définir le verrouillage de l\'écran (aussi appelé \"code secret\") dans les paramètres de votre appareil."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Appareil associé</string>
+ <string name="add_device_title">Ajouter un appareil associé</string>
+ <string name="add_associated_device_title">Connecter un appareil associé</string>
+ <string name="add_associated_device_instruction">Vous pouvez utiliser votre téléphone comme appareil associé pour gérer votre expérience de conduite</string>
+ <string name="associated_device_install_app">Vérifiez que l\'<b>appli associée</b> est installée sur le téléphone</string>
+ <string name="associated_device_pairing_code_title">Confirmer le code sur le téléphone</string>
+ <string name="associated_device_pairing_message">Assurez-vous que ce code correspond bien à celui affiché sur votre téléphone</string>
+ <string name="associated_device_success">L\'appareil a bien été associé</string>
+ <string name="associated_device_select_device">Ouvrez l\'appli et connectez-vous à &lt;b&gt;%1$s&lt;b&gt;</string>
+ <string name="associated_device_open_app">Ouvrez l\'appli et suivez les instructions</string>
+ <string name="remove_associated_device_title">Supprimer &lt;b&gt;%1$s&lt;/b&gt; ?</string>
+ <string name="remove_associated_device_message">Ce véhicule ne sera plus associé à cet appareil. Vous devrez également le supprimer de l\'application associée.</string>
+ <string name="device_removed_success_toast_text">Le téléphone %1$s a été supprimé</string>
+ <string name="device_removed_failure_toast_text">Échec de la suppression du téléphone %1$s</string>
+ <string name="continue_setup_toast_text">Continuez la configuration sur votre téléphone</string>
+ <string name="error_screen_title">Un problème est survenu</string>
+ <string name="error_screen_message">Malheureusement, cet écran n\'a pas pu s\'afficher correctement. Veuillez réessayer.</string>
+ <string name="turn_on_bluetooth_title">Activer le Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Pour configurer votre téléphone en tant qu\'appareil associé, votre véhicule doit être équipé du Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Activer le Bluetooth ?</string>
+ <string name="turn_on_bluetooth_dialog_message">Pour que vous puissiez vous connecter à votre appareil associé, votre véhicule doit être équipé du Bluetooth.</string>
+ <string name="accept">Accepter</string>
+ <string name="reject">Refuser</string>
+ <string name="confirm">Confirmer</string>
+ <string name="cancel">Annuler</string>
+ <string name="remove">Supprimer</string>
+ <string name="ok">OK</string>
+ <string name="connection">Connexion</string>
+ <string name="forget_title">Supprimer cet appareil</string>
+ <string name="forget">Supprimer</string>
+ <string name="disable">Désactiver</string>
+ <string name="enable">Activer</string>
+ <string name="continue_button">Continuer</string>
+ <string name="retry">Réessayer</string>
+ <string name="turn_on">Activer</string>
+ <string name="not_now">Pas maintenant</string>
+ <string name="connected">Connecté</string>
+ <string name="notDetected">Non détecté</string>
+ <string name="disconnected">Déconnecté</string>
+ <string name="unknown">Inconnu</string>
+ <string name="app_running_msg_channel_name">Service de SMS du téléphone en cours d\'exécution</string>
+ <string name="app_running_msg_notification_title">Le service de SMS du téléphone est actif</string>
+ <string name="app_running_msg_notification_content">Réception de SMS via l\'appareil associé</string>
+ <string name="trusted_device_feature_title">Déverrouiller profil avec le téléphone</string>
+ <string name="trusted_device_feature_instruction">Consultez votre application associée pour définir les options de déverrouillage</string>
+ <string name="trusted_device_item_title">Autoriser &lt;b&gt;%1$s&lt;/b&gt; à déverrouiller mon profil</string>
+ <string name="device_not_connected_dialog_title">La connexion de votre téléphone doit être active</string>
+ <string name="device_not_connected_dialog_message">Pour activer cette fonctionnalité, placez votre téléphone à proximité de votre voiture et assurez-vous que le Bluetooth est activé sur les deux</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; peut désormais déverrouiller votre profil</string>
+ <string name="create_profile_lock_dialog_title">Définir un verrouillage de profil principal</string>
+ <string name="create_profile_lock_dialog_message">Pour pouvoir déverrouiller votre profil avec votre téléphone, vous devez définir un verrouillage de profil principal de secours</string>
+ <string name="unlock_profile_to_finish_title">Déverrouiller votre profil pour terminer</string>
+ <string name="unlock_profile_to_finish_message">Vous avez défini un autre verrouillage de profil. Ressaisissez-le pour confirmer que votre téléphone peut déverrouiller votre profil automatiquement.</string>
+ <string name="disable_device_connection_text">Déconnecter cet appareil</string>
+ <string name="enable_device_connection_text">Reconnecter cet appareil</string>
+ <string name="trusted_device_notification_channel_name">Déverrouiller avec le téléphone</string>
+ <string name="trusted_device_notification_title">Autoriser le téléphone à déverrouiller le profil</string>
+ <string name="trusted_device_notification_content">Appuyez ici pour activer cette fonctionnalité</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Un problème est survenu</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Malheureusement, cette fonctionnalité n\'a pas pu être activée. Veuillez réessayer.</string>
+ <string name="create_phone_lock_dialog_title">Définir le verrouillage de l\'écran</string>
+ <string name="create_phone_lock_dialog_message">Le verrouillage de l\'écran n\'est pas configuré sur votre téléphone. Pour déverrouiller le profil du véhicule sur votre téléphone, commencez par définir le verrouillage de l\'écran (aussi appelé \"code secret\") dans les paramètres de votre appareil.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d nouveau message</item>
+ <item quantity="other">%d nouveaux messages</item>
+ </plurals>
+ <string name="name_not_available">Nom indisponible</string>
</resources>
diff --git a/companiondevice/res/values-gl/strings.xml b/companiondevice/res/values-gl/strings.xml
index 799c40c..106bebf 100644
--- a/companiondevice/res/values-gl/strings.xml
+++ b/companiondevice/res/values-gl/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Dispositivo asociado"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Engadir dispositivo asociado"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Conectar un dispositivo complementario"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Podes usar o teléfono como un complemento que che axude a xestionar a experiencia de condución"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Asegúrate de ter a "<b>"aplicación complementaria"</b>" no teléfono"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Confirmar o código do teléfono"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Confirma que este código coincide co que che aparece no teléfono"</string>
- <string name="associated_device_success" msgid="584760065696870256">"O dispositivo asociouse correctamente"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Abre a app e conéctate a &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Abre a aplicación e sigue as instrucións"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Queres esquecer &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Este coche deixará de estar vinculado con este dispositivo. Ademais, terás que quitalo da aplicación complementaria."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Esqueceuse o teléfono <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Produciuse un erro ao esquecer o teléfono <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Continúa coa configuración no teléfono"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Produciuse un erro"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Non se puido mostrar esta pantalla correctamente. Téntao de novo."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Activar Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"O teu coche necesita Bluetooth para poder configurar o teu teléfono como dispositivo complementario."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Queres activar o Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"O teu coche necesita Bluetooth para poder conectarse ao teu dispositivo complementario."</string>
- <string name="accept" msgid="1454710793329618813">"Aceptar"</string>
- <string name="reject" msgid="4315432282758892890">"Rexeitar"</string>
- <string name="confirm" msgid="3748997214719276945">"Confirmar"</string>
- <string name="cancel" msgid="4306609731174629323">"Cancelar"</string>
- <string name="remove" msgid="5513398257088729188">"Quitar"</string>
- <string name="ok" msgid="2825038997730899083">"Aceptar"</string>
- <string name="connection" msgid="2798490936433656846">"Conexión"</string>
- <string name="forget_title" msgid="3027608547243824729">"Esquecer este dispositivo"</string>
- <string name="forget" msgid="2069897665699141222">"Esquecer"</string>
- <string name="disable" msgid="4619854429066283970">"Desactivar"</string>
- <string name="enable" msgid="7656386199154111316">"Activar"</string>
- <string name="continue_button" msgid="2748318968566159950">"Continuar"</string>
- <string name="retry" msgid="3783419451480721367">"Probar de novo"</string>
- <string name="turn_on" msgid="4288754850470994812">"Activar"</string>
- <string name="not_now" msgid="8764692269093707622">"Agora non"</string>
- <string name="connected" msgid="8051190714042020471">"Conectado"</string>
- <string name="notDetected" msgid="4115229772085594506">"Non se detectou"</string>
- <string name="disconnected" msgid="8526513868622591894">"Desconectado"</string>
- <string name="unknown" msgid="555736316465118024">"Descoñecida"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Servizo de mensaxes de texto do teléfono en execución"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Servizo de mensaxes de texto do teléfono activo"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Recibindo mensaxes de texto a través do dispositivo complementario"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Desbloquear o perfil co teléfono"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Accede á aplicación complementaria para configurar as opcións de desbloqueo"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Permitir que o teléfono &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; desbloquee o meu perfil"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"O teu teléfono debe estar activamente conectado"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Para activar esta función, asegúrate de que o teu coche e o teu teléfono teñan o Bluetooth activado e estean preto un do outro"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"O teléfono &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; xa pode desbloquear o teu perfil"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Crear un bloqueo para o perfil principal"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Se queres utilizar o teléfono para desbloquear o teu perfil, debes crear un bloqueo para o perfil principal como medida de seguranza"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Desbloquear o teu perfil para rematar"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Creaches un bloqueo de perfil novo. Agora, volve metelo para confirmar que o teu teléfono pode desbloquear o teu perfil de xeito automático"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Desconectar este dispositivo"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Volver conectar este dispositivo"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Desbloquear co teléfono"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Permitir que o teu teléfono desbloquee o teu perfil"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Toca aquí para autorizar esta función"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Produciuse un erro"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Non se puido activar esta función neste momento. Téntao de novo."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Crear un bloqueo de pantalla no teléfono"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"O teu teléfono non ten configurado ningún bloqueo de pantalla. Para desbloquear o teu perfil do coche co teléfono, crea un bloqueo de pantalla (tamén coñecido como contrasinal) na configuración do teléfono."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Dispositivo asociado</string>
+ <string name="add_device_title">Engadir dispositivo asociado</string>
+ <string name="add_associated_device_title">Conectar un dispositivo complementario</string>
+ <string name="add_associated_device_instruction">Podes usar o teléfono como un complemento que che axude a xestionar a experiencia de condución</string>
+ <string name="associated_device_install_app">Asegúrate de ter a <b>aplicación complementaria</b> no teléfono</string>
+ <string name="associated_device_pairing_code_title">Confirmar o código do teléfono</string>
+ <string name="associated_device_pairing_message">Confirma que este código coincide co que che aparece no teléfono</string>
+ <string name="associated_device_success">O dispositivo asociouse correctamente</string>
+ <string name="associated_device_select_device">Abre a aplicación e conéctate a &lt;b&gt;%1$s&lt;b&gt;</string>
+ <string name="associated_device_open_app">Abre a aplicación e sigue as instrucións</string>
+ <string name="remove_associated_device_title">Queres esquecer &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Este coche deixará de estar vinculado con este dispositivo. Ademais, terás que quitalo da aplicación complementaria.</string>
+ <string name="device_removed_success_toast_text">Esqueceuse o teléfono %1$s</string>
+ <string name="device_removed_failure_toast_text">Produciuse un erro ao esquecer o teléfono %1$s</string>
+ <string name="continue_setup_toast_text">Continúa coa configuración no teléfono</string>
+ <string name="error_screen_title">Produciuse un erro</string>
+ <string name="error_screen_message">Non se puido mostrar esta pantalla correctamente. Téntao de novo.</string>
+ <string name="turn_on_bluetooth_title">Activar Bluetooth</string>
+ <string name="turn_on_bluetooth_message">O teu coche necesita o Bluetooth para poder configurar o teu teléfono como dispositivo complementario.</string>
+ <string name="turn_on_bluetooth_dialog_title">Queres activar o Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">O teu coche necesita o Bluetooth para poder conectarse ao teu dispositivo complementario.</string>
+ <string name="accept">Aceptar</string>
+ <string name="reject">Rexeitar</string>
+ <string name="confirm">Confirmar</string>
+ <string name="cancel">Cancelar</string>
+ <string name="remove">Quitar</string>
+ <string name="ok">Aceptar</string>
+ <string name="connection">Conexión</string>
+ <string name="forget_title">Esquecer este dispositivo</string>
+ <string name="forget">Esquecer</string>
+ <string name="disable">Desactivar</string>
+ <string name="enable">Activar</string>
+ <string name="continue_button">Continuar</string>
+ <string name="retry">Tentar de novo</string>
+ <string name="turn_on">Activar</string>
+ <string name="not_now">Agora non</string>
+ <string name="connected">Conectado</string>
+ <string name="notDetected">Non se detectou</string>
+ <string name="disconnected">Desconectado</string>
+ <string name="unknown">Descoñecido</string>
+ <string name="app_running_msg_channel_name">Servizo de mensaxes de texto do teléfono en execución</string>
+ <string name="app_running_msg_notification_title">Servizo de mensaxes de texto do teléfono activo</string>
+ <string name="app_running_msg_notification_content">Recibindo mensaxes de texto a través do dispositivo complementario</string>
+ <string name="trusted_device_feature_title">Desbloquear o perfil co teléfono</string>
+ <string name="trusted_device_feature_instruction">Accede á aplicación complementaria para configurar as opcións de desbloqueo</string>
+ <string name="trusted_device_item_title">Deixar que o teléfono &lt;b&gt;%1$s&lt;/b&gt; desbloquee o meu perfil</string>
+ <string name="device_not_connected_dialog_title">O teu teléfono debe estar activamente conectado</string>
+ <string name="device_not_connected_dialog_message">Para activar esta función, asegúrate de que o coche e o teléfono teñan o Bluetooth activado e estean preto un do outro</string>
+ <string name="trusted_device_enrollment_success_message">O teléfono &lt;b&gt;%1$s&lt;/b&gt; agora pode desbloquear o teu perfil.</string>
+ <string name="create_profile_lock_dialog_title">Crear un bloqueo para o perfil principal</string>
+ <string name="create_profile_lock_dialog_message">Se queres utilizar o teléfono para desbloquear o teu perfil, debes crear un bloqueo para o perfil principal como medida de seguranza</string>
+ <string name="unlock_profile_to_finish_title">Desbloquear o teu perfil para rematar</string>
+ <string name="unlock_profile_to_finish_message">Creaches un bloqueo de perfil novo. Agora, volve metelo para confirmar que o teu teléfono pode desbloquear o teu perfil de xeito automático</string>
+ <string name="disable_device_connection_text">Desconectar este dispositivo</string>
+ <string name="enable_device_connection_text">Volver conectar este dispositivo</string>
+ <string name="trusted_device_notification_channel_name">Desbloquear co teléfono</string>
+ <string name="trusted_device_notification_title">Permitir desbloquear o teu perfil co teu teléfono</string>
+ <string name="trusted_device_notification_content">Toca aquí para autorizar esta función</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Produciuse un erro</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Non se puido activar esta función neste momento. Téntao de novo.</string>
+ <string name="create_phone_lock_dialog_title">Crear un bloqueo de pantalla no teléfono</string>
+ <string name="create_phone_lock_dialog_message">O teu teléfono non ten configurado ningún bloqueo de pantalla. Para desbloquear o teu perfil do coche co teléfono, crea un bloqueo de pantalla (tamén coñecido como contrasinal) na configuración do teléfono.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Mensaxe nova</item>
+ <item quantity="other">%d mensaxes novas</item>
+ </plurals>
+ <string name="name_not_available">O nome non está dispoñible</string>
</resources>
diff --git a/companiondevice/res/values-gu/strings.xml b/companiondevice/res/values-gu/strings.xml
index a5316b3..27e3a97 100644
--- a/companiondevice/res/values-gu/strings.xml
+++ b/companiondevice/res/values-gu/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"સંલગ્ન ડિવાઇસ"</string>
- <string name="add_device_title" msgid="6166003577845888151">"સંલગ્ન ડિવાઇસ ઉમેરો"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"સાથી ડિવાઇસને કનેક્ટ કરો"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"તમારા ડ્રાઇવિંગના અનુભવને મેનેજ કરવામાં સહાય મેળવવા તમે તમારા ફોનનો સાથી ડિવાઇસ તરીકે ઉપયોગ કરી શકો"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"તમારા ફોનમાં "<b>"સાથી ઍપ"</b>" ઇન્સ્ટૉલ કરેલી હોવાની ખાતરી કરો"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"ફોન પર કોડ કન્ફર્મ કરો"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"તમારા ફોન પર બતાવેલા કોડ સાથે આનો મેળ બેસતો હોવાનું કન્ફર્મ કરો"</string>
- <string name="associated_device_success" msgid="584760065696870256">"ડિવાઇસ સફળતાપૂર્વક સાચવવામાં આવ્યું"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"ઍપ ખોલી &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; સાથે કનેક્ટ કરો"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"ઍપ ખોલો અને તેમાં આપેલી સૂચનાઓ ફૉલો કરો"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;ને ભૂલી જઈએ?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"આ કારની હવે આ ડિવાઇસ સાથે જોડી બનાવાશે નહીં. ઉપરાંત તમારે આ કારને સાથી ઍપમાંથી કાઢી નાખવી પડશે."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> ભૂલી જવાયો"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g>ને ભૂલી જવામાં નિષ્ફ્ળતા મળી"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"તમારા ફોન પર સેટઅપ ચાલુ રાખો"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"કંઈક ભૂલ થઈ છે"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"કમનસીબે, આ સ્ક્રીન પર યોગ્ય રીતે બતાવી શકાયું નથી. કૃપા કરી ફરી પ્રયાસ કરો."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"બ્લૂટૂથ ચાલુ કરો"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"તમારા ફોનને સાથી ડિવાઇસ તરીકે સેટ કરવા, તમારી કાર માટે બ્લૂટૂથ જરૂરી છે."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"બ્લૂટૂથ ચાલુ કરવું છે?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"તમારું સાથી ડિવાઇસ કનેક્ટ કરવા માટે, તમારી કાર માટે બ્લૂટૂથ જરૂરી છે."</string>
- <string name="accept" msgid="1454710793329618813">"સ્વીકારો"</string>
- <string name="reject" msgid="4315432282758892890">"નકારો"</string>
- <string name="confirm" msgid="3748997214719276945">"કન્ફર્મ કરો"</string>
- <string name="cancel" msgid="4306609731174629323">"રદ કરો"</string>
- <string name="remove" msgid="5513398257088729188">"કાઢી નાખો"</string>
- <string name="ok" msgid="2825038997730899083">"ઓકે"</string>
- <string name="connection" msgid="2798490936433656846">"કનેક્શન"</string>
- <string name="forget_title" msgid="3027608547243824729">"આ ડિવાઇસને ભૂલી જાઓ"</string>
- <string name="forget" msgid="2069897665699141222">"ભૂલી જાઓ"</string>
- <string name="disable" msgid="4619854429066283970">"બંધ કરો"</string>
- <string name="enable" msgid="7656386199154111316">"ચાલુ કરો"</string>
- <string name="continue_button" msgid="2748318968566159950">"આગળ વધો"</string>
- <string name="retry" msgid="3783419451480721367">"ફરી પ્રયાસ કરો"</string>
- <string name="turn_on" msgid="4288754850470994812">"ચાલુ કરો"</string>
- <string name="not_now" msgid="8764692269093707622">"હમણાં નહીં"</string>
- <string name="connected" msgid="8051190714042020471">"કનેક્ટેડ"</string>
- <string name="notDetected" msgid="4115229772085594506">"મળ્યું નથી"</string>
- <string name="disconnected" msgid="8526513868622591894">"ડિસ્કનેક્ટ કર્યું"</string>
- <string name="unknown" msgid="555736316465118024">"અજાણ"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"ફોન ટેક્સ્ટ સંદેશની સેવા ચાલુ છે"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"ફોન ટેક્સ્ટ સંદેશની સેવા સક્રિય છે"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"સાથી ડિવાઇસ દ્વારા ટેક્સ્ટ સંદેશ પ્રાપ્ત કરી રહ્યાં છીએ"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"ફોન વડે પ્રોફાઇલ અનલૉક કરો"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"અનલૉક કરવાના વિકલ્પો સેટ કરવા માટે તમારી સાથી ઍપ તપાસો"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;ને મારી પ્રોફાઇલ અનલૉક કરવા દો"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"તમારો ફોન સક્રિય રીતે કનેક્ટ કરેલો હોવો જરૂરી છે"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"આ સુવિધા ચાલુ કરવા માટે, તમારી કાર અને ફોનમાં બ્લૂટૂથ ચાલુ કરેલું હોવાની અને બંને એકબીજાની નજીક હોવાની ખાતરી કરો"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; હવે તમારી પ્રોફાઇલને અનલૉક કરી શકે છે"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"પ્રાથમિક પ્રોફાઇલ લૉક બનાવો"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"તમારી પ્રોફાઇલ અનલૉક કરવા માટે તમારા ફોનનો ઉપયોગ કરવા, તમારી પાસે બૅકઅપ તરીકે પ્રાથમિક પ્રોફાઇલ લૉક હોવું જરૂરી છે"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"પૂરું કરવા માટે તમારી પ્રોફાઇલ અનલૉક કરો"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"તમે નવું પ્રોફાઇલ લૉક બનાવ્યું છે. પછી, તમારો ફોન ઑટોમૅટિક રીતે તમારી પ્રોફાઇલ અનલૉક કરી શકે તે કન્ફર્મ કરવા માટે તેને ફરીથી દાખલ કરો"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"આ ડિવાઇસ ડિસ્કનેક્ટ કરો"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"આ ડિવાઇસ ફરીથી કનેક્ટ કરો"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"ફોન વડે અનલૉક કરો"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"તમારા ફોનને તમારી પ્રોફાઇલ અનલૉક કરવા દો"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"આ સુવિધા અધિકૃત કરવા માટે અહીં ટૅપ કરો"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"કંઈક ભૂલ થઈ છે"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"કમનસીબે, આ સુવિધા આ સમયે ચાલુ કરી શકાઈ નથી. કૃપા કરી ફરી પ્રયાસ કરો."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"તમારા ફોન પર સ્ક્રીન લૉક બનાવો"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"તમારા ફોનમાં સ્ક્રીન લૉક સેટ કરેલું નથી. તમારા કારની પ્રોફાઇલને તમારા ફોન વડે અનલૉક કરવા માટે, તમારા ફોનના સેટિંગમાં પહેલા સ્ક્રીન લૉક (જે પાસકોડ તરીકે પણ ઓળખાય છે તે) બનાવો."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">સંકળાયેલું ડિવાઇસ</string>
+ <string name="add_device_title">સંકળાયેલું ડિવાઇસ ઉમેરો</string>
+ <string name="add_associated_device_title">સાથી ડિવાઇસને કનેક્ટ કરો</string>
+ <string name="add_associated_device_instruction">તમારા ડ્રાઇવિંગના અનુભવને મેનેજ કરવામાં સહાય મેળવવા તમે તમારા ફોનનો સાથી ડિવાઇસ તરીકે ઉપયોગ કરી શકો</string>
+ <string name="associated_device_install_app">તમારા ફોનમાં <b>સાથી ઍપ</b> ઇન્સ્ટૉલ કરેલી હોવાની ખાતરી કરો</string>
+ <string name="associated_device_pairing_code_title">ફોન પર કોડ કન્ફર્મ કરો</string>
+ <string name="associated_device_pairing_message">તમારા ફોન પર બતાવેલા કોડ સાથે આનો મેળ બેસતો હોવાનું કન્ફર્મ કરો</string>
+ <string name="associated_device_success">ડિવાઇસ સફળતાપૂર્વક સાચવવામાં આવ્યું</string>
+ <string name="associated_device_select_device">ઍપ ખોલી &lt;b&gt;%1$s&lt;/b&gt; સાથે કનેક્ટ કરો</string>
+ <string name="associated_device_open_app">ઍપ ખોલો અને તેમાં આપેલી સૂચનાઓ ફૉલો કરો</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt;ને ભૂલી જઈએ?</string>
+ <string name="remove_associated_device_message">આ કારની હવે આ ડિવાઇસ સાથે જોડી બનાવાશે નહીં. ઉપરાંત તમારે આ કારને સાથી ઍપમાંથી કાઢી નાખવી પડશે.</string>
+ <string name="device_removed_success_toast_text">%1$s ભૂલી જવાયો</string>
+ <string name="device_removed_failure_toast_text">%1$sને ભૂલી જવામાં નિષ્ફળતા મળી</string>
+ <string name="continue_setup_toast_text">તમારા ફોન પર સેટઅપ ચાલુ રાખો</string>
+ <string name="error_screen_title">કંઈક ખોટું થયું</string>
+ <string name="error_screen_message">કમનસીબે, આ સ્ક્રીન પર યોગ્ય રીતે બતાવી શકાયું નથી. કૃપા કરીને ફરી પ્રયાસ કરો.</string>
+ <string name="turn_on_bluetooth_title">બ્લૂટૂથ ચાલુ કરો</string>
+ <string name="turn_on_bluetooth_message">તમારા ફોનને સાથી ડિવાઇસ તરીકે સેટ કરવા, તમારી કારમાં બ્લૂટૂથ જરૂરી છે.</string>
+ <string name="turn_on_bluetooth_dialog_title">બ્લૂટૂથ ચાલુ કરીએ?</string>
+ <string name="turn_on_bluetooth_dialog_message">તમારું સાથી ડિવાઇસ કનેક્ટ કરવા માટે, તમારી કારમાં બ્લૂટૂથ જરૂરી છે.</string>
+ <string name="accept">સ્વીકારો</string>
+ <string name="reject">નકારો</string>
+ <string name="confirm">કન્ફર્મ કરો</string>
+ <string name="cancel">રદ કરો</string>
+ <string name="remove">કાઢી નાખો</string>
+ <string name="ok">ઓકે</string>
+ <string name="connection">કનેક્શન</string>
+ <string name="forget_title">આ ડિવાઇસને ભૂલી જાઓ</string>
+ <string name="forget">ભૂલી જાઓ</string>
+ <string name="disable">બંધ કરો</string>
+ <string name="enable">ચાલુ કરો</string>
+ <string name="continue_button">આગળ વધો</string>
+ <string name="retry">ફરી પ્રયાસ કરો</string>
+ <string name="turn_on">ચાલુ કરો</string>
+ <string name="not_now">હમણાં નહીં</string>
+ <string name="connected">કનેક્ટ કરેલું</string>
+ <string name="notDetected">મળ્યું નથી</string>
+ <string name="disconnected">ડિસ્કનેક્ટ કરેલું</string>
+ <string name="unknown">અજાણ</string>
+ <string name="app_running_msg_channel_name">ફોન ટેક્સ્ટ સંદેશની સેવા ચાલુ છે</string>
+ <string name="app_running_msg_notification_title">ફોન ટેક્સ્ટ સંદેશની સેવા સક્રિય છે</string>
+ <string name="app_running_msg_notification_content">સાથી ડિવાઇસ દ્વારા ટેક્સ્ટ સંદેશ પ્રાપ્ત કરી રહ્યાં છીએ</string>
+ <string name="trusted_device_feature_title">ફોન વડે પ્રોફાઇલ અનલૉક કરો</string>
+ <string name="trusted_device_feature_instruction">અનલૉક કરવાના વિકલ્પો સેટ કરવા માટે તમારી સાથી ઍપ ચેક કરો</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt;ને મારી પ્રોફાઇલ અનલૉક કરવા દો</string>
+ <string name="device_not_connected_dialog_title">તમારો ફોન સક્રિય રીતે કનેક્ટ કરેલો હોવો જરૂરી છે</string>
+ <string name="device_not_connected_dialog_message">આ સુવિધા ચાલુ કરવા માટે, તમારી કાર અને ફોનમાં બ્લૂટૂથ ચાલુ કરેલું હોવાની અને બંને એકબીજાની નજીક હોવાની ખાતરી કરો</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; દ્વારા હવે તમારી પ્રોફાઇલ અનલૉક થઈ શકે છે</string>
+ <string name="create_profile_lock_dialog_title">પ્રાથમિક પ્રોફાઇલ લૉક બનાવો</string>
+ <string name="create_profile_lock_dialog_message">તમારી પ્રોફાઇલ અનલૉક કરવા માટે તમારા ફોનનો ઉપયોગ કરવા, તમારી પાસે બૅકઅપ તરીકે પ્રાથમિક પ્રોફાઇલ લૉક હોવું જરૂરી છે</string>
+ <string name="unlock_profile_to_finish_title">પૂરું કરવા માટે તમારી પ્રોફાઇલ અનલૉક કરો</string>
+ <string name="unlock_profile_to_finish_message">તમે નવું પ્રોફાઇલ લૉક બનાવ્યું છે. પછી, તમારો ફોન ઑટોમૅટિક રીતે તમારી પ્રોફાઇલ અનલૉક કરી શકે તે કન્ફર્મ કરવા માટે તેને ફરીથી દાખલ કરો</string>
+ <string name="disable_device_connection_text">આ ડિવાઇસ ડિસ્કનેક્ટ કરો</string>
+ <string name="enable_device_connection_text">આ ડિવાઇસ ફરીથી કનેક્ટ કરો</string>
+ <string name="trusted_device_notification_channel_name">ફોન વડે અનલૉક કરો</string>
+ <string name="trusted_device_notification_title">તમારા ફોનને તમારી પ્રોફાઇલ અનલૉક કરવા દો</string>
+ <string name="trusted_device_notification_content">આ સુવિધા અધિકૃત કરવા માટે અહીં ટૅપ કરો</string>
+ <string name="trusted_device_enrollment_error_dialog_title">કંઈક ખોટું થયું</string>
+ <string name="trusted_device_enrollment_error_dialog_message">કમનસીબે, આ સુવિધા આ સમયે ચાલુ કરી શકાઈ નથી. કૃપા કરીને ફરી પ્રયાસ કરો.</string>
+ <string name="create_phone_lock_dialog_title">તમારા ફોન પર સ્ક્રીન લૉક બનાવો</string>
+ <string name="create_phone_lock_dialog_message">તમારા ફોનમાં સ્ક્રીન લૉક સેટ કરેલું નથી. તમારા કારની પ્રોફાઇલને તમારા ફોન વડે અનલૉક કરવા માટે, તમારા ફોનના સેટિંગમાં પહેલા સ્ક્રીન લૉક (જે પાસકોડ તરીકે પણ ઓળખાય છે તે) બનાવો.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d નવો સંદેશ</item>
+ <item quantity="other">%d નવા સંદેશા</item>
+ </plurals>
+ <string name="name_not_available">નામ ઉપલબ્ધ નથી</string>
</resources>
diff --git a/companiondevice/res/values-hi/strings.xml b/companiondevice/res/values-hi/strings.xml
index 32bfb0b..0ae7a90 100644
--- a/companiondevice/res/values-hi/strings.xml
+++ b/companiondevice/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"दूसरा डिवाइस"</string>
- <string name="add_device_title" msgid="6166003577845888151">"दूसरा डिवाइस जोड़ें"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"साथी डिवाइस कनेक्ट करें"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"अपना ड्राइविंग अनुभव प्रबंधित करने के लिए, आप फ़ोन का इस्तेमाल साथी डिवाइस के तौर पर कर सकते हैं"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"पक्का करें कि आपके फ़ोन पर "<b>"साथी ऐप्लिकेशन"</b>" इंस्टॉल है"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"फ़ोन पर कोड की पुष्टि करें"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"पुष्टि करें कि यह आपके फ़ोन पर दिखाए गए कोड से मेल खाता है"</string>
- <string name="associated_device_success" msgid="584760065696870256">"डिवाइस को पूरी तरह से जोड़ दिया गया है"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"ऐप्लिकेशन खोलें और <xliff:g id="CAR_NAME">%1$s</xliff:g> से कनेक्ट करें"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"ऐप खोलें और उसमें दिए गए तरीके अपनाएं"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;पूरी तरह से हटाएं?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"यह कार, अब इस डिवाइस के साथ नहीं जोड़ी जाएगी. आपको अलग से, इस कार को साथी ऐप्लिकेशन से हटाना होगा."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> को पूरी तरह से हटाया गया"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> को पूरी तरह से नहीं हटाया गया"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"अपने फ़ोन पर सेट अप जारी रखें"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"काेई गड़बड़ी हुई"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"माफ़ करें, यह स्क्रीन ठीक से नहीं दिखा पा रही है. कृपया दोबारा कोशिश करें."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"ब्लूटूथ चालू करें"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"अपने फ़ोन को साथी डिवाइस के तौर पर सेट अप करने के लिए, आपकी कार में ब्लूटूथ होना ज़रूरी है."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"क्या आप ब्लूटूथ चालू करना चाहते हैं?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"अपने साथी डिवाइस से कनेक्ट करने के लिए, आपकी कार में ब्लूटूथ होना ज़रूरी है."</string>
- <string name="accept" msgid="1454710793329618813">"स्वीकार करें"</string>
- <string name="reject" msgid="4315432282758892890">"अस्वीकार करें"</string>
- <string name="confirm" msgid="3748997214719276945">"पुष्टि करें"</string>
- <string name="cancel" msgid="4306609731174629323">"रद्द करें"</string>
- <string name="remove" msgid="5513398257088729188">"हटाएं"</string>
- <string name="ok" msgid="2825038997730899083">"ठीक है"</string>
- <string name="connection" msgid="2798490936433656846">"कनेक्शन"</string>
- <string name="forget_title" msgid="3027608547243824729">"इस डिवाइस को पूरी तरह से हटाएं"</string>
- <string name="forget" msgid="2069897665699141222">"पूरी तरह से हटाएं"</string>
- <string name="disable" msgid="4619854429066283970">"बंद करें"</string>
- <string name="enable" msgid="7656386199154111316">"चालू करें"</string>
- <string name="continue_button" msgid="2748318968566159950">"जारी रखें"</string>
- <string name="retry" msgid="3783419451480721367">"दोबारा कोशिश करें"</string>
- <string name="turn_on" msgid="4288754850470994812">"चालू करें"</string>
- <string name="not_now" msgid="8764692269093707622">"अभी नहीं"</string>
- <string name="connected" msgid="8051190714042020471">"कनेक्ट हो गया"</string>
- <string name="notDetected" msgid="4115229772085594506">"पता नहीं चला"</string>
- <string name="disconnected" msgid="8526513868622591894">"डिसकनेक्ट किया गया"</string>
- <string name="unknown" msgid="555736316465118024">"अज्ञात"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"फ़ोन की मैसेज सेवा चालू है"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"फ़ोन की मैसेज सेवा चालू है"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"साथी डिवाइस से मैसेज मिल रहे हैं"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"फ़ोन से प्रोफ़ाइल अनलॉक करें"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"अनलॉक करने के विकल्प सेट करने के लिए, अपने साथी ऐप्लिकेशन की जांच करें"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; को मेरी प्रोफ़ाइल अनलॉक करने दें"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"फ़ोन का सही तरीके से कनेक्ट होना ज़रूरी है"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"इस सुविधा को चालू करने के लिए, पक्का करें कि आपकी कार और फ़ोन का ब्लूटूथ चालू है. साथ ही, दोनों नज़दीक हैं"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; अब आपकी प्रोफ़ाइल अनलॉक कर सकता है"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"प्राथमिक प्रोफ़ाइल लॉक लगाएं"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"अपनी प्रोफ़ाइल अनलॉक करने के लिए अगर आप अपने फ़ोन का इस्तेमाल करना चाहते हैं, तो आपको बैक अप के तौर पर प्राथमिक प्रोफ़ाइल के लॉक की ज़रूरत होगी"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"खत्म करने के लिए, अपनी प्रोफ़ाइल अनलॉक करें"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"आपने एक नया प्रोफ़ाइल लॉक लगाया है. इसके बाद, यह पक्का करने के लिए कि आपका फ़ोन, आपकी प्रोफ़ाइल को अपने-आप अनलॉक कर सकता है या नहीं, इसे दोबारा डालें"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"इस डिवाइस को डिसकनेक्ट करें"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"इस डिवाइस को फिर से कनेक्ट करें"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"फ़ोन से अनलॉक करें"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"अपने फ़ोन को अपनी प्रोफ़ाइल अनलॉक करने दें"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"इस सुविधा को अनुमति देने के लिए यहां टैप करें"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"काेई गड़बड़ी हुई"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"माफ़ करें, अभी इस सुविधा को चालू नहीं किया जा सका. कृपया दोबारा कोशिश करें."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"अपने फ़ोन पर स्क्रीन लॉक लगाएं"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"आपके फ़ोन में स्क्रीन लॉक सेट नहीं है. अपनी कार की प्रोफ़ाइल को फ़ोन से अनलॉक करने के लिए, पहले फ़ोन की सेटिंग में स्क्रीन लॉक (जिसे पासवर्ड भी कहा जाता है) लगाएं."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">जोड़ा गया डिवाइस</string>
+ <string name="add_device_title">जोड़ा गया डिवाइस जोड़ें</string>
+ <string name="add_associated_device_title">साथी डिवाइस कनेक्ट करें</string>
+ <string name="add_associated_device_instruction">अपना ड्राइविंग अनुभव प्रबंधित करने के लिए, आप फ़ोन का इस्तेमाल साथी डिवाइस के तौर पर कर सकते हैं</string>
+ <string name="associated_device_install_app">पक्का करें कि आपके फ़ोन पर <b>साथी ऐप्लिकेशन</b> इंस्टॉल किया गया हो</string>
+ <string name="associated_device_pairing_code_title">फ़ोन पर कोड की पुष्टि करें</string>
+ <string name="associated_device_pairing_message">पुष्टि करें कि यह कोड, आपके फ़ोन पर दिखाए गए कोड से मेल खाता है</string>
+ <string name="associated_device_success">डिवाइस को जोड़ दिया गया है</string>
+ <string name="associated_device_select_device">ऐप्लिकेशन खोलें और &lt;b&gt;%1$s&lt;/b&gt; से कनेक्ट करें</string>
+ <string name="associated_device_open_app">ऐप्लिकेशन खोलें और उसमें दिया गया तरीका अपनाएं</string>
+ <string name="remove_associated_device_title">क्या आप &lt;b&gt;%1$s&lt;/b&gt; को हटाना चाहते हैं?</string>
+ <string name="remove_associated_device_message">अब इस कार को इस डिवाइस से हटा दिया जाएगा. साथ ही, आपको इस कार को साथी ऐप्लिकेशन से भी हटाना होगा.</string>
+ <string name="device_removed_success_toast_text">%1$s को हटा दिया गया है</string>
+ <string name="device_removed_failure_toast_text">%1$s को नहीं हटाया जा सका</string>
+ <string name="continue_setup_toast_text">अपने फ़ोन पर सेट अप जारी रखें</string>
+ <string name="error_screen_title">कोई गड़बड़ी हुई</string>
+ <string name="error_screen_message">माफ़ करें, यह स्क्रीन ठीक से नहीं दिखा पा रही है. कृपया फिर से कोशिश करें.</string>
+ <string name="turn_on_bluetooth_title">ब्लूटूथ चालू करें</string>
+ <string name="turn_on_bluetooth_message">अपने फ़ोन को साथी डिवाइस के तौर पर सेट अप करने के लिए, आपकी कार का ब्लूटूथ चालू होना ज़रूरी है.</string>
+ <string name="turn_on_bluetooth_dialog_title">क्या आप ब्लूटूथ चालू करना चाहते हैं?</string>
+ <string name="turn_on_bluetooth_dialog_message">अपने साथी डिवाइस से कनेक्ट करने के लिए, आपकी कार का ब्लूटूथ चालू होना ज़रूरी है.</string>
+ <string name="accept">स्वीकार करें</string>
+ <string name="reject">अस्वीकार करें</string>
+ <string name="confirm">पुष्टि करें</string>
+ <string name="cancel">रद्द करें</string>
+ <string name="remove">हटाएं</string>
+ <string name="ok">ठीक है</string>
+ <string name="connection">कनेक्शन</string>
+ <string name="forget_title">इस डिवाइस को हटाएं</string>
+ <string name="forget">हटाएं</string>
+ <string name="disable">बंद करें</string>
+ <string name="enable">चालू करें</string>
+ <string name="continue_button">जारी रखें</string>
+ <string name="retry">फिर से कोशिश करें</string>
+ <string name="turn_on">चालू करें</string>
+ <string name="not_now">अभी नहीं</string>
+ <string name="connected">कनेक्ट हो गया</string>
+ <string name="notDetected">पता नहीं चला</string>
+ <string name="disconnected">डिसकनेक्ट हो गया</string>
+ <string name="unknown">कोई जानकारी नहीं</string>
+ <string name="app_running_msg_channel_name">फ़ोन पर मैसेज सेवा चालू है</string>
+ <string name="app_running_msg_notification_title">फ़ोन पर मैसेज सेवा चालू है</string>
+ <string name="app_running_msg_notification_content">साथी डिवाइस से मैसेज मिल रहे हैं</string>
+ <string name="trusted_device_feature_title">फ़ोन की मदद से प्रोफ़ाइल अनलॉक करें</string>
+ <string name="trusted_device_feature_instruction">अनलॉक करने के विकल्प सेट करने के लिए, अपने साथी ऐप्लिकेशन की जांच करें</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; को मेरी प्रोफ़ाइल अनलॉक करने दें</string>
+ <string name="device_not_connected_dialog_title">फ़ोन का सही तरीके से कनेक्ट होना ज़रूरी है</string>
+ <string name="device_not_connected_dialog_message">इस सुविधा को चालू करने के लिए, पक्का करें कि आपकी कार और फ़ोन का ब्लूटूथ चालू हो और दोनों नज़दीक हों</string>
+ <string name="trusted_device_enrollment_success_message">अब &lt;b&gt;%1$s&lt;/b&gt; आपकी प्रोफ़ाइल अनलॉक कर सकता है</string>
+ <string name="create_profile_lock_dialog_title">प्रोफ़ाइल के लिए एक मुख्य लॉक सेट करें</string>
+ <string name="create_profile_lock_dialog_message">अगर आप प्रोफ़ाइल अनलॉक करने के लिए अपने फ़ोन का इस्तेमाल करना चाहते हैं, तो आपको बैक अप के तौर पर एक मुख्य प्रोफ़ाइल लॉक की ज़रूरत होगी</string>
+ <string name="unlock_profile_to_finish_title">प्रोसेस पूरी करने के लिए, अपनी प्रोफ़ाइल अनलॉक करें</string>
+ <string name="unlock_profile_to_finish_message">आपने एक नया प्रोफ़ाइल लॉक सेट कर दिया है. अब इसे दोबारा डालें, ताकि यह पक्का किया जा सके कि आपका फ़ोन, प्रोफ़ाइल को अपने-आप अनलॉक कर सकता है या नहीं</string>
+ <string name="disable_device_connection_text">इस डिवाइस को डिसकनेक्ट करें</string>
+ <string name="enable_device_connection_text">इस डिवाइस को फिर से कनेक्ट करें</string>
+ <string name="trusted_device_notification_channel_name">फ़ोन की मदद से अनलॉक करें</string>
+ <string name="trusted_device_notification_title">अपने फ़ोन को प्रोफ़ाइल अनलॉक करने दें</string>
+ <string name="trusted_device_notification_content">इस सुविधा को चालू करने के लिए यहां टैप करें</string>
+ <string name="trusted_device_enrollment_error_dialog_title">कोई गड़बड़ी हुई</string>
+ <string name="trusted_device_enrollment_error_dialog_message">माफ़ करें, अभी इस सुविधा को चालू नहीं किया जा सका. कृपया फिर से कोशिश करें.</string>
+ <string name="create_phone_lock_dialog_title">अपने फ़ोन पर स्क्रीन लॉक सेट करें</string>
+ <string name="create_phone_lock_dialog_message">आपके फ़ोन पर स्क्रीन लॉक सेट नहीं किया गया है. अपनी कार की प्रोफ़ाइल को फ़ोन की मदद से अनलॉक करने के लिए, सबसे पहले फ़ोन की सेटिंग में जाकर, स्क्रीन लॉक सेट करें. स्क्रीन लॉक को पासवर्ड भी कहा जाता है.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d नया मैसेज</item>
+ <item quantity="other">%d नए मैसेज</item>
+ </plurals>
+ <string name="name_not_available">नाम उपलब्ध नहीं है</string>
</resources>
diff --git a/companiondevice/res/values-hr/strings.xml b/companiondevice/res/values-hr/strings.xml
index 7ed8db3..2adccab 100644
--- a/companiondevice/res/values-hr/strings.xml
+++ b/companiondevice/res/values-hr/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,75 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Povezani uređaj"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Dodajte povezani uređaj"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Povezivanje popratnog uređaja"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Telefon možete koristiti kao popratni uređaj koji vam pomaže u upravljanju doživljajem vožnje"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Provjerite je li na telefonu instalirana "<b>"popratna aplikacija"</b></string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Potvrdite kôd na telefonu"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Potvrdite podudara li se ovo s kodom prikazanim na telefonu"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Uređaj je uspješno povezan"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Otvorite apl. i povežite je s automobilom &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Otvorite aplikaciju i slijedite upute"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Zaboravi automobil &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Ovaj automobil više neće biti uparen s ovim uređajem. Dodatno ćete morati ukloniti ovaj automobil iz popratne aplikacije."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Uklonjen je uređaj <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Niste uklonili uređaj <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Nastavite s postavljanjem na telefonu"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Nešto nije u redu"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Nažalost, ovaj se zaslon ne može ispravno prikazati. Pokušajte ponovo."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Uključi Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Da biste svoj telefon postavili kao popratni uređaj, vaš automobil treba imati Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Želite li uključiti Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Da bi se povezao s popratnim uređajem, vaš automobil treba imati Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Prihvati"</string>
- <string name="reject" msgid="4315432282758892890">"Odbij"</string>
- <string name="confirm" msgid="3748997214719276945">"Potvrdi"</string>
- <string name="cancel" msgid="4306609731174629323">"Odustani"</string>
- <string name="remove" msgid="5513398257088729188">"Ukloni"</string>
- <string name="ok" msgid="2825038997730899083">"U redu"</string>
- <string name="connection" msgid="2798490936433656846">"Veza"</string>
- <string name="forget_title" msgid="3027608547243824729">"Zaboravi ovaj uređaj"</string>
- <string name="forget" msgid="2069897665699141222">"Zaboravi"</string>
- <string name="disable" msgid="4619854429066283970">"Onemogući"</string>
- <string name="enable" msgid="7656386199154111316">"Omogući"</string>
- <string name="continue_button" msgid="2748318968566159950">"Nastavi"</string>
- <string name="retry" msgid="3783419451480721367">"Ponovi"</string>
- <string name="turn_on" msgid="4288754850470994812">"Uključi"</string>
- <string name="not_now" msgid="8764692269093707622">"Ne sad"</string>
- <string name="connected" msgid="8051190714042020471">"Povezan"</string>
- <string name="notDetected" msgid="4115229772085594506">"Nije otkriveno"</string>
- <string name="disconnected" msgid="8526513868622591894">"Nije povezan"</string>
- <string name="unknown" msgid="555736316465118024">"Nepoznato"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Pokrenuta je usluga tekstnih poruka na telefonu"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Aktivna je usluga tekstnih poruka na telefonu"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Primanje tekstnih poruka putem popratnog uređaja"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Otključavanje profila telefonom"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Provjerite svoju popratnu aplikaciju i postavite opcije otključavanja"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Dopusti telefonu &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; da otključa moj profil"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefon mora biti aktivno povezan"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Da biste uključili ovu značajku, provjerite je li u automobilu i na telefonu uključen Bluetooth te jesu li automobil i telefon blizu"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"Sa svojeg profila sada možete otključati &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Postavljanje primarnog zaključavanja profila"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Da biste telefon upotrebljavali za otključavanje profila, trebate imati primarno zaključavanje profila kao pričuvnu opciju"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Otključajte svoj profil da biste završili"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Izradili ste novo zaključavanje profila. Zatim ga ponovo unesite da biste potvrdili da vaš telefon može automatski otključati vaš profil"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Odspojite ovaj uređaj"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Ponovno povežite ovaj uređaj"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Otključaj telefonom"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Dopustite telefonu da otključa vaš profil"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Dodirnite ovdje da biste autorizirali ovu značajku"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Nešto nije u redu"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Nažalost, ova se značajka trenutačno ne može uključiti. Pokušajte ponovo."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Postavljanje zaključavanja zaslona na telefonu"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Na telefonu nemate postavljeno zaključavanje zaslona. Da biste pomoću telefona otključali profil automobila, najprije u postavkama telefona postavite zaključavanje zaslona (poznato i kao šifra)."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Povezani uređaj</string>
+ <string name="add_device_title">Dodajte povezani uređaj</string>
+ <string name="add_associated_device_title">Povezivanje popratnog uređaja</string>
+ <string name="add_associated_device_instruction">Telefon možete koristiti kao popratni uređaj koji vam pomaže u upravljanju doživljajem vožnje</string>
+ <string name="associated_device_install_app">Provjerite je li na telefonu instalirana <b>popratna aplikacija</b></string>
+ <string name="associated_device_pairing_code_title">Potvrdite kôd na telefonu</string>
+ <string name="associated_device_pairing_message">Potvrdite podudara li se ovo s kodom prikazanim na telefonu</string>
+ <string name="associated_device_success">Uređaj je uspješno povezan</string>
+ <string name="associated_device_select_device">Otvorite aplikaciju i povežite je s automobilom &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Otvorite aplikaciju i slijedite upute</string>
+ <string name="remove_associated_device_title">Zaboraviti automobil &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Ovaj automobil više neće biti uparen s ovim uređajem. Dodatno ćete morati ukloniti ovaj automobil iz popratne aplikacije.</string>
+ <string name="device_removed_success_toast_text">Uklonjen je uređaj %1$s</string>
+ <string name="device_removed_failure_toast_text">Niste uklonili uređaj %1$s</string>
+ <string name="continue_setup_toast_text">Nastavite s postavljanjem</string>
+ <string name="error_screen_title">Nešto nije u redu</string>
+ <string name="error_screen_message">Nažalost, ovaj se zaslon ne može ispravno prikazati. Pokušajte ponovo.</string>
+ <string name="turn_on_bluetooth_title">Uključi Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Da biste svoj telefon postavili kao popratni uređaj, vaš automobil treba imati Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Želite li uključiti Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Da bi se povezao s popratnim uređajem, vaš automobil treba imati Bluetooth.</string>
+ <string name="accept">Prihvati</string>
+ <string name="reject">Odbij</string>
+ <string name="confirm">Potvrdi</string>
+ <string name="cancel">Odustani</string>
+ <string name="remove">Ukloni</string>
+ <string name="ok">U redu</string>
+ <string name="connection">Veza</string>
+ <string name="forget_title">Zaboravi ovaj uređaj</string>
+ <string name="forget">Zaboravi</string>
+ <string name="disable">Onemogući</string>
+ <string name="enable">Omogući</string>
+ <string name="continue_button">Nastavi</string>
+ <string name="retry">Pokušaj ponovo</string>
+ <string name="turn_on">Uključi</string>
+ <string name="not_now">Ne sad</string>
+ <string name="connected">Povezan</string>
+ <string name="notDetected">Nije otkriveno</string>
+ <string name="disconnected">Nije povezano</string>
+ <string name="unknown">Nepoznato</string>
+ <string name="app_running_msg_channel_name">Pokrenuta je usluga tekstnih poruka na telefonu</string>
+ <string name="app_running_msg_notification_title">Aktivna je usluga tekstnih poruka na telefonu</string>
+ <string name="app_running_msg_notification_content">Primanje tekstnih poruka putem popratnog uređaja</string>
+ <string name="trusted_device_feature_title">Otključavanje profila telefonom</string>
+ <string name="trusted_device_feature_instruction">Provjerite svoju popratnu aplikaciju i postavite opcije otključavanja</string>
+ <string name="trusted_device_item_title">Dopusti uređaju &lt;b&gt;%1$s&lt;/b&gt; da otključa moj profil</string>
+ <string name="device_not_connected_dialog_title">Telefon mora biti aktivno povezan</string>
+ <string name="device_not_connected_dialog_message">Da biste uključili ovu značajku, provjerite je li u automobilu i na telefonu uključen Bluetooth te jesu li automobil i telefon blizu</string>
+ <string name="trusted_device_enrollment_success_message">Uređaj &lt;b&gt;%1$s&lt;/b&gt; sad može otključati vaš profil</string>
+ <string name="create_profile_lock_dialog_title">Postavljanje primarnog zaključavanja profila</string>
+ <string name="create_profile_lock_dialog_message">Da biste telefon upotrebljavali za otključavanje profila, trebate imati primarno zaključavanje profila kao pričuvnu opciju</string>
+ <string name="unlock_profile_to_finish_title">Otključajte svoj profil da biste završili</string>
+ <string name="unlock_profile_to_finish_message">Izradili ste novo zaključavanje profila. Zatim ga ponovo unesite da biste potvrdili da vaš telefon može automatski otključati vaš profil</string>
+ <string name="disable_device_connection_text">Odspojite ovaj uređaj</string>
+ <string name="enable_device_connection_text">Ponovno povežite ovaj uređaj</string>
+ <string name="trusted_device_notification_channel_name">Otključaj telefonom</string>
+ <string name="trusted_device_notification_title">Dopustite telefonu da otključa vaš profil</string>
+ <string name="trusted_device_notification_content">Dodirnite ovdje da biste autorizirali ovu značajku</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Nešto nije u redu</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Nažalost, ova se značajka trenutačno ne može uključiti. Pokušajte ponovo.</string>
+ <string name="create_phone_lock_dialog_title">Postavljanje zaključavanja zaslona na telefonu</string>
+ <string name="create_phone_lock_dialog_message">Na telefonu nemate postavljeno zaključavanje zaslona. Da biste pomoću telefona otključali profil automobila, najprije u postavkama telefona postavite zaključavanje zaslona (poznato i kao šifra).</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d nova poruka</item>
+ <item quantity="few">%d nove poruke</item>
+ <item quantity="other">%d novih poruka</item>
+ </plurals>
+ <string name="name_not_available">Ime nije dostupno</string>
</resources>
diff --git a/companiondevice/res/values-hu/strings.xml b/companiondevice/res/values-hu/strings.xml
index 501b370..8a25614 100644
--- a/companiondevice/res/values-hu/strings.xml
+++ b/companiondevice/res/values-hu/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Társított eszköz"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Társított eszköz hozzáadása"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Társeszköz csatlakoztatása"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Telefonját használhatja társeszközként, így segíthet a vezetési élmény kezelésében"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Legyen telepítve a telefonra a "<b>"társalkalmazás"</b></string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Kód ellenőrzése a telefonon"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Ellenőrizze, hogy ez egyezik-e a telefonon látható kóddal"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Sikerült az eszköz társítása"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Az alkalmazásban csatlakozzon ehhez: &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Nyissa meg az appot az utasításokért"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Elfelejti a következőt: &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Ez az autó a továbbiakban nem lesz párosítva ezzel az eszközzel. Emellett a társalkalmazásból is el kell távolítania az autót."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> elfelejtve"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Nem sikerült a(z) <xliff:g id="PHONE_NAME">%1$s</xliff:g> elfelejtése"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Beállítás folytatása a telefonon"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Hiba történt"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Sajnos nem sikerült a képernyő megfelelő megjelenítése. Próbálja újra."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Bluetooth bekapcsolása"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"A telefon társeszközként való beállításához az autónak Bluetooth-kapcsolatra van szüksége."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Bekapcsolja a Bluetooth-t?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"A társeszközhöz való kapcsolódáshoz az autónak Bluetooth-kapcsolatra van szüksége."</string>
- <string name="accept" msgid="1454710793329618813">"Elfogadás"</string>
- <string name="reject" msgid="4315432282758892890">"Elutasítás"</string>
- <string name="confirm" msgid="3748997214719276945">"Megerősítés"</string>
- <string name="cancel" msgid="4306609731174629323">"Mégse"</string>
- <string name="remove" msgid="5513398257088729188">"Eltávolítás"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Kapcsolat"</string>
- <string name="forget_title" msgid="3027608547243824729">"Eszköz elfelejtése"</string>
- <string name="forget" msgid="2069897665699141222">"Elfelejtés"</string>
- <string name="disable" msgid="4619854429066283970">"Letiltás"</string>
- <string name="enable" msgid="7656386199154111316">"Engedélyezés"</string>
- <string name="continue_button" msgid="2748318968566159950">"Tovább"</string>
- <string name="retry" msgid="3783419451480721367">"Újra"</string>
- <string name="turn_on" msgid="4288754850470994812">"Bekapcsolás"</string>
- <string name="not_now" msgid="8764692269093707622">"Ne most"</string>
- <string name="connected" msgid="8051190714042020471">"Csatlakozva"</string>
- <string name="notDetected" msgid="4115229772085594506">"Nincs észlelve"</string>
- <string name="disconnected" msgid="8526513868622591894">"Leválasztva"</string>
- <string name="unknown" msgid="555736316465118024">"Ismeretlen"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Fut a telefonos SMS-szolgáltatás"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"A telefonos SMS-szolgáltatás aktív"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"SMS fogadása a társeszközön keresztül"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Profil feloldása telefonnal"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Ellenőrizze a társalkalmazást a feloldási lehetőségek beállításához"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Profil feloldásának engedélyezése a(z) &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; számára"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefonjának aktívan csatlakozva kell lennie"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"A funkció használatához az autóban és a telefonon is bekapcsolva kell lennie a Bluetooth-nak, és az eszközöknek közel kell lenniük egymáshoz"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"A(z) &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; mostantól fel tudja oldani a profilját"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Elsődleges profilzárolás létrehozása"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Ahhoz, hogy a telefont a profil feloldására használhassa, elsődleges profilzárolásra van szükség biztonsági megoldásként"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"A befejezéshez oldja fel profilját"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Új profilzárolást hozott létre. Most adja meg újra annak megerősítéséhez, hogy a telefon automatikusan fel tudja oldani a profilját."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Eszköz leválasztása"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Eszköz újracsatlakoztatása"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Feloldás telefonnal"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Profil feloldásának engedélyezése a telefonja számára"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Koppintson ide a funkció engedélyezéséhez"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Hiba történt"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Sajnos most nem sikerült bekapcsolni ezt a funkciót. Próbálja újra."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Képernyőzár beállítása a telefonon"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Telefonján nincs beállítva képernyőzár. Az autó profiljának a telefonnal való feloldásához előbb állítson be képernyőzárat (más néven biztonsági kódot) a telefon beállításaiban."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Társított eszköz</string>
+ <string name="add_device_title">Társított eszköz hozzáadása</string>
+ <string name="add_associated_device_title">Társeszköz csatlakoztatása</string>
+ <string name="add_associated_device_instruction">Telefonját használhatja társeszközként, így segíthet a vezetési élmény kezelésében</string>
+ <string name="associated_device_install_app">Telepítse a telefonra a <b>társalkalmazást</b></string>
+ <string name="associated_device_pairing_code_title">Kód ellenőrzése a telefonon</string>
+ <string name="associated_device_pairing_message">Ellenőrizze, hogy ez egyezik-e a telefonon látható kóddal</string>
+ <string name="associated_device_success">Sikerült az eszköz társítása</string>
+ <string name="associated_device_select_device">Nyissa meg az alkalmazást, és csatlakozzon a következőhöz: &lt;b&gt;%1$s&lt;b&gt;</string>
+ <string name="associated_device_open_app">Nyissa meg az alkalmazást az utasításokért</string>
+ <string name="remove_associated_device_title">Szeretné elfelejtetni ezt: &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Ez az autó a továbbiakban nem lesz párosítva ezzel az eszközzel. Emellett a társalkalmazásból is el kell távolítania az autót.</string>
+ <string name="device_removed_success_toast_text">%1$s elfelejtve</string>
+ <string name="device_removed_failure_toast_text">Nem sikerült a(z) %1$s elfelejtése</string>
+ <string name="continue_setup_toast_text">Folytassa a beállítást a telefonján</string>
+ <string name="error_screen_title">Hiba történt</string>
+ <string name="error_screen_message">Sajnos nem sikerült a képernyő megfelelő megjelenítése. Próbálja újra.</string>
+ <string name="turn_on_bluetooth_title">Bluetooth bekapcsolása</string>
+ <string name="turn_on_bluetooth_message">A telefon társeszközként való beállításához az autónak Bluetooth-kapcsolatra van szüksége.</string>
+ <string name="turn_on_bluetooth_dialog_title">Bekapcsolja a Bluetootht?</string>
+ <string name="turn_on_bluetooth_dialog_message">A társeszközhöz való kapcsolódáshoz az autónak Bluetooth-kapcsolatra van szüksége.</string>
+ <string name="accept">Elfogadás</string>
+ <string name="reject">Elutasítás</string>
+ <string name="confirm">Megerősítés</string>
+ <string name="cancel">Mégse</string>
+ <string name="remove">Eltávolítás</string>
+ <string name="ok">OK</string>
+ <string name="connection">Kapcsolat</string>
+ <string name="forget_title">Eszköz elfelejtése</string>
+ <string name="forget">Elfelejtés</string>
+ <string name="disable">Letiltás</string>
+ <string name="enable">Engedélyezés</string>
+ <string name="continue_button">Tovább</string>
+ <string name="retry">Újra</string>
+ <string name="turn_on">Bekapcsolás</string>
+ <string name="not_now">Ne most</string>
+ <string name="connected">Csatlakozva</string>
+ <string name="notDetected">Nincs észlelve</string>
+ <string name="disconnected">Leválasztva</string>
+ <string name="unknown">Ismeretlen</string>
+ <string name="app_running_msg_channel_name">Fut a telefonos SMS-szolgáltatás</string>
+ <string name="app_running_msg_notification_title">A telefonos SMS-szolgáltatás aktív</string>
+ <string name="app_running_msg_notification_content">SMS fogadása a társeszközön keresztül</string>
+ <string name="trusted_device_feature_title">Profil feloldása telefonnal</string>
+ <string name="trusted_device_feature_instruction">Ellenőrizze a társalkalmazást a feloldási lehetőségek beállításához</string>
+ <string name="trusted_device_item_title">Profil feloldásának engedélyezése a(z) &lt;b&gt;%1$s&lt;/b&gt; számára</string>
+ <string name="device_not_connected_dialog_title">Telefonjának aktívan csatlakozva kell lennie</string>
+ <string name="device_not_connected_dialog_message">A funkció használatához az autóban és a telefonon is bekapcsolva kell lennie a Bluetoothnak, és az eszközöknek közel kell lenniük egymáshoz</string>
+ <string name="trusted_device_enrollment_success_message">A(z) &lt;b&gt;%1$s&lt;/b&gt; mostantól fel tudja oldani a profilját</string>
+ <string name="create_profile_lock_dialog_title">Elsődleges profilzárolás létrehozása</string>
+ <string name="create_profile_lock_dialog_message">Ahhoz, hogy a telefont a profil feloldására használhassa, elsődleges profilzárolásra van szükség biztonsági megoldásként</string>
+ <string name="unlock_profile_to_finish_title">A befejezéshez oldja fel profilját</string>
+ <string name="unlock_profile_to_finish_message">Új profilzárolást hozott létre. Most adja meg újra annak megerősítéséhez, hogy a telefon automatikusan fel tudja oldani a profilját.</string>
+ <string name="disable_device_connection_text">Eszköz leválasztása</string>
+ <string name="enable_device_connection_text">Eszköz újracsatlakoztatása</string>
+ <string name="trusted_device_notification_channel_name">Feloldás telefonnal</string>
+ <string name="trusted_device_notification_title">Profil feloldásának engedélyezése a telefonja számára</string>
+ <string name="trusted_device_notification_content">Koppintson ide a funkció engedélyezéséhez</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Hiba történt</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Sajnos most nem sikerült bekapcsolni ezt a funkciót. Próbálja újra.</string>
+ <string name="create_phone_lock_dialog_title">Képernyőzár beállítása a telefonon</string>
+ <string name="create_phone_lock_dialog_message">Telefonján nincs beállítva képernyőzár. Az autó profiljának a telefonnal való feloldásához előbb állítson be képernyőzárat (más néven biztonsági kódot) a telefon beállításaiban.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Új üzenet</item>
+ <item quantity="other">%d új üzenet</item>
+ </plurals>
+ <string name="name_not_available">A név nem használható</string>
</resources>
diff --git a/companiondevice/res/values-hy/strings.xml b/companiondevice/res/values-hy/strings.xml
index 7a1939a..e527e38 100644
--- a/companiondevice/res/values-hy/strings.xml
+++ b/companiondevice/res/values-hy/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Կապված սարք"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Ավելացնել կապված սարք"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Ուղեկցող սարքի միացում"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Դուք կարող եք օգտագործել ձեր հեռախոսը որպես ուղեկցող սարք, որը կօգնի ձեզ մեքենան վարելիս։"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Համոզվեք, որ ձեր հեռախոսում տեղադրված է "<b>"ուղեկցող հավելված"</b></string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Հաստատեք կոդը հեռախոսում"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Հաստատեք, որ հեռախոսում նույն կոդն է ցուցադրվում"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Սարքը կապվեց"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Բացեք հավելվածը և միացեք &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;-ին"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Բացեք հավելվածը և հետևեք ցուցումներին"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Հեռացնե՞լ &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; մեքենան"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Մեքենան այլևս չի զուգակցվի այս սարքի հետ։ Ձեզ նաև անհրաժեշտ կլինի մեքենան հեռացնել ուղեկցող հավելվածից։"</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> սարքը հեռացվեց"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Չհաջողվեց հեռացնել <xliff:g id="PHONE_NAME">%1$s</xliff:g> սարքը"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Շարունակեք կարգավորումը հեռախոսում"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Սխալ առաջացավ"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Չհաջողվեց ճիշտ ցուցադրել էկրանը։ Նորից փորձեք։"</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Միացրեք Bluetooth-ը"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Ձեր հեռախոսը որպես ուղեկցող սարք կարգավորելու համար մեքենային անհրաժեշտ է Bluetooth։"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Միացնե՞լ Bluetooth-ը"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Ուղեկցող սարքին միանալու համար մեքենային անհրաժեշտ է Bluetooth։"</string>
- <string name="accept" msgid="1454710793329618813">"Ընդունել"</string>
- <string name="reject" msgid="4315432282758892890">"Մերժել"</string>
- <string name="confirm" msgid="3748997214719276945">"Հաստատել"</string>
- <string name="cancel" msgid="4306609731174629323">"Չեղարկել"</string>
- <string name="remove" msgid="5513398257088729188">"Հեռացնել"</string>
- <string name="ok" msgid="2825038997730899083">"Եղավ"</string>
- <string name="connection" msgid="2798490936433656846">"Կապ"</string>
- <string name="forget_title" msgid="3027608547243824729">"Հեռացնել այս սարքը"</string>
- <string name="forget" msgid="2069897665699141222">"Հեռացնել"</string>
- <string name="disable" msgid="4619854429066283970">"Անջատել"</string>
- <string name="enable" msgid="7656386199154111316">"Միացնել"</string>
- <string name="continue_button" msgid="2748318968566159950">"Շարունակել"</string>
- <string name="retry" msgid="3783419451480721367">"Նորից փորձել"</string>
- <string name="turn_on" msgid="4288754850470994812">"Միացնել"</string>
- <string name="not_now" msgid="8764692269093707622">"Ոչ հիմա"</string>
- <string name="connected" msgid="8051190714042020471">"Միացած է"</string>
- <string name="notDetected" msgid="4115229772085594506">"Չի հայտնաբերվել"</string>
- <string name="disconnected" msgid="8526513868622591894">"Կապը չեղարկված է"</string>
- <string name="unknown" msgid="555736316465118024">"Անհայտ"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Մուտքային SMS-ների մասին ծանուցման ծառայությունն ակտիվ է"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"SMS-ների մասին ծանուցման ծառայությունն ակտիվ է"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"SMS-ների ստացում օժանդակ սարքի միջոցով"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Ապակողպեք պրոֆիլը հեռախոսի միջոցով"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Ապակողպման տարբերակները կարելի է կարգավորել ուղեկցող հավելվածում"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Թույլատրել &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; հեռախոսին ապակողպել իմ պրոֆիլը"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Ձեր հեռախոսը պետք է միացած լինի"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Այս գործառույթը միացնելու համար համոզվեք, որ ձեր մեքենայում և հեռախոսում միացված է Bluetooth-ը, և դրանք իրար մոտ են գտնվում։"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; հեռախոսն այժմ կարող է ապակողպել ձեր պրոֆիլը"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Նշեք պրոֆիլի կողպման հիմնական եղանակը"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Հեռախոսի միջոցով պրոֆիլն ապակողպելու համար պրոֆիլի ապակողպման հիմնական եղանակն անհրաժեշտ է նշել որպես լրացուցիչ"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Ավարտելու համար ապակողպեք պրոֆիլը"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Դուք պրոֆիլի կողպման նոր եղանակ եք կարգավորել։ Նորից մուտքագրեք կոդը՝ հաստատելու, որ հեռախոսը կարող է ավտոմատ ապակողպել ձեր պրոֆիլը։"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Չեղարկել այս սարքի հետ կապը"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Նորից կապել սարքը"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Ապակողպում հեռախոսի միջոցով"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Թույլատրեք հեռախոսին ապակողպել ձեր պրոֆիլը"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Հպեք այստեղ՝ այս գործառույթը թույլատրելու համար"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Սխալ առաջացավ"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Չհաջողվեց միացնել գործառույթը։ Նորից փորձեք։"</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Կարգավորեք էկրանի կողպումը հեռախոսում"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Ձեր հեռախոսում էկրանի կողպումը կարգավորված չէ։ Հեռախոսով մեքենայի պրոֆիլն ապակողպելու համար նախ ավելացրեք էկրանի կողպման եղանակ (անցակոդ) հեռախոսի կարգավորումներում։"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Կապված սարք</string>
+ <string name="add_device_title">Ավելացնել կապված սարք</string>
+ <string name="add_associated_device_title">Ուղեկցող սարքի միացում</string>
+ <string name="add_associated_device_instruction">Դուք կարող եք օգտագործել ձեր հեռախոսը որպես ուղեկցող սարք, որը կօգնի ձեզ մեքենան վարելիս։</string>
+ <string name="associated_device_install_app">Համոզվեք, որ ձեր հեռախոսում տեղադրված է <b>ուղեկցող հավելված</b></string>
+ <string name="associated_device_pairing_code_title">Հաստատեք կոդը հեռախոսում</string>
+ <string name="associated_device_pairing_message">Հաստատեք, որ հեռախոսում նույն կոդն է ցուցադրվում</string>
+ <string name="associated_device_success">Սարքը կապվեց</string>
+ <string name="associated_device_select_device">Բացեք հավելվածը և միացեք &lt;b&gt;%1$s&lt;/b&gt;-ին</string>
+ <string name="associated_device_open_app">Բացեք հավելվածը և հետևեք ցուցումներին</string>
+ <string name="remove_associated_device_title">Հեռացնե՞լ &lt;b&gt;%1$s&lt;/b&gt; մեքենան</string>
+ <string name="remove_associated_device_message">Մեքենան այլևս չի զուգակցվի այս սարքի հետ։ Ձեզ նաև անհրաժեշտ կլինի մեքենան հեռացնել ուղեկցող հավելվածից։</string>
+ <string name="device_removed_success_toast_text">%1$s սարքը հեռացվեց</string>
+ <string name="device_removed_failure_toast_text">Չհաջողվեց հեռացնել %1$s սարքը</string>
+ <string name="continue_setup_toast_text">Շարունակեք կարգավորումը հեռախոսում</string>
+ <string name="error_screen_title">Սխալ առաջացավ</string>
+ <string name="error_screen_message">Չհաջողվեց ճիշտ ցուցադրել էկրանը։ Նորից փորձեք։</string>
+ <string name="turn_on_bluetooth_title">Միացրեք Bluetooth-ը</string>
+ <string name="turn_on_bluetooth_message">Ձեր հեռախոսը որպես ուղեկցող սարք կարգավորելու համար մեքենային անհրաժեշտ է Bluetooth։</string>
+ <string name="turn_on_bluetooth_dialog_title">Միացնե՞լ Bluetooth-ը</string>
+ <string name="turn_on_bluetooth_dialog_message">Ուղեկցող սարքին միանալու համար մեքենային անհրաժեշտ է Bluetooth։</string>
+ <string name="accept">Ընդունել</string>
+ <string name="reject">Մերժել</string>
+ <string name="confirm">Հաստատել</string>
+ <string name="cancel">Չեղարկել</string>
+ <string name="remove">Հեռացնել</string>
+ <string name="ok">Եղավ</string>
+ <string name="connection">Կապ</string>
+ <string name="forget_title">Հեռացնել այս սարքը</string>
+ <string name="forget">Հեռացնել</string>
+ <string name="disable">Անջատել</string>
+ <string name="enable">Միացնել</string>
+ <string name="continue_button">Շարունակել</string>
+ <string name="retry">Նորից փորձել</string>
+ <string name="turn_on">Միացնել</string>
+ <string name="not_now">Ոչ հիմա</string>
+ <string name="connected">Միացված է</string>
+ <string name="notDetected">Չի հայտնաբերվել</string>
+ <string name="disconnected">Անջատված է</string>
+ <string name="unknown">Անհայտ</string>
+ <string name="app_running_msg_channel_name">SMS-ների մասին ծանուցման ծառայությունն ակտիվ է</string>
+ <string name="app_running_msg_notification_title">SMS-ների մասին ծանուցման ծառայությունն ակտիվ է</string>
+ <string name="app_running_msg_notification_content">SMS-ների ստացում օժանդակ սարքի միջոցով</string>
+ <string name="trusted_device_feature_title">Ապակողպեք պրոֆիլը հեռախոսի միջոցով</string>
+ <string name="trusted_device_feature_instruction">Ապակողպման տարբերակները կարելի է կարգավորել ուղեկցող հավելվածում</string>
+ <string name="trusted_device_item_title">Թույլ տալ &lt;b&gt;%1$s&lt;/b&gt; հեռախոսին ապակողպել իմ պրոֆիլը</string>
+ <string name="device_not_connected_dialog_title">Ձեր հեռախոսը պետք է միացած լինի</string>
+ <string name="device_not_connected_dialog_message">Այս գործառույթը միացնելու համար համոզվեք, որ ձեր մեքենայում և հեռախոսում միացված է Bluetooth-ը, և դրանք իրար մոտ են գտնվում։</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; հեռախոսն արդեն կարող է ապակողպել ձեր պրոֆիլը</string>
+ <string name="create_profile_lock_dialog_title">Նշեք պրոֆիլի կողպման հիմնական եղանակը</string>
+ <string name="create_profile_lock_dialog_message">Հեռախոսի միջոցով պրոֆիլն ապակողպելու համար պրոֆիլի ապակողպման հիմնական եղանակն անհրաժեշտ է նշել որպես լրացուցիչ</string>
+ <string name="unlock_profile_to_finish_title">Ավարտելու համար ապակողպեք պրոֆիլը</string>
+ <string name="unlock_profile_to_finish_message">Դուք պրոֆիլի կողպման նոր եղանակ եք կարգավորել։ Նորից մուտքագրեք կոդը՝ հաստատելու, որ հեռախոսը կարող է ավտոմատ ապակողպել ձեր պրոֆիլը։</string>
+ <string name="disable_device_connection_text">Չեղարկել այս սարքի հետ կապը</string>
+ <string name="enable_device_connection_text">Նորից կապել սարքը</string>
+ <string name="trusted_device_notification_channel_name">Ապակողպում հեռախոսի միջոցով</string>
+ <string name="trusted_device_notification_title">Թույլատրեք հեռախոսին ապակողպել ձեր պրոֆիլը</string>
+ <string name="trusted_device_notification_content">Հպեք այստեղ՝ այս գործառույթը թույլատրելու համար</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Սխալ առաջացավ</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Չհաջողվեց միացնել գործառույթը։ Նորից փորձեք։</string>
+ <string name="create_phone_lock_dialog_title">Կարգավորեք էկրանի կողպումը հեռախոսում</string>
+ <string name="create_phone_lock_dialog_message">Ձեր հեռախոսում էկրանի կողպումը կարգավորված չէ։ Հեռախոսով մեքենայի պրոֆիլն ապակողպելու համար նախ ավելացրեք էկրանի կողպման եղանակ (անցակոդ) հեռախոսի կարգավորումներում։</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d նոր հաղորդագրություն</item>
+ <item quantity="other">%d նոր հաղորդագրություն</item>
+ </plurals>
+ <string name="name_not_available">Անունը հասանելի չէ</string>
</resources>
diff --git a/companiondevice/res/values-in/strings.xml b/companiondevice/res/values-in/strings.xml
index 1b6db5f..3d8d8d6 100644
--- a/companiondevice/res/values-in/strings.xml
+++ b/companiondevice/res/values-in/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Perangkat Terkait"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Tambahkan Perangkat Terkait"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Hubungkan perangkat pendamping"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Gunakan ponsel sebagai perangkat pendamping untuk mengatur pengalaman berkendara"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Pastikan "<b>"Aplikasi Pendamping"</b>" telah diinstal di ponsel"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Konfirmasi kode di ponsel"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Konfirmasi bahwa kode ini sesuai dengan kode di ponsel"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Perangkat telah berhasil dikaitkan"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Buka aplikasi dan hubungkan ke &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Buka apl lalu ikuti petunjuk dalam apl"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Lupakan &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Mobil ini tidak akan disambungkan lagi dengan perangkat ini. Anda juga perlu menghapus mobil ini dari Aplikasi Pendamping."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> telah dilupakan"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Gagal melupakan <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Lanjutkan proses penyiapan di ponsel"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Terjadi masalah"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Maaf, layar ini tidak dapat tampil semestinya. Harap coba lagi."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Aktifkan Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Untuk menyiapkan ponsel sebagai perangkat pendamping, mobil Anda harus memiliki Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Aktifkan Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Untuk menghubungkan ke perangkat pendamping, mobil Anda harus memiliki Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Setuju"</string>
- <string name="reject" msgid="4315432282758892890">"Tolak"</string>
- <string name="confirm" msgid="3748997214719276945">"Konfirmasi"</string>
- <string name="cancel" msgid="4306609731174629323">"Batal"</string>
- <string name="remove" msgid="5513398257088729188">"Hapus"</string>
- <string name="ok" msgid="2825038997730899083">"Oke"</string>
- <string name="connection" msgid="2798490936433656846">"Koneksi"</string>
- <string name="forget_title" msgid="3027608547243824729">"Lupakan perangkat ini"</string>
- <string name="forget" msgid="2069897665699141222">"Lupakan"</string>
- <string name="disable" msgid="4619854429066283970">"Nonaktifkan"</string>
- <string name="enable" msgid="7656386199154111316">"Aktifkan"</string>
- <string name="continue_button" msgid="2748318968566159950">"Lanjutkan"</string>
- <string name="retry" msgid="3783419451480721367">"Coba lagi"</string>
- <string name="turn_on" msgid="4288754850470994812">"Aktifkan"</string>
- <string name="not_now" msgid="8764692269093707622">"Lain kali"</string>
- <string name="connected" msgid="8051190714042020471">"Terhubung"</string>
- <string name="notDetected" msgid="4115229772085594506">"Tidak terdeteksi"</string>
- <string name="disconnected" msgid="8526513868622591894">"Terputus"</string>
- <string name="unknown" msgid="555736316465118024">"Tidak dikenal"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Layanan SMS ponsel sedang berjalan"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Layanan SMS ponsel aktif"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Menerima SMS melalui perangkat pendamping"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Buka kunci profil dengan ponsel"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Buka Aplikasi Pendamping untuk menyetel opsi buka kunci"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Izinkan &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; membuka kunci profil"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Ponsel harus terhubung"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Untuk mengaktifkan fitur ini, pastikan Bluetooth di mobil dan ponsel sudah aktif dan saling berdekatan"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; kini dapat membuka kunci profil Anda"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Buat kunci profil utama"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Agar dapat menggunakan ponsel untuk membuka kunci profil, Anda perlu kunci profil utama sebagai cadangan"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Buka kunci profil untuk menyelesaikan"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Kunci profil baru telah dibuat. Selanjutnya, masukkan lagi kuncinya untuk mengonfirmasi bahwa ponsel Anda dapat otomatis membuka kunci profil"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Putuskan hubungan ke perangkat ini"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Hubungkan kembali ke perangkat ini"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Buka kunci dengan ponsel"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Izinkan ponsel membuka kunci profil"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Ketuk di sini untuk memberi otorisasi fitur ini"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Terjadi masalah"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Maaf, fitur ini tidak dapat diaktifkan saat ini. Harap coba lagi."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Buat kunci layar di ponsel"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Anda belum menyetel kunci layar di ponsel. Untuk membuka kunci profil mobil dengan ponsel, buatlah kunci layar atau kode sandi terlebih dahulu di setelan ponsel."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Perangkat Terkait</string>
+ <string name="add_device_title">Tambahkan Perangkat Terkait</string>
+ <string name="add_associated_device_title">Hubungkan perangkat pendamping</string>
+ <string name="add_associated_device_instruction">Gunakan ponsel sebagai perangkat pendamping untuk mengatur pengalaman berkendara</string>
+ <string name="associated_device_install_app">Pastikan <b>Aplikasi Pendamping</b> telah diinstal di ponsel Anda</string>
+ <string name="associated_device_pairing_code_title">Konfirmasi kode di ponsel</string>
+ <string name="associated_device_pairing_message">Konfirmasi bahwa kode ini sesuai dengan kode yang ditampilkan di ponsel</string>
+ <string name="associated_device_success">Perangkat telah berhasil dikaitkan</string>
+ <string name="associated_device_select_device">Buka aplikasi dan hubungkan ke &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Buka aplikasi lalu ikuti petunjuk dalam aplikasi</string>
+ <string name="remove_associated_device_title">Lupakan &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Mobil ini tidak akan disambungkan lagi dengan perangkat ini. Anda juga perlu menghapus mobil ini dari Aplikasi pendamping.</string>
+ <string name="device_removed_success_toast_text">%1$s telah dilupakan</string>
+ <string name="device_removed_failure_toast_text">Gagal melupakan %1$s</string>
+ <string name="continue_setup_toast_text">Lanjutkan proses penyiapan di ponsel</string>
+ <string name="error_screen_title">Ada masalah</string>
+ <string name="error_screen_message">Maaf, layar ini tidak dapat ditampilkan dengan semestinya. Harap coba lagi.</string>
+ <string name="turn_on_bluetooth_title">Aktifkan Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Untuk menyiapkan ponsel sebagai perangkat pendamping, mobil Anda harus memiliki Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Aktifkan Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Untuk menghubungkan ke perangkat pendamping, mobil Anda harus memiliki Bluetooth.</string>
+ <string name="accept">Setuju</string>
+ <string name="reject">Tolak</string>
+ <string name="confirm">Konfirmasi</string>
+ <string name="cancel">Batal</string>
+ <string name="remove">Hapus</string>
+ <string name="ok">Ya</string>
+ <string name="connection">Koneksi</string>
+ <string name="forget_title">Lupakan perangkat ini</string>
+ <string name="forget">Lupakan</string>
+ <string name="disable">Nonaktifkan</string>
+ <string name="enable">Aktifkan</string>
+ <string name="continue_button">Lanjutkan</string>
+ <string name="retry">Coba lagi</string>
+ <string name="turn_on">Aktifkan</string>
+ <string name="not_now">Lain kali</string>
+ <string name="connected">Terhubung</string>
+ <string name="notDetected">Tidak terdeteksi</string>
+ <string name="disconnected">Terputus</string>
+ <string name="unknown">Tidak dikenal</string>
+ <string name="app_running_msg_channel_name">Layanan SMS ponsel sedang berjalan</string>
+ <string name="app_running_msg_notification_title">Layanan SMS ponsel aktif</string>
+ <string name="app_running_msg_notification_content">Menerima SMS melalui perangkat pendamping</string>
+ <string name="trusted_device_feature_title">Buka kunci profil dengan ponsel</string>
+ <string name="trusted_device_feature_instruction">Buka Aplikasi Pendamping untuk menyetel opsi buka kunci</string>
+ <string name="trusted_device_item_title">Izinkan &lt;b&gt;%1$s&lt;/b&gt; membuka kunci profil saya</string>
+ <string name="device_not_connected_dialog_title">Ponsel harus terhubung</string>
+ <string name="device_not_connected_dialog_message">Untuk mengaktifkan fitur ini, pastikan Bluetooth di mobil dan ponsel sudah aktif dan saling berdekatan</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; kini dapat membuka kunci profil Anda</string>
+ <string name="create_profile_lock_dialog_title">Buat kunci profil utama</string>
+ <string name="create_profile_lock_dialog_message">Agar dapat menggunakan ponsel untuk membuka kunci profil, Anda perlu kunci profil utama sebagai cadangan</string>
+ <string name="unlock_profile_to_finish_title">Buka kunci profil untuk menyelesaikan</string>
+ <string name="unlock_profile_to_finish_message">Kunci profil baru telah dibuat. Selanjutnya, masukkan lagi kuncinya untuk mengonfirmasi bahwa ponsel Anda dapat otomatis membuka kunci profil</string>
+ <string name="disable_device_connection_text">Putuskan hubungan ke perangkat ini</string>
+ <string name="enable_device_connection_text">Hubungkan kembali ke perangkat ini</string>
+ <string name="trusted_device_notification_channel_name">Buka kunci dengan ponsel</string>
+ <string name="trusted_device_notification_title">Izinkan ponsel membuka kunci profil</string>
+ <string name="trusted_device_notification_content">Ketuk di sini untuk memberi otorisasi fitur ini</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Ada masalah</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Maaf, fitur ini tidak dapat diaktifkan saat ini. Harap coba lagi.</string>
+ <string name="create_phone_lock_dialog_title">Buat kunci layar di ponsel</string>
+ <string name="create_phone_lock_dialog_message">Anda belum menyetel kunci layar di ponsel. Untuk membuka kunci profil mobil dengan ponsel, buatlah kunci layar (juga disebut dengan kode sandi) terlebih dahulu di setelan ponsel.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Pesan baru</item>
+ <item quantity="other">%d pesan baru</item>
+ </plurals>
+ <string name="name_not_available">Nama tidak tersedia</string>
</resources>
diff --git a/companiondevice/res/values-is/strings.xml b/companiondevice/res/values-is/strings.xml
index adde625..441cb16 100644
--- a/companiondevice/res/values-is/strings.xml
+++ b/companiondevice/res/values-is/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Tengt tæki"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Bæta tengdu tæki við"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Tengdu fylgitæki"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Þú getur notað símann sem fylgitæki til að stjórna upplifun þinni við akstur"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Gættu þess að vera með "<b>"fylgiforrit"</b>" uppsett í símanum"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Staðfesta kóða í síma"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Staðfestu að hann stemmi við kóðann í símanum þínum"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Tækið var tengt"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Opnaðu forritið og tengdu við &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Opnaðu forritið og fylgdu leiðbeiningum"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Gleyma &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Þessi bíll verður ekki lengur paraður við þetta tæki. Auk þess þarftu að fjarlægja bílinn úr fylgiforritinu."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> gleymdur"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Ekki tókst að gleyma <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Haltu uppsetningunni áfram í símanum"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Eitthvað fór úrskeiðis"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Ekki tókst að birta þennan skjá rétt. Reyndu aftur."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Kveikja á Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Til að setja símann þinn upp sem fylgitæki þarf bíllinn þinn Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Kveikja á Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Til að tengja fylgitækið þarf bíllinn þinn Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Samþykkja"</string>
- <string name="reject" msgid="4315432282758892890">"Hafna"</string>
- <string name="confirm" msgid="3748997214719276945">"Staðfesta"</string>
- <string name="cancel" msgid="4306609731174629323">"Hætta við"</string>
- <string name="remove" msgid="5513398257088729188">"Fjarlægja"</string>
- <string name="ok" msgid="2825038997730899083">"Í lagi"</string>
- <string name="connection" msgid="2798490936433656846">"Tenging"</string>
- <string name="forget_title" msgid="3027608547243824729">"Gleyma þessu tæki"</string>
- <string name="forget" msgid="2069897665699141222">"Gleyma"</string>
- <string name="disable" msgid="4619854429066283970">"Slökkva"</string>
- <string name="enable" msgid="7656386199154111316">"Kveikja"</string>
- <string name="continue_button" msgid="2748318968566159950">"Áfram"</string>
- <string name="retry" msgid="3783419451480721367">"Reyna aftur"</string>
- <string name="turn_on" msgid="4288754850470994812">"Kveikja"</string>
- <string name="not_now" msgid="8764692269093707622">"Ekki núna"</string>
- <string name="connected" msgid="8051190714042020471">"Tengt"</string>
- <string name="notDetected" msgid="4115229772085594506">"Fannst ekki"</string>
- <string name="disconnected" msgid="8526513868622591894">"Aftengt"</string>
- <string name="unknown" msgid="555736316465118024">"Óþekkt"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"SMS-skilaboðaþjónusta síma í gangi"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"SMS-skilaboðaþjónusta síma er virk"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Tekur við SMS-skilaboðum með fylgdartæki"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Taka prófílinn úr lás með símanum"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Farðu í fylgiforritið til að stilla valkosti til að taka úr lás"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Leyfa &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; að taka prófílinn minn úr lás"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Síminn verður að vera með virka tengingu"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Til að kveikja á þessum eiginleika skaltu ganga úr skugga um að bíllinn og síminn séu með kveikt á Bluetooth og nálægt hvor öðrum"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; getur núna tekið prófílinn þinn úr lás"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Búa til aðalprófíllás"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Til að nota símann til að taka prófílinn þinn úr lás þarftu að hafa aðalprófíllás til vara"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Taktu prófílinn þinn úr lás til að ljúka"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Þú bjóst til nýjan prófíllás. Næst skaltu slá hann aftur inn til að staðfesta að síminn þinn geti tekið prófílinn þinn sjálfkrafa úr lás"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Aftengja þetta tæki"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Tengja þetta tæki aftur"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Taka úr lás með síma"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Leyfðu símanum þínum að taka prófílinn þinn úr lás"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Ýttu hér til að heimila þennan eiginleika"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Eitthvað fór úrskeiðis"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Ekki tókst að kveikja á þessum eiginleika í augnablikinu. Reyndu aftur."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Búðu til skjálás í símanum"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Síminn þinn er ekki með skjálás stilltan Til að taka prófíl bílsins úr lás með símanum skaltu fyrst búa til skjálás (einnig kallaður aðgangskóði) í stillingum símans."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Tengt tæki</string>
+ <string name="add_device_title">Bæta tengdu tæki við</string>
+ <string name="add_associated_device_title">Tengja fylgitæki</string>
+ <string name="add_associated_device_instruction">Þú getur notað símann sem fylgitæki til að stjórna upplifun þinni við akstur</string>
+ <string name="associated_device_install_app">Gættu þess að vera með <b>fylgiforrit</b> uppsett í símanum</string>
+ <string name="associated_device_pairing_code_title">Staðfesta kóða í síma</string>
+ <string name="associated_device_pairing_message">Staðfestu að hann stemmi við kóðann í símanum þínum</string>
+ <string name="associated_device_success">Tækið var tengt</string>
+ <string name="associated_device_select_device">Opnaðu forritið og tengstu &lt;b&gt;%1$s&lt;b&gt;</string>
+ <string name="associated_device_open_app">Opnaðu forritið og fylgdu leiðbeiningum þess</string>
+ <string name="remove_associated_device_title">Gleyma &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Þessi bíll verður ekki lengur paraður við þetta tæki. Auk þess þarftu að fjarlægja bílinn úr fylgiforritinu.</string>
+ <string name="device_removed_success_toast_text">%1$s gleymt</string>
+ <string name="device_removed_failure_toast_text">Ekki tókst að gleyma %1$s</string>
+ <string name="continue_setup_toast_text">Haltu uppsetningunni áfram í símanum</string>
+ <string name="error_screen_title">Eitthvað fór úrskeiðis</string>
+ <string name="error_screen_message">Ekki tókst að birta þennan skjá rétt. Reyndu aftur.</string>
+ <string name="turn_on_bluetooth_title">Kveikja á Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Bíllinn þarf að vera með Bluetooth svo hægt sé að setja símann upp sem fylgitæki.</string>
+ <string name="turn_on_bluetooth_dialog_title">Kveikja á Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Bíllinn þarf að vera með Bluetooth svo hægt sé að tengja fylgitæki.</string>
+ <string name="accept">Samþykkja</string>
+ <string name="reject">Hafna</string>
+ <string name="confirm">Staðfesta</string>
+ <string name="cancel">Hætta við</string>
+ <string name="remove">Fjarlægja</string>
+ <string name="ok">Í lagi</string>
+ <string name="connection">Tenging</string>
+ <string name="forget_title">Gleyma þessu tæki</string>
+ <string name="forget">Gleyma</string>
+ <string name="disable">Slökkva</string>
+ <string name="enable">Virkja</string>
+ <string name="continue_button">Áfram</string>
+ <string name="retry">Reyna aftur</string>
+ <string name="turn_on">Kveikja</string>
+ <string name="not_now">Ekki núna</string>
+ <string name="connected">Tengt</string>
+ <string name="notDetected">Fannst ekki</string>
+ <string name="disconnected">Aftengt</string>
+ <string name="unknown">Óþekkt</string>
+ <string name="app_running_msg_channel_name">SMS-skilaboðaþjónusta síma er í gangi</string>
+ <string name="app_running_msg_notification_title">SMS-skilaboðaþjónusta síma er virk</string>
+ <string name="app_running_msg_notification_content">Tekur við SMS-skilaboðum með fylgitæki</string>
+ <string name="trusted_device_feature_title">Taka prófílinn úr lás með símanum</string>
+ <string name="trusted_device_feature_instruction">Stilltu hvernig er hægt að taka úr lás í fylgiforritinu</string>
+ <string name="trusted_device_item_title">Leyfa &lt;b&gt;%1$s&lt;/b&gt; að taka prófílinn minn úr lás</string>
+ <string name="device_not_connected_dialog_title">Síminn verður að vera með virka tengingu</string>
+ <string name="device_not_connected_dialog_message">Til að kveikja á þessum eiginleika skaltu ganga úr skugga um að bíllinn og síminn séu með kveikt á Bluetooth og nálægt hvor öðrum</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; getur nú tekið prófílinn þinn úr lás</string>
+ <string name="create_profile_lock_dialog_title">Búa til aðalprófíllás</string>
+ <string name="create_profile_lock_dialog_message">Til að geta notað símann til að taka prófílinn þinn úr lás þarftu að hafa aðalprófíllás til vara</string>
+ <string name="unlock_profile_to_finish_title">Taktu prófílinn þinn úr lás til að ljúka</string>
+ <string name="unlock_profile_to_finish_message">Þú bjóst til nýjan prófíllás. Nú skaltu slá hann aftur inn til að staðfesta að síminn þinn geti tekið prófílinn þinn sjálfkrafa úr lás</string>
+ <string name="disable_device_connection_text">Aftengja þetta tæki</string>
+ <string name="enable_device_connection_text">Tengja þetta tæki aftur</string>
+ <string name="trusted_device_notification_channel_name">Taka úr lás með síma</string>
+ <string name="trusted_device_notification_title">Leyfa símanum þínum að taka prófílinn þinn úr lás</string>
+ <string name="trusted_device_notification_content">Ýttu hér til að heimila þennan eiginleika</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Eitthvað fór úrskeiðis</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Ekki tókst að kveikja á þessum eiginleika í augnablikinu. Reyndu aftur.</string>
+ <string name="create_phone_lock_dialog_title">Búa til skjálás í símanum</string>
+ <string name="create_phone_lock_dialog_message">Síminn þinn er ekki með skjálás. Til að geta tekið prófíl bílsins úr lás með símanum skaltu fyrst búa til skjálás (einnig kallaður aðgangskóði) í stillingum símans.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d ný skilaboð</item>
+ <item quantity="other">%d ný skilaboð</item>
+ </plurals>
+ <string name="name_not_available">Nafn ekki tiltækt</string>
</resources>
diff --git a/companiondevice/res/values-it/strings.xml b/companiondevice/res/values-it/strings.xml
index 8731ac2..ca5904c 100644
--- a/companiondevice/res/values-it/strings.xml
+++ b/companiondevice/res/values-it/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Dispositivo associato"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Aggiungi un dispositivo associato"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Collega un dispositivo complementare"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Puoi usare il telefono come dispositivo complementare per gestire la tua esperienza di guida"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Verifica che l\'"<b>"app complementare"</b>" sia installata sul telefono"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Conferma il codice sul telefono"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Conferma che questo codice corrisponde a quello visualizzato sul telefono"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Il dispositivo è stato associato correttamente"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Apri l\'app e collegala a &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Apri l\'app e segui le istruzioni"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Rimuovere &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"L\'auto non sarà più accoppiata a questo dispositivo. Dovrai inoltre rimuovere questa auto dall\'app complementare."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> rimosso"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Impossibile rimuovere <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Continua la configurazione sul telefono"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Si è verificato un errore"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Questa schermata non può mostrare i contenuti correttamente. Riprova."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Attiva Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"La tua auto deve disporre del Bluetooth per impostare il telefono come dispositivo complementare."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Attivare il Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"La tua auto deve disporre del Bluetooth per collegarsi al dispositivo complementare."</string>
- <string name="accept" msgid="1454710793329618813">"Accetta"</string>
- <string name="reject" msgid="4315432282758892890">"Rifiuta"</string>
- <string name="confirm" msgid="3748997214719276945">"Conferma"</string>
- <string name="cancel" msgid="4306609731174629323">"Annulla"</string>
- <string name="remove" msgid="5513398257088729188">"Rimuovi"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Connessione"</string>
- <string name="forget_title" msgid="3027608547243824729">"Rimuovi questo dispositivo"</string>
- <string name="forget" msgid="2069897665699141222">"Rimuovi"</string>
- <string name="disable" msgid="4619854429066283970">"Disattiva"</string>
- <string name="enable" msgid="7656386199154111316">"Attiva"</string>
- <string name="continue_button" msgid="2748318968566159950">"Continua"</string>
- <string name="retry" msgid="3783419451480721367">"Riprova"</string>
- <string name="turn_on" msgid="4288754850470994812">"Attiva"</string>
- <string name="not_now" msgid="8764692269093707622">"Non ora"</string>
- <string name="connected" msgid="8051190714042020471">"Collegato"</string>
- <string name="notDetected" msgid="4115229772085594506">"Non rilevato"</string>
- <string name="disconnected" msgid="8526513868622591894">"Scollegato"</string>
- <string name="unknown" msgid="555736316465118024">"Sconosciuto"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Servizio di messaggistica telefonica in esecuzione"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Il servizio di messaggistica telefonica è attivo"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Ricezione di SMS tramite dispositivo complementare"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Sblocca il profilo con il telefono"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Verifica la tua app complementare per impostare le opzioni di sblocco"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Consenti a &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; di sbloccare il mio profilo"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Il telefono deve avere una connessione attiva"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Per attivare questa funzionalità, assicurati che l\'auto e il telefono abbiano il Bluetooth attivato e che il telefono si trovi vicino al veicolo"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"Ora &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; può sbloccare il tuo profilo"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Crea un blocco del profilo principale"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Per utilizzare il telefono per sbloccare il profilo, ti serve un blocco del profilo principale come backup"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Sblocca il profilo per terminare"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Hai creato un nuovo blocco profilo. Ora, inseriscilo di nuovo per confermare che il telefono può sbloccare automaticamente il profilo"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Scollega questo dispositivo"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Ricollega questo dispositivo"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Sblocca con il telefono"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Consenti al telefono di sbloccare il tuo profilo"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Tocca qui per autorizzare questa funzionalità"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Si è verificato un errore"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"La funzionalità non può essere disattivata in questo momento. Riprova."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Crea un blocco schermo sul telefono"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Sul telefono non è configurato un blocco schermo. Per sbloccare il profilo della tua auto con il telefono, devi prima creare un blocco schermo, noto anche come passcode, nelle impostazioni del telefono."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Dispos. associato</string>
+ <string name="add_device_title">Aggiungi un dispositivo associato</string>
+ <string name="add_associated_device_title">Collega un dispositivo complementare</string>
+ <string name="add_associated_device_instruction">Puoi usare il telefono come dispositivo complementare per gestire la tua esperienza di guida</string>
+ <string name="associated_device_install_app">Verifica che l\'<b>app complementare</b> sia installata sul telefono</string>
+ <string name="associated_device_pairing_code_title">Conferma il codice sul telefono</string>
+ <string name="associated_device_pairing_message">Conferma che questo codice corrisponde a quello visualizzato sul telefono</string>
+ <string name="associated_device_success">Il dispositivo è stato associato correttamente</string>
+ <string name="associated_device_select_device">Apri l\'app e collegala a &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Apri l\'app e segui le istruzioni</string>
+ <string name="remove_associated_device_title">Vuoi eliminare &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">L\'auto non sarà più accoppiata a questo dispositivo. Dovrai inoltre rimuovere questa auto dall\'app complementare.</string>
+ <string name="device_removed_success_toast_text">Dispositivo %1$s eliminato</string>
+ <string name="device_removed_failure_toast_text">Impossibile eliminare %1$s</string>
+ <string name="continue_setup_toast_text">Continua la configurazione sul telefono</string>
+ <string name="error_screen_title">Si è verificato un problema</string>
+ <string name="error_screen_message">Impossibile visualizzare correttamente questa schermata. Riprova.</string>
+ <string name="turn_on_bluetooth_title">Attiva Bluetooth</string>
+ <string name="turn_on_bluetooth_message">La tua auto deve disporre del Bluetooth per poter configurare il telefono come dispositivo complementare.</string>
+ <string name="turn_on_bluetooth_dialog_title">Vuoi attivare il Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">La tua auto deve disporre del Bluetooth per potersi connettere al dispositivo complementare.</string>
+ <string name="accept">Accetta</string>
+ <string name="reject">Rifiuta</string>
+ <string name="confirm">Conferma</string>
+ <string name="cancel">Annulla</string>
+ <string name="remove">Rimuovi</string>
+ <string name="ok">OK</string>
+ <string name="connection">Connessione</string>
+ <string name="forget_title">Elimina questo dispositivo</string>
+ <string name="forget">Elimina</string>
+ <string name="disable">Disattiva</string>
+ <string name="enable">Attiva</string>
+ <string name="continue_button">Continua</string>
+ <string name="retry">Riprova</string>
+ <string name="turn_on">Attiva</string>
+ <string name="not_now">Non ora</string>
+ <string name="connected">Connesso</string>
+ <string name="notDetected">Non rilevato</string>
+ <string name="disconnected">Disconnesso</string>
+ <string name="unknown">Sconosciuto</string>
+ <string name="app_running_msg_channel_name">Servizio di SMS del telefono in esecuzione</string>
+ <string name="app_running_msg_notification_title">Servizio di SMS del telefono attivo</string>
+ <string name="app_running_msg_notification_content">Ricezione di SMS tramite dispositivo complementare</string>
+ <string name="trusted_device_feature_title">Sblocca il profilo con il telefono</string>
+ <string name="trusted_device_feature_instruction">Verifica la tua app complementare per impostare le opzioni di sblocco</string>
+ <string name="trusted_device_item_title">Consenti a &lt;b&gt;%1$s&lt;/b&gt; di sbloccare il mio profilo</string>
+ <string name="device_not_connected_dialog_title">Il telefono deve avere una connessione attiva</string>
+ <string name="device_not_connected_dialog_message">Per attivare questa funzionalità, assicurati che l\'auto e il telefono abbiano il Bluetooth attivo e che il telefono si trovi vicino al veicolo</string>
+ <string name="trusted_device_enrollment_success_message">Ora &lt;b&gt;%1$s&lt;/b&gt; può sbloccare il tuo profilo</string>
+ <string name="create_profile_lock_dialog_title">Crea un blocco del profilo principale</string>
+ <string name="create_profile_lock_dialog_message">Per poter usare il telefono per sbloccare il tuo profilo, devi avere un blocco del profilo principale come backup</string>
+ <string name="unlock_profile_to_finish_title">Sblocca il profilo per terminare</string>
+ <string name="unlock_profile_to_finish_message">Hai creato un nuovo blocco profilo. Ora, inseriscilo di nuovo per confermare che il telefono può sbloccare automaticamente il profilo</string>
+ <string name="disable_device_connection_text">Disconnetti questo dispositivo</string>
+ <string name="enable_device_connection_text">Riconnetti questo dispositivo</string>
+ <string name="trusted_device_notification_channel_name">Sblocca con il telefono</string>
+ <string name="trusted_device_notification_title">Consenti al telefono di sbloccare il tuo profilo</string>
+ <string name="trusted_device_notification_content">Tocca qui per autorizzare questa funzionalità</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Si è verificato un problema</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Purtroppo non è al momento possibile attivare questa funzionalità. Riprova.</string>
+ <string name="create_phone_lock_dialog_title">Crea un blocco schermo sul telefono</string>
+ <string name="create_phone_lock_dialog_message">Sul telefono non è configurato un blocco schermo. Per sbloccare il profilo della tua auto con il telefono, devi prima creare un blocco schermo (chiamato anche passcode) nelle impostazioni del telefono.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Nuovo messaggio</item>
+ <item quantity="other">%d nuovi messaggi</item>
+ </plurals>
+ <string name="name_not_available">Nome non disponibile</string>
</resources>
diff --git a/companiondevice/res/values-iw/strings.xml b/companiondevice/res/values-iw/strings.xml
index 5fe1c7c..35aaa58 100644
--- a/companiondevice/res/values-iw/strings.xml
+++ b/companiondevice/res/values-iw/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,76 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"מכשיר משויך"</string>
- <string name="add_device_title" msgid="6166003577845888151">"הוספת מכשיר משויך"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"חיבור המכשיר הנלווה"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"אפשר להשתמש בטלפון כמכשיר נלווה לעזרה בניהול חוויית הנהיגה"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"יש לוודא ש"<b>"האפליקציה הנלווית"</b>" מותקנת בטלפון שלך"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"צריך לאשר את הקוד בטלפון"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"יש לאשר שזה מתאים לקוד שמופיע בטלפון שלך"</string>
- <string name="associated_device_success" msgid="584760065696870256">"המכשיר שויך בהצלחה"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"יש לפתוח את האפליקציה ולהתחבר אל ;lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&amp;gt&amp;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"יש לפתוח את האפליקציה ולפעול לפי ההוראות"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"למחוק את ;lt;/b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&amp;gt&amp;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"מכונית זו לא תהיה עוד מותאמת למכשיר הזה. בנוסף, יש להסיר את המכונית הזו מהאפליקציה הנלווית."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> נמחק"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"נכשלה מחיקת <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"המשך ההגדרה בטלפון"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"משהו השתבש"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"לצערנו, משהו השתבש בתצוגת המסך. יש לנסות שוב."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"הפעלת Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"כדי להגדיר את הטלפון כמכשיר נלווה, יש צורך ב-Bluetooth במכונית."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"האם להפעיל את ה-Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"כדי להתחבר למכשיר הנלווה, יש צורך ב-Bluetooth במכונית."</string>
- <string name="accept" msgid="1454710793329618813">"אישור"</string>
- <string name="reject" msgid="4315432282758892890">"דחייה"</string>
- <string name="confirm" msgid="3748997214719276945">"אישור"</string>
- <string name="cancel" msgid="4306609731174629323">"ביטול"</string>
- <string name="remove" msgid="5513398257088729188">"הסרה"</string>
- <string name="ok" msgid="2825038997730899083">"אישור"</string>
- <string name="connection" msgid="2798490936433656846">"חיבור"</string>
- <string name="forget_title" msgid="3027608547243824729">"מחיקת המכשיר הזה"</string>
- <string name="forget" msgid="2069897665699141222">"מחיקה"</string>
- <string name="disable" msgid="4619854429066283970">"השבתה"</string>
- <string name="enable" msgid="7656386199154111316">"הפעלה"</string>
- <string name="continue_button" msgid="2748318968566159950">"המשך"</string>
- <string name="retry" msgid="3783419451480721367">"אני רוצה לנסות שוב"</string>
- <string name="turn_on" msgid="4288754850470994812">"הפעלה"</string>
- <string name="not_now" msgid="8764692269093707622">"לא עכשיו"</string>
- <string name="connected" msgid="8051190714042020471">"מחובר"</string>
- <string name="notDetected" msgid="4115229772085594506">"לא מזוהה"</string>
- <string name="disconnected" msgid="8526513868622591894">"מנותק"</string>
- <string name="unknown" msgid="555736316465118024">"לא ידוע"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"שירות הודעות הטקסט פועל בטלפון"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"שירות הודעות הטקסט פעיל בטלפון"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"קבלת הודעות טקסט דרך מכשיר נלווה"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"ביטול נעילת הפרופיל באמצעות הטלפון"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"יש לבדוק באפליקציה הנלווית כדי להגדיר אפשרויות לביטול נעילה"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"ניתן יהיה לבטל את נעילת הפרופיל באמצעות &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"הטלפון חייב להיות מחובר במצב פעיל"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"לצורך הפעלת התכונה הזאת, יש לוודא שה-Bluetooth מופעל במכונית ובטלפון, ושהטלפון נמצא בקרבת המכונית"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"עכשיו ניתן לבטל את נעילת הפרופיל באמצעות ;lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&amp;gt&amp;"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"יצירה של נעילת פרופיל ראשית"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"כדי להשתמש בטלפון לביטול נעילת הפרופיל, נדרשת נעילת פרופיל ראשית כגיבוי"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"לסיום, יש לבטל את נעילת הפרופיל"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"יצרת נעילת פרופיל חדשה. אחר כך, יש להזין זאת שוב כדי לאשר שהטלפון יכול לבטל את נעילת הפרופיל שלך באופן אוטומטי"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"לנתק את המכשיר"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"חיבור מחדש של המכשיר"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"ביטול נעילה באמצעות הטלפון"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"ניתן יהיה לבטל את נעילת הפרופיל באמצעות הטלפון"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"יש להקיש כאן כדי לתת הרשאה לתכונה הזו"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"משהו השתבש"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"לצערנו, לא ניתן להפעיל את התכונה הזאת כרגע. יש לנסות שוב."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"יצירת נעילת מסך בטלפון"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"לטלפון שלך אין נעילת מסך. כדי לבטל את נעילת פרופיל המכונית באמצעות הטלפון, תחילה צריך ליצור נעילת מסך (או \"קוד גישה\") בהגדרות הטלפון."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">מכשיר משויך</string>
+ <string name="add_device_title">הוספת מכשיר משויך</string>
+ <string name="add_associated_device_title">חיבור המכשיר הנלווה</string>
+ <string name="add_associated_device_instruction">אפשר להשתמש בטלפון כמכשיר נלווה לעזרה בניהול חוויית הנהיגה</string>
+ <string name="associated_device_install_app">יש לוודא ש<b>האפליקציה הנלווית</b> מותקנת בטלפון</string>
+ <string name="associated_device_pairing_code_title">צריך לאשר את הקוד בטלפון</string>
+ <string name="associated_device_pairing_message">יש לאשר שזה מתאים לקוד שמופיע בטלפון שלך</string>
+ <string name="associated_device_success">המכשיר שויך בהצלחה</string>
+ <string name="associated_device_select_device">יש לפתוח את האפליקציה ולהתחבר אל &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">יש לפתוח את האפליקציה ולפעול לפי ההוראות</string>
+ <string name="remove_associated_device_title">למחוק את &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">מכונית זו לא תהיה עוד מותאמת למכשיר הזה. בנוסף, יש להסיר את המכונית הזו מהאפליקציה הנלווית.</string>
+ <string name="device_removed_success_toast_text">%1$s נמחק</string>
+ <string name="device_removed_failure_toast_text">נכשלה מחיקת %1$s</string>
+ <string name="continue_setup_toast_text">המשך ההגדרה בטלפון</string>
+ <string name="error_screen_title">משהו השתבש</string>
+ <string name="error_screen_message">לצערנו, משהו השתבש בתצוגת המסך. אפשר לנסות שוב.</string>
+ <string name="turn_on_bluetooth_title">הפעלת Bluetooth</string>
+ <string name="turn_on_bluetooth_message">כדי להגדיר את הטלפון כמכשיר נלווה, יש צורך ב-Bluetooth במכונית.</string>
+ <string name="turn_on_bluetooth_dialog_title">האם להפעיל את Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">כדי להתחבר למכשיר הנלווה, יש צורך ב-Bluetooth במכונית.</string>
+ <string name="accept">אישור</string>
+ <string name="reject">דחייה</string>
+ <string name="confirm">אישור</string>
+ <string name="cancel">ביטול</string>
+ <string name="remove">הסרה</string>
+ <string name="ok">בסדר</string>
+ <string name="connection">חיבור</string>
+ <string name="forget_title">מחיקת המכשיר הזה</string>
+ <string name="forget">מחיקה</string>
+ <string name="disable">השבתה</string>
+ <string name="enable">הפעלה</string>
+ <string name="continue_button">המשך</string>
+ <string name="retry">ניסיון חוזר</string>
+ <string name="turn_on">הפעלה</string>
+ <string name="not_now">לא עכשיו</string>
+ <string name="connected">מחובר</string>
+ <string name="notDetected">לא מזוהה</string>
+ <string name="disconnected">מנותק</string>
+ <string name="unknown">לא ידוע</string>
+ <string name="app_running_msg_channel_name">שירות הודעות הטקסט פועל בטלפון</string>
+ <string name="app_running_msg_notification_title">שירות הודעות הטקסט פעיל בטלפון</string>
+ <string name="app_running_msg_notification_content">קבלת הודעות טקסט דרך מכשיר נלווה</string>
+ <string name="trusted_device_feature_title">ביטול נעילת הפרופיל באמצעות הטלפון</string>
+ <string name="trusted_device_feature_instruction">יש להשתמש באפליקציה הנלווית כדי להגדיר אפשרויות לביטול נעילה</string>
+ <string name="trusted_device_item_title">הענקת הרשאה לביטול נעילת הפרופיל למכשיר &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="device_not_connected_dialog_title">הטלפון חייב להיות מחובר במצב פעיל</string>
+ <string name="device_not_connected_dialog_message">לצורך הפעלת התכונה הזאת, יש לוודא שה-Bluetooth מופעל במכונית ובטלפון, ושהטלפון נמצא בקרבת המכונית</string>
+ <string name="trusted_device_enrollment_success_message">למכשיר &lt;b&gt;%1$s&lt;/b&gt; יש עכשיו הרשאה לביטול נעילת הפרופיל</string>
+ <string name="create_profile_lock_dialog_title">יצירה של נעילת פרופיל ראשית</string>
+ <string name="create_profile_lock_dialog_message">כדי להשתמש בטלפון לביטול נעילת הפרופיל, נדרשת נעילת פרופיל ראשית כגיבוי</string>
+ <string name="unlock_profile_to_finish_title">לסיום, יש לבטל את נעילת הפרופיל</string>
+ <string name="unlock_profile_to_finish_message">יצרת נעילת פרופיל חדשה. אחר כך, יש להזין זאת שוב כדי לאשר שהטלפון יכול לבטל את נעילת הפרופיל שלך באופן אוטומטי</string>
+ <string name="disable_device_connection_text">ניתוק המכשיר</string>
+ <string name="enable_device_connection_text">חיבור מחדש של המכשיר</string>
+ <string name="trusted_device_notification_channel_name">ביטול נעילה באמצעות הטלפון</string>
+ <string name="trusted_device_notification_title">ניתן יהיה לבטל את נעילת הפרופיל באמצעות הטלפון</string>
+ <string name="trusted_device_notification_content">יש להקיש כאן כדי לתת הרשאה לתכונה הזו</string>
+ <string name="trusted_device_enrollment_error_dialog_title">משהו השתבש</string>
+ <string name="trusted_device_enrollment_error_dialog_message">לצערנו, לא ניתן להפעיל את התכונה הזאת כרגע. אפשר לנסות שוב.</string>
+ <string name="create_phone_lock_dialog_title">יצירת נעילת מסך בטלפון</string>
+ <string name="create_phone_lock_dialog_message">בטלפון שלך לא מוגדרת נעילת מסך. כדי לבטל את נעילת פרופיל המכונית באמצעות הטלפון, תחילה צריך ליצור נעילת מסך (או \"קוד גישה\") בהגדרות הטלפון.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">הודעה חדשה</item>
+ <item quantity="two">%d הודעות חדשות</item>
+ <item quantity="many">%d הודעות חדשות</item>
+ <item quantity="other">%d הודעות חדשות</item>
+ </plurals>
+ <string name="name_not_available">השם לא זמין</string>
</resources>
diff --git a/companiondevice/res/values-ja/strings.xml b/companiondevice/res/values-ja/strings.xml
index ecf02ce..c43a23d 100644
--- a/companiondevice/res/values-ja/strings.xml
+++ b/companiondevice/res/values-ja/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"関連付けたデバイス"</string>
- <string name="add_device_title" msgid="6166003577845888151">"関連付けしたデバイスを追加"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"コンパニオン デバイスの接続"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"スマートフォンを運転操作の管理に役立つコンパニオン デバイスとして使用できます"</string>
- <string name="associated_device_install_app" msgid="981663561198924864"><b>"コンパニオン アプリ"</b>"をスマートフォンにインストールしてください"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"スマートフォンでのコードの確認"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"このコードがスマートフォンに表示されているコードと一致することをご確認ください"</string>
- <string name="associated_device_success" msgid="584760065696870256">"デバイスの関連付けが完了しました"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"アプリを開き &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; に接続します"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"アプリを開き、指示に従ってください"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; を削除しますか?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"この車とこのデバイスとのペア設定が解除されました。コンパニオン アプリからこの車を削除することも必要です。"</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> を削除しました"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> を削除できませんでした"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"スマートフォンで設定を続行してください"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"エラー"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"この画面を正しく表示できませんでした。もう一度お試しください。"</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Bluetooth をオンにする"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"スマートフォンをコンパニオン デバイスとして設定するには、車に Bluetooth が必要です。"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Bluetooth をオンにしますか?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"コンパニオン デバイスに接続するには、車に Bluetooth が必要です。"</string>
- <string name="accept" msgid="1454710793329618813">"同意する"</string>
- <string name="reject" msgid="4315432282758892890">"拒否"</string>
- <string name="confirm" msgid="3748997214719276945">"確認"</string>
- <string name="cancel" msgid="4306609731174629323">"キャンセル"</string>
- <string name="remove" msgid="5513398257088729188">"削除"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"接続"</string>
- <string name="forget_title" msgid="3027608547243824729">"このデバイスを削除"</string>
- <string name="forget" msgid="2069897665699141222">"削除"</string>
- <string name="disable" msgid="4619854429066283970">"無効にする"</string>
- <string name="enable" msgid="7656386199154111316">"有効にする"</string>
- <string name="continue_button" msgid="2748318968566159950">"続行"</string>
- <string name="retry" msgid="3783419451480721367">"再試行"</string>
- <string name="turn_on" msgid="4288754850470994812">"オンにする"</string>
- <string name="not_now" msgid="8764692269093707622">"後で"</string>
- <string name="connected" msgid="8051190714042020471">"接続済み"</string>
- <string name="notDetected" msgid="4115229772085594506">"検出されませんでした"</string>
- <string name="disconnected" msgid="8526513868622591894">"接続解除"</string>
- <string name="unknown" msgid="555736316465118024">"不明"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"スマートフォン テキスト メッセージ サービス実行中"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"スマートフォン テキスト メッセージ サービス有効"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"コンパニオン デバイス経由でテキスト メッセージを受信中"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"スマートフォンでプロファイルのロック解除"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"コンパニオン アプリを確認してロック解除オプションを設定します"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; によるプロファイルのロック解除"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"スマートフォンを接続してください"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"この機能をオンにするには、車とスマートフォンで Bluetooth が有効で、車とスマートフォンが近くにあることをご確認ください"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; でプロファイルのロックを解除できるようになりました"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"メイン プロファイル ロックの作成"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"スマートフォンを使用してプロファイルのロックを解除するには、バックアップとしてメイン プロファイル ロックが必要です"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"プロファイルのロックを解除して終了"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"新しいプロファイル ロックを作成しました。次に、もう一度入力して、スマートフォンでプロファイルを自動的にロック解除できることをご確認ください"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"このデバイスとの接続を解除ます"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"このデバイスを再接続します"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"スマートフォンでロック解除"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"スマートフォンによるプロファイルのロック解除"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"ここをタップしてこの機能を承認してください"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"エラー"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"この機能をオンにできませんでした。もう一度お試しください。"</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"スマートフォンでの画面ロックの作成"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"スマートフォンで画面ロックが設定されていません。スマートフォンで車のプロファイルのロックを解除するには、まずスマートフォンの設定で画面ロック(パスコード)を作成してください。"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">関連付けしたデバイス</string>
+ <string name="add_device_title">関連付けしたデバイスを追加</string>
+ <string name="add_associated_device_title">コンパニオン デバイスの接続</string>
+ <string name="add_associated_device_instruction">スマートフォンを運転操作の管理に役立つコンパニオン デバイスとして使用できます</string>
+ <string name="associated_device_install_app"><b>コンパニオン アプリ</b>をスマートフォンにインストールしてください</string>
+ <string name="associated_device_pairing_code_title">スマートフォンでのコードの確認</string>
+ <string name="associated_device_pairing_message">このコードがスマートフォンに表示されているコードと一致することをご確認ください</string>
+ <string name="associated_device_success">デバイスの関連付けが完了しました</string>
+ <string name="associated_device_select_device">アプリを開き &lt;b&gt;%1$s&lt;/b&gt; に接続します</string>
+ <string name="associated_device_open_app">アプリを開き、指示に従ってください</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; を削除しますか?</string>
+ <string name="remove_associated_device_message">この車とこのデバイスとのペア設定が解除されました。コンパニオン アプリからこの車を削除することも必要です。</string>
+ <string name="device_removed_success_toast_text">%1$s を削除しました</string>
+ <string name="device_removed_failure_toast_text">%1$s を削除できませんでした</string>
+ <string name="continue_setup_toast_text">スマートフォンでセットアップを続行してください</string>
+ <string name="error_screen_title">エラーが発生しました</string>
+ <string name="error_screen_message">この画面を正しく表示できませんでした。再入力してください。</string>
+ <string name="turn_on_bluetooth_title">Bluetooth を ON にする</string>
+ <string name="turn_on_bluetooth_message">スマートフォンをコンパニオン デバイスとして設定するには、車に Bluetooth が必要です。</string>
+ <string name="turn_on_bluetooth_dialog_title">Bluetooth を ON にしますか?</string>
+ <string name="turn_on_bluetooth_dialog_message">コンパニオン デバイスに接続するには、車に Bluetooth が必要です。</string>
+ <string name="accept">同意する</string>
+ <string name="reject">拒否</string>
+ <string name="confirm">確認</string>
+ <string name="cancel">キャンセル</string>
+ <string name="remove">削除</string>
+ <string name="ok">OK</string>
+ <string name="connection">接続</string>
+ <string name="forget_title">このデバイスを削除</string>
+ <string name="forget">削除</string>
+ <string name="disable">無効にする</string>
+ <string name="enable">有効にする</string>
+ <string name="continue_button">続行</string>
+ <string name="retry">再試行</string>
+ <string name="turn_on">有効にする</string>
+ <string name="not_now">後で</string>
+ <string name="connected">接続完了</string>
+ <string name="notDetected">検出されませんでした</string>
+ <string name="disconnected">未接続</string>
+ <string name="unknown">不明</string>
+ <string name="app_running_msg_channel_name">スマートフォン テキスト メッセージ サービス実行中</string>
+ <string name="app_running_msg_notification_title">スマートフォン テキスト メッセージ サービス有効</string>
+ <string name="app_running_msg_notification_content">コンパニオン デバイス経由でテキスト メッセージを受信中</string>
+ <string name="trusted_device_feature_title">スマートフォンでプロファイルのロック解除</string>
+ <string name="trusted_device_feature_instruction">コンパニオン アプリを確認してロック解除オプションを設定します</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; によるプロファイルのロック解除</string>
+ <string name="device_not_connected_dialog_title">スマートフォンを接続してください</string>
+ <string name="device_not_connected_dialog_message">この機能を ON にするには、車とスマートフォンで Bluetooth が有効で、車とスマートフォンが近くにあることをご確認ください</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; でプロファイルのロックを解除できるようになりました</string>
+ <string name="create_profile_lock_dialog_title">メイン プロファイル ロックの作成</string>
+ <string name="create_profile_lock_dialog_message">スマートフォンを使用してプロファイルのロックを解除するには、バックアップとしてメイン プロファイル ロックが必要です</string>
+ <string name="unlock_profile_to_finish_title">プロファイルのロックを解除して終了</string>
+ <string name="unlock_profile_to_finish_message">新しいプロファイル ロックを作成しました。次に、もう一度入力して、スマートフォンでプロファイルを自動的にロック解除できることをご確認ください</string>
+ <string name="disable_device_connection_text">このデバイスとの接続を解除します</string>
+ <string name="enable_device_connection_text">このデバイスを再接続します</string>
+ <string name="trusted_device_notification_channel_name">スマートフォンでロック解除</string>
+ <string name="trusted_device_notification_title">スマートフォンによるプロファイルのロック解除</string>
+ <string name="trusted_device_notification_content">ここをタップしてこの機能を承認してください</string>
+ <string name="trusted_device_enrollment_error_dialog_title">エラーが発生しました</string>
+ <string name="trusted_device_enrollment_error_dialog_message">この機能を ON にできませんでした。再入力してください。</string>
+ <string name="create_phone_lock_dialog_title">スマートフォンでの画面ロックの作成</string>
+ <string name="create_phone_lock_dialog_message">スマートフォンで画面ロックが設定されていません。スマートフォンで車のプロファイルのロックを解除するには、まずスマートフォンの設定で画面ロック(パスコード)を作成してください。</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">新着メッセージ</item>
+ <item quantity="other">%d 件の新着メッセージ</item>
+ </plurals>
+ <string name="name_not_available">名前がありません</string>
</resources>
diff --git a/companiondevice/res/values-ka/strings.xml b/companiondevice/res/values-ka/strings.xml
index 26007d2..a42dad6 100644
--- a/companiondevice/res/values-ka/strings.xml
+++ b/companiondevice/res/values-ka/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"დაკავშირებული მოწყ."</string>
- <string name="add_device_title" msgid="6166003577845888151">"დაკავშირებული მოწყობილობის დამატება"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"კომპანიონი მოწყობილობის დაკავშირება"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"ტელეფონი შეგიძლიათ გამოიყენოთ, როგორც კომპანიონი მოწყობილობა, საავტომობილო გამოცდილების სამართავად"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"დარწმუნდით, რომ "<b>"კომპანიონი აპი"</b>" ინსტალირებული გაქვთ ტელეფონზე"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"დაადასტურეთ კოდი ტელეფონზე"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"დაადასტურეთ, რომ ეს ემთხვევა თქვენს ტელეფონზე ნაჩვენებ კოდს"</string>
- <string name="associated_device_success" msgid="584760065696870256">"მოწყობილობა წარმატებით დაკავშირდა"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"გახსენით აპი და დააკავშირეთ &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;-თან"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"გახსენით აპი და მიჰყევით მის ინსტრუქციებს"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"გსურთ &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;-ის დავიწყება?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"ეს მანქანა ამ მოწყობილობასთან დაწყვილებული აღარ იქნება. გარდა ამისა, დაგჭირდებათ ამ მანქანის კომპანიონი აპიდან ამოშლა."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> დავიწყებულია"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g>-ის დავიწყება ვერ მოხერხდა"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"დაყენების გაგრძელება თქვენს ტელეფონზე"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"წარმოიქმნა შეფერხება"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"სამწუხაროდ, ამ ეკრანის სათანადოდ ჩვენება ვერ მოხერხდა. გთხოვთ, ცადოთ ხელახლა."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Bluetooth-ის ჩართვა"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"თქვენი ტელეფონის კომპანიონ მოწყობილობად დასაყენებლად თქვენს მანქანას Bluetooth სჭირდება."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"გსურთ Bluetooth-ის ჩართვა?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"თქვენს კომპანიონ მოწყობილობასთან დასაკავშირებლად თქვენს მანქანას Bluetooth სჭირდება."</string>
- <string name="accept" msgid="1454710793329618813">"დათანხმება"</string>
- <string name="reject" msgid="4315432282758892890">"უარყოფა"</string>
- <string name="confirm" msgid="3748997214719276945">"დადასტურება"</string>
- <string name="cancel" msgid="4306609731174629323">"გაუქმება"</string>
- <string name="remove" msgid="5513398257088729188">"ამოშლა"</string>
- <string name="ok" msgid="2825038997730899083">"კარგი"</string>
- <string name="connection" msgid="2798490936433656846">"დაკავშირება"</string>
- <string name="forget_title" msgid="3027608547243824729">"ამ მოწყობილობის დავიწყება"</string>
- <string name="forget" msgid="2069897665699141222">"დავიწყება"</string>
- <string name="disable" msgid="4619854429066283970">"გათიშვა"</string>
- <string name="enable" msgid="7656386199154111316">"ჩართვა"</string>
- <string name="continue_button" msgid="2748318968566159950">"გაგრძელება"</string>
- <string name="retry" msgid="3783419451480721367">"ხელახლა ცდა"</string>
- <string name="turn_on" msgid="4288754850470994812">"ჩართვა"</string>
- <string name="not_now" msgid="8764692269093707622">"ახლა არა"</string>
- <string name="connected" msgid="8051190714042020471">"დაკავშირებული"</string>
- <string name="notDetected" msgid="4115229772085594506">"აღმოჩენილი არ არის"</string>
- <string name="disconnected" msgid="8526513868622591894">"კავშირი გაწყვეტილია"</string>
- <string name="unknown" msgid="555736316465118024">"უცნობი"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"ტელეფონის ტექსტური შეტყობინებების სერვისი გაშვებულია"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"ტელეფონის ტექსტური შეტყობინებების სერვისი აქტიურია"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"ტექსტური შეტყობინებები მიიღება კომპანიონი მოწყობილობის მეშვეობით"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"პროფილის განბლოკვა ტელეფონით"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"შეამოწმეთ თქვენი კომპანიონი აპი განბლოკვის ვარიანტების დასაყენებლად"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;-ისთვის ჩემი პროფილის განბლოკვის ნებართვის მინიჭება"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"თქვენი ტელეფონი აქტიურად უნდა იყოს დაკავშირებული"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"ამ ფუნქციის ჩასართავად დარწმუნდით, რომ თქვენს მანქანას და ტელეფონს ჩართული აქვს Bluetooth და ისინი ერთმანეთთან ახლოს არიან"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;-ს ახლა შეუძლია თქვენი პროფილის განბლოკვა"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"შექმენით პროფილის ძირითადი ბლოკი"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"თქვენი პროფილის განსაბლოკად ტელეფონის გამოსაყენებლად სარეზერვო ასლის სახით დაგჭირდებათ პროფილის ძირითადი ბლოკი"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"დასასრულებლად განბლოკეთ თქვენი პროფილი"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"თქვენ შექმენით პროფილის ახალი ბლოკი. შემდეგ, შეიყვანეთ ის ხელახლა, რათა დაადასტუროთ, რომ თქვენს ტელეფონს შეუძლია ავტომატურად განბლოკოს თქვენი პროფილი"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"ამ მოწყობილობის კავშირის გაწყვეტა"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"ამ მოწყობილობის კავშირის აღდგენა"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"განბლოკვა ტელეფონით"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"მიანიჭეთ თქვენს ტელეფონს თქვენი პროფილის განბლოკვის ნებართვა"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"ამ ფუნქციის ავტორიზაციისთვის შეეხეთ აქ"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"წარმოიქმნა შეფერხება"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"სამწუხაროდ, ამ ფუნქციის ჩართვა ამჟამად ვერ მოხერხდა. გთხოვთ, ცადოთ ხელახლა."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"შექმენით ეკრანის ბლოკი თქვენს ტელეფონზე"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"თქვენს ტელეფონს არ აქვს დაყენებული ეკრანის ბლოკი. მანქანის პროფილის ტელეფონით განსაბლოკად, ჯერ შექმენით ეკრანის ბლოკი (ასევე ცნობილი, როგორც საიდუმლო კოდი) თქვენი ტელეფონის პარამეტრებში."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">დაკავშირებული მოწყ.</string>
+ <string name="add_device_title">დაკავშირებული მოწყობილობის დამატება</string>
+ <string name="add_associated_device_title">კომპანიონი მოწყობილობის დაკავშირება</string>
+ <string name="add_associated_device_instruction">ტელეფონი შეგიძლიათ გამოიყენოთ, როგორც კომპანიონი მოწყობილობა, საავტომობილო გამოცდილების სამართავად</string>
+ <string name="associated_device_install_app">დარწმუნდით, რომ <b>კომპანიონი აპი</b> ინსტალირებული გაქვთ ტელეფონზე</string>
+ <string name="associated_device_pairing_code_title">დაადასტურეთ კოდი ტელეფონზე</string>
+ <string name="associated_device_pairing_message">დაადასტურეთ, რომ ეს ემთხვევა თქვენს ტელეფონზე ნაჩვენებ კოდს</string>
+ <string name="associated_device_success">მოწყობილობა წარმატებით დაკავშირდა</string>
+ <string name="associated_device_select_device">გახსენით აპი და დააკავშირეთ &lt;b&gt;%1$s&lt;/b&gt;-თან</string>
+ <string name="associated_device_open_app">გახსენით აპი და მიჰყევით მის ინსტრუქციებს</string>
+ <string name="remove_associated_device_title">გსურთ &lt;b&gt;%1$s&lt;/b&gt;-ის დავიწყება?</string>
+ <string name="remove_associated_device_message">ეს მანქანა ამ მოწყობილობასთან დაწყვილებული აღარ იქნება. გარდა ამისა, დაგჭირდებათ ამ მანქანის კომპანიონი აპიდან ამოშლა.</string>
+ <string name="device_removed_success_toast_text">%1$s დავიწყებულია</string>
+ <string name="device_removed_failure_toast_text">%1$s-ის დავიწყება ვერ მოხერხდა</string>
+ <string name="continue_setup_toast_text">დაყენების გაგრძელება თქვენს ტელეფონზე</string>
+ <string name="error_screen_title">წარმოიქმნა შეფერხება</string>
+ <string name="error_screen_message">სამწუხაროდ, ამ ეკრანის სათანადოდ ჩვენება ვერ მოხერხდა. ცადეთ ხელახლა.</string>
+ <string name="turn_on_bluetooth_title">ჩართეთ Bluetooth</string>
+ <string name="turn_on_bluetooth_message">თქვენი ტელეფონის კომპანიონ მოწყობილობად დასაყენებლად თქვენს მანქანას Bluetooth სჭირდება.</string>
+ <string name="turn_on_bluetooth_dialog_title">ჩაირთოს Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">თქვენს კომპანიონ მოწყობილობასთან დასაკავშირებლად თქვენს მანქანას Bluetooth სჭირდება.</string>
+ <string name="accept">დათანხმება</string>
+ <string name="reject">უარყოფა</string>
+ <string name="confirm">დადასტურება</string>
+ <string name="cancel">გაუქმება</string>
+ <string name="remove">ამოშლა</string>
+ <string name="ok">კარგი</string>
+ <string name="connection">კავშირი</string>
+ <string name="forget_title">ამ მოწყობილობის დავიწყება</string>
+ <string name="forget">დავიწყება</string>
+ <string name="disable">გათიშვა</string>
+ <string name="enable">ჩართვა</string>
+ <string name="continue_button">გაგრძელება</string>
+ <string name="retry">ხელახლა ცდა</string>
+ <string name="turn_on">ჩართვა</string>
+ <string name="not_now">ახლა არა</string>
+ <string name="connected">დაკავშირებული</string>
+ <string name="notDetected">აღმოჩენილი არ არის</string>
+ <string name="disconnected">კავშირი გაწყვეტილია</string>
+ <string name="unknown">უცნობი</string>
+ <string name="app_running_msg_channel_name">ტელეფონის ტექსტური შეტყობინებების სერვისი გაშვებულია</string>
+ <string name="app_running_msg_notification_title">ტელეფონის ტექსტური შეტყობინებების სერვისი აქტიურია</string>
+ <string name="app_running_msg_notification_content">ტექსტური შეტყობინებები მიიღება კომპანიონი მოწყობილობის მეშვეობით</string>
+ <string name="trusted_device_feature_title">პროფილის განბლოკვა ტელეფონით</string>
+ <string name="trusted_device_feature_instruction">შეამოწმეთ თქვენი კომპანიონი აპი განბლოკვის ვარიანტების დასაყენებლად</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt;-მა შეძლოს ჩემი პროფილის განბლოკვა</string>
+ <string name="device_not_connected_dialog_title">თქვენი ტელეფონი აქტიურად უნდა იყოს დაკავშირებული</string>
+ <string name="device_not_connected_dialog_message">ამ ფუნქციის ჩასართავად დარწმუნდით, რომ თქვენს მანქანას და ტელეფონს ჩართული აქვს Bluetooth და ისინი ერთმანეთთან ახლოს არიან</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt;-ს ახლა შეუძლია თქვენი პროფილის განბლოკვა</string>
+ <string name="create_profile_lock_dialog_title">შექმენით პროფილის ძირითადი ბლოკი</string>
+ <string name="create_profile_lock_dialog_message">თქვენი პროფილის განსაბლოკად ტელეფონის გამოსაყენებლად სარეზერვო ასლის სახით დაგჭირდებათ პროფილის ძირითადი ბლოკი</string>
+ <string name="unlock_profile_to_finish_title">დასასრულებლად განბლოკეთ თქვენი პროფილი</string>
+ <string name="unlock_profile_to_finish_message">თქვენ შექმენით პროფილის ახალი ბლოკი. შემდეგ, შეიყვანეთ ის ხელახლა, რათა დაადასტუროთ, რომ თქვენს ტელეფონს შეუძლია ავტომატურად განბლოკოს თქვენი პროფილი</string>
+ <string name="disable_device_connection_text">ამ მოწყობილობის კავშირის გაწყვეტა</string>
+ <string name="enable_device_connection_text">ამ მოწყობილობის კავშირის აღდგენა</string>
+ <string name="trusted_device_notification_channel_name">განბლოკვა ტელეფონით</string>
+ <string name="trusted_device_notification_title">მიანიჭეთ თქვენს ტელეფონს თქვენი პროფილის განბლოკვის ნებართვა</string>
+ <string name="trusted_device_notification_content">ამ ფუნქციის ავტორიზაციისთვის შეეხეთ აქ</string>
+ <string name="trusted_device_enrollment_error_dialog_title">წარმოიქმნა შეფერხება</string>
+ <string name="trusted_device_enrollment_error_dialog_message">სამწუხაროდ, ამ ფუნქციის ჩართვა ამჯერად ვერ მოხერხდა. ცადეთ ხელახლა.</string>
+ <string name="create_phone_lock_dialog_title">შექმენით ეკრანის ბლოკი თქვენს ტელეფონზე</string>
+ <string name="create_phone_lock_dialog_message">თქვენს ტელეფონს არ აქვს დაყენებული ეკრანის ბლოკი. მანქანის პროფილის ტელეფონით განსაბლოკად, ჯერ შექმენით ეკრანის ბლოკი (ასევე ცნობილი, როგორც საიდუმლო კოდი) თქვენი ტელეფონის პარამეტრებიდან.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">ახალი შეტყობინება</item>
+ <item quantity="other">%d ახალი შეტყობინება</item>
+ </plurals>
+ <string name="name_not_available">სახელი მიუწვდომელია</string>
</resources>
diff --git a/companiondevice/res/values-kk/strings.xml b/companiondevice/res/values-kk/strings.xml
index 32ad30e..3334428 100644
--- a/companiondevice/res/values-kk/strings.xml
+++ b/companiondevice/res/values-kk/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Байланыстырылған құрылғы"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Байланыстырылған құрылғыны енгізу"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Көмекші құрылғыны байланыстыру"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Телефоныңызды көлік жүргізуге көмекші құрылғы ретінде пайдалана аласыз."</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Телефонда "<b>"қосымша қолданба"</b>" орнатылғанына көз жеткізіңіз."</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Кодты телефоннан растау"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Мұның телефонда көрсетілетін кодқа сәйкес келетінін растаңыз."</string>
- <string name="associated_device_success" msgid="584760065696870256">"Құрылғы байланыстырылды."</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Қолданбаны ашып, оны &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; көлігімен байланыстырыңыз."</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Қолданбаны ашып, нұсқауларын орындаңыз."</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; жойылсын ба?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Бұл көлік енді бұл құрылғымен жұптастырылмайды. Сондай-ақ бұл көлікті қосымша қолданбадан өшіру қажет болады."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> телефоны жойылды."</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> телефоны жойылмады."</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Pеттеуді телефонда жалғастырыңыз."</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Бірдеңе дұрыс емес"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Өкінішке орай, бұл экранды дұрыс көрсету мүмкін емес. Қайталап көріңіз."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Bluetooth функциясын қосу"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Телефонды көмекші құрылғы ретінде реттеу үшін Bluetooth функциясы қажет."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Bluetooth функциясын қосу керек пе?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Көмекші құрылғыны байланыстыру үшін көлігіңізге Bluetooth қажет."</string>
- <string name="accept" msgid="1454710793329618813">"Қабылдау"</string>
- <string name="reject" msgid="4315432282758892890">"Қабылдамау"</string>
- <string name="confirm" msgid="3748997214719276945">"Растау"</string>
- <string name="cancel" msgid="4306609731174629323">"Бас тарту"</string>
- <string name="remove" msgid="5513398257088729188">"Өшіру"</string>
- <string name="ok" msgid="2825038997730899083">"Жарайды"</string>
- <string name="connection" msgid="2798490936433656846">"Байланыс"</string>
- <string name="forget_title" msgid="3027608547243824729">"Бұл құрылғыны жою"</string>
- <string name="forget" msgid="2069897665699141222">"Жою"</string>
- <string name="disable" msgid="4619854429066283970">"Өшіру"</string>
- <string name="enable" msgid="7656386199154111316">"Қосу"</string>
- <string name="continue_button" msgid="2748318968566159950">"Жалғастыру"</string>
- <string name="retry" msgid="3783419451480721367">"Қайталау"</string>
- <string name="turn_on" msgid="4288754850470994812">"Қосу"</string>
- <string name="not_now" msgid="8764692269093707622">"Қазір емес"</string>
- <string name="connected" msgid="8051190714042020471">"Байланыстырылған"</string>
- <string name="notDetected" msgid="4115229772085594506">"Анықталмаған"</string>
- <string name="disconnected" msgid="8526513868622591894">"Ажыратылған"</string>
- <string name="unknown" msgid="555736316465118024">"Белгісіз"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Телефонда мәтіндік хабар қызметі іске қосылған."</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Телефонда мәтіндік хабар қызметі қосулы."</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Мәтіндік хабарларды көмекші құрылғы арқылы алу"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Профиль құлпын телефонмен ашу"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Құлпын ашу опцияларын орнату үшін көмекші қолданбаны тексеріңіз."</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; телефонына профиль құлпын ашуға рұқсат ету"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Телефоныңыз байланыстырулы күйде болуы керек"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Бұл функцияны қосу үшін көлігіңіз бен телефоныңызда Bluetooth қосулы екеніне және құрылғылар бір-біріне жақын екеніне көз жеткізіңіз."</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; телефоны енді профиліңіздің құлпын аша алады."</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Негізгі профиль құлпын жасау"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Профиль құлпын телефонмен ашу үшін негізгі профиль құлпы да орнатылған болу керек."</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Аяқтау үшін профильдің құлпын ашу"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Жаңа профиль құлпын жасадыңыз. Енді телефон профиліңіздің құлпын автоматты түрде аша алатынын растау үшін оны енгізіңіз."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Бұл құрылғыны ажырату"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Бұл құрылғыны қайта байланыстыру"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Құлпын телефонмен ашу"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Телефонға профильдің құлпын ашуға рұқсат етіңіз"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Бұл функцияға рұқсат ету үшін осы жерді басыңыз."</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Бірдеңе дұрыс емес"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Өкінішке орай, бұл функцияны дәл қазір қосу мүмкін емес. Қайталап көріңіз."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Телефоннан экран құлпын жасау"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Телефоныңыздың экран құлпы орнатылмаған. Көлік профилінің құлпын телефонмен ашу үшін алдымен телефон параметрлерінен экран құлпын (рұқсат коды деп те аталады) жасаңыз."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Байланысқан құрылғы</string>
+ <string name="add_device_title">Байланысқан құрылғыны енгізу</string>
+ <string name="add_associated_device_title">Көмекші құрылғыны байланыстырыңыз</string>
+ <string name="add_associated_device_instruction">Телефоныңызды көлік жүргізуге көмекші құрылғы ретінде пайдалана аласыз.</string>
+ <string name="associated_device_install_app">Телефонда <b>қосымша қолданба</b> орнатылғанына көз жеткізіңіз.</string>
+ <string name="associated_device_pairing_code_title">Кодты телефоннан растау</string>
+ <string name="associated_device_pairing_message">Мұның телефонда көрсетілетін кодқа сәйкес келетінін растаңыз.</string>
+ <string name="associated_device_success">Құрылғы байланыстырылды.</string>
+ <string name="associated_device_select_device">Қолданбаны ашып, &lt;b&gt;%1$s&lt;/b&gt; көлігімен байланыстырыңыз.</string>
+ <string name="associated_device_open_app">Қолданбаны ашып, ондағы нұсқауларды орындаңыз.</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; жойылсын ба?</string>
+ <string name="remove_associated_device_message">Бұл көлік енді бұл құрылғымен жұптастырылмайды. Сондай-ақ бұл көлікті қосымша қолданбадан өшіру қажет болады.</string>
+ <string name="device_removed_success_toast_text">%1$s телефоны жойылды.</string>
+ <string name="device_removed_failure_toast_text">%1$s телефоны жойылмады.</string>
+ <string name="continue_setup_toast_text">Pеттеуді телефонда жалғастырыңыз.</string>
+ <string name="error_screen_title">Бірдеңе дұрыс емес</string>
+ <string name="error_screen_message">Өкінішке орай, бұл экранды дұрыс көрсету мүмкін емес. Қайталап көріңіз.</string>
+ <string name="turn_on_bluetooth_title">Bluetooth қосу</string>
+ <string name="turn_on_bluetooth_message">Телефонды көмекші құрылғы ретінде реттеу үшін Bluetooth функциясы қажет.</string>
+ <string name="turn_on_bluetooth_dialog_title">Bluetooth функциясын қосу керек пе?</string>
+ <string name="turn_on_bluetooth_dialog_message">Көмекші құрылғыны байланыстыру үшін көлігіңізге Bluetooth қажет.</string>
+ <string name="accept">Қабылдау</string>
+ <string name="reject">Қабылдамау</string>
+ <string name="confirm">Растау</string>
+ <string name="cancel">Бас тарту</string>
+ <string name="remove">Алу</string>
+ <string name="ok">Жарайды</string>
+ <string name="connection">Байланыс</string>
+ <string name="forget_title">Бұл құрылғыны жою</string>
+ <string name="forget">Жою</string>
+ <string name="disable">Өшіру</string>
+ <string name="enable">Қосу</string>
+ <string name="continue_button">Жалғастыру</string>
+ <string name="retry">Қайталау</string>
+ <string name="turn_on">Қосу</string>
+ <string name="not_now">Қазір емес</string>
+ <string name="connected">Қосулы</string>
+ <string name="notDetected">Анықталмаған</string>
+ <string name="disconnected">Ажыратулы</string>
+ <string name="unknown">Белгісіз</string>
+ <string name="app_running_msg_channel_name">Телефонда мәтіндік хабар қызметі іске қосылған.</string>
+ <string name="app_running_msg_notification_title">Телефонда мәтіндік хабар қызметі қосулы.</string>
+ <string name="app_running_msg_notification_content">Мәтіндік хабарлар көмекші құрылғы арқылы алынуда</string>
+ <string name="trusted_device_feature_title">Профиль құлпын телефонмен ашу</string>
+ <string name="trusted_device_feature_instruction">Құлпын ашу опцияларын орнату үшін көмекші қолданбаны тексеріңіз.</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; телефонына профиль құлпын ашуға рұқсат ету</string>
+ <string name="device_not_connected_dialog_title">Телефоныңыз байланыстырулы күйде болуы керек</string>
+ <string name="device_not_connected_dialog_message">Бұл функцияны қосу үшін көлігіңіз бен телефоныңызда Bluetooth қосулы екеніне және құрылғылар бір-біріне жақын екеніне көз жеткізіңіз.</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; телефоны енді профиліңіздің құлпын аша алады.</string>
+ <string name="create_profile_lock_dialog_title">Негізгі профиль құлпын жасау</string>
+ <string name="create_profile_lock_dialog_message">Профиль құлпын телефонмен ашу үшін негізгі профиль құлпы да орнатылған болу керек.</string>
+ <string name="unlock_profile_to_finish_title">Аяқтау үшін профильдің құлпын ашыңыз.</string>
+ <string name="unlock_profile_to_finish_message">Жаңа профиль құлпын жасадыңыз. Енді телефон профиліңіздің құлпын автоматты түрде аша алатынын растау үшін оны енгізіңіз.</string>
+ <string name="disable_device_connection_text">Бұл құрылғыны ажырату</string>
+ <string name="enable_device_connection_text">Бұл құрылғыны қайта байланыстыру</string>
+ <string name="trusted_device_notification_channel_name">Құлпын телефонмен ашу</string>
+ <string name="trusted_device_notification_title">Телефонға профильдің құлпын ашуға рұқсат етіңіз</string>
+ <string name="trusted_device_notification_content">Бұл функцияға рұқсат ету үшін осы жерді басыңыз.</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Бірдеңе дұрыс емес</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Өкінішке орай, бұл функцияны дәл қазір қосу мүмкін емес. Қайталап көріңіз.</string>
+ <string name="create_phone_lock_dialog_title">Телефоннан экран құлпын жасаңыз</string>
+ <string name="create_phone_lock_dialog_message">Телефоныңыздың экран құлпы орнатылмаған. Көлік профилінің құлпын телефонмен ашу үшін алдымен телефон параметрлерінен экран құлпын (рұқсат коды деп те аталады) жасаңыз.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Жаңа хабар</item>
+ <item quantity="other">%d жаңа хабар</item>
+ </plurals>
+ <string name="name_not_available">Атауы жоқ</string>
</resources>
diff --git a/companiondevice/res/values-km/strings.xml b/companiondevice/res/values-km/strings.xml
index 156a492..8163fb2 100644
--- a/companiondevice/res/values-km/strings.xml
+++ b/companiondevice/res/values-km/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"ឧបករណ៍​ដែលបានភ្ជាប់"</string>
- <string name="add_device_title" msgid="6166003577845888151">"បញ្ចូល​ឧបករណ៍ដែលបានភ្ជាប់"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"ភ្ជាប់​ឧបករណ៍ដៃគូ"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"អ្នកអាច​ប្រើទូរសព្ទ​របស់អ្នក​ជាឧបករណ៍ដៃគូ ដើម្បីជួយគ្រប់គ្រងការបើកបរ​របស់អ្នក"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"សូមប្រាកដថា អ្នកបានដំឡើង"<b>"កម្មវិធីដៃគូ"</b>"នៅលើទូរសព្ទរបស់អ្នក"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"បញ្ជាក់កូដ​នៅលើ​ទូរសព្ទ"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"បញ្ជាក់ថា​កូដនេះ​ត្រូវគ្នាជាមួយ​កូដ​ដែលបង្ហាញ​នៅលើ​ទូរសព្ទ​របស់អ្នក"</string>
- <string name="associated_device_success" msgid="584760065696870256">"បានភ្ជាប់​ឧបករណ៍​ដោយជោគជ័យហើយ"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"បើកកម្មវិធី រួចភ្ជាប់ជាមួយ &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"បើក​កម្មវិធី និងអនុវត្តតាមការណែនាំនៅក្នុងកម្មវិធី"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"បំភ្លេច &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; ឬ?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"រថយន្តនេះ​នឹងមិនភ្ជាប់​ជាមួយឧបករណ៍នេះ​ទៀតទេ។ បន្ថែមពីនេះ អ្នកនឹងត្រូវ​លុបរថយន្តនេះ​ចេញពី​កម្មវិធីដៃគូ។"</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"បានបំភ្លេច <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"មិនអាច​បំភ្លេច <xliff:g id="PHONE_NAME">%1$s</xliff:g> បានទេ"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"បន្តការរៀបចំនៅលើទូរសព្ទរបស់អ្នក"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"មានអ្វីមួយខុសប្រក្រតី"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"គួរឱ្យសោកស្ដាយ អេក្រង់នេះ​មិនអាចបង្ហាញ​បានត្រឹមត្រូវទេ។ សូមព្យាយាមម្ដងទៀត។"</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"បើក​ប៊្លូធូស"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"ត្រូវបើកប៊្លូធូសនៅលើរថយន្តរបស់អ្នក ដើម្បីរៀបចំ​ទូរសព្ទរបស់អ្នក​ជាឧបករណ៍ដៃគូ។"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"បើកប៊្លូធូសឬ?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"​ត្រូវបើកប៊្លូធូសនៅលើរថយន្តរបស់អ្នក ដើម្បីភ្ជាប់ជាមួយ​ឧបករណ៍ដៃគូ​របស់អ្នក។"</string>
- <string name="accept" msgid="1454710793329618813">"យល់ព្រម"</string>
- <string name="reject" msgid="4315432282758892890">"បដិសេធ"</string>
- <string name="confirm" msgid="3748997214719276945">"បញ្ជាក់"</string>
- <string name="cancel" msgid="4306609731174629323">"បោះបង់"</string>
- <string name="remove" msgid="5513398257088729188">"លុបចេញ"</string>
- <string name="ok" msgid="2825038997730899083">"យល់ព្រម"</string>
- <string name="connection" msgid="2798490936433656846">"ការតភ្ជាប់"</string>
- <string name="forget_title" msgid="3027608547243824729">"បំភ្លេច​ឧបករណ៍​នេះ"</string>
- <string name="forget" msgid="2069897665699141222">"បំភ្លេច"</string>
- <string name="disable" msgid="4619854429066283970">"បិទ"</string>
- <string name="enable" msgid="7656386199154111316">"បើក"</string>
- <string name="continue_button" msgid="2748318968566159950">"បន្ត"</string>
- <string name="retry" msgid="3783419451480721367">"ព្យាយាមម្ដងទៀត"</string>
- <string name="turn_on" msgid="4288754850470994812">"បើក"</string>
- <string name="not_now" msgid="8764692269093707622">"កុំទាន់"</string>
- <string name="connected" msgid="8051190714042020471">"បានភ្ជាប់"</string>
- <string name="notDetected" msgid="4115229772085594506">"រកមិនឃើញទេ"</string>
- <string name="disconnected" msgid="8526513868622591894">"បាន​ផ្ដាច់"</string>
- <string name="unknown" msgid="555736316465118024">"មិនស្គាល់"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"សេវាកម្ម​សារជាអក្សរ​របស់ទូរសព្ទ​កំពុងដំណើរការ"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"សេវាកម្ម​ផ្ញើសារជាអក្សរ​របស់ទូរសព្ទ​កំពុងដំណើរការ"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"កំពុងទទួល​សារជាអក្សរ​តាមរយៈ​ឧបករណ៍ដៃគូ"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"ដោះសោ​កម្រងព័ត៌មាន​ដោយប្រើទូរសព្ទ"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"ពិនិត្យមើល​កម្មវិធីដៃគូ​របស់អ្នក ដើម្បី​កំណត់ជម្រើស​ដោះសោ"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"អនុញ្ញាតឱ្យ &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; ដោះសោ​កម្រងព័ត៌មាន​របស់ខ្ញុំ"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"ទូរសព្ទ​របស់អ្នក​ត្រូវតែភ្ជាប់​យ៉ាងសកម្ម"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"ដើម្បីបើក​មុខងារនេះ សូមប្រាកដថា​រថយន្ត និងទូរសព្ទ​របស់អ្នក​បានបើក​ប៊្លូធូស និងនៅជិតគ្នា"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"ឥឡូវនេះ &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; អាចដោះសោ​កម្រងព័ត៌មាន​របស់អ្នកបានហើយ"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"បង្កើត​ការចាក់សោ​កម្រងព័ត៌មានចម្បង"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"ដើម្បីប្រើទូរសព្ទ​របស់អ្នក​សម្រាប់ដោះសោ​កម្រងព័ត៌មាន​ អ្នកត្រូវការ​ការចាក់សោ​កម្រងព័ត៌មានចម្បង​សម្រាប់ជាការបម្រុង​ទុក"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"ដោះសោ​កម្រងព័ត៌មាន​របស់អ្នក ដើម្បីបញ្ចប់"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"អ្នកបានបង្កើតការចាក់សោកម្រងព័ត៌មានថ្មីហើយ។ បន្ទាប់មក សូមបញ្ចូលវាម្ដងទៀតដើម្បីបញ្ជាក់ថា ទូរសព្ទរបស់អ្នកអាចដោះសោកម្រងព័ត៌មានរបស់អ្នកដោយស្វ័យប្រវត្តិ"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"ផ្ដាច់​ឧបករណ៍​នេះ"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"ភ្ជាប់​ឧបករណ៍នេះ​ឡើងវិញ"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"ដោះសោ​ដោយប្រើទូរសព្ទ"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"អនុញ្ញាតឱ្យ​ទូរសព្ទរបស់អ្នក​ដោះសោ​កម្រងព័ត៌មាន​របស់អ្នក"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"ចុចត្រង់នេះ ដើម្បីផ្ដល់សិទ្ធិ​ឱ្យមុខងារនេះ"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"មានអ្វីមួយខុសប្រក្រតី"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"គួរឱ្យសោកស្ដាយ មិនអាចបើក​មុខងារនេះ​នៅពេលនេះ​បានទេ។ សូមព្យាយាមម្ដងទៀត។"</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"បង្កើត​ការចាក់សោអេក្រង់​នៅលើ​ទូរសព្ទ​របស់អ្នក"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"ទូរសព្ទ​របស់អ្នក​មិនបានកំណត់​ការចាក់សោ​អេក្រង់ទេ។ ដើម្បី​ដោះសោ​កម្រងព័ត៌មាន​រថយន្ត​ដោយប្រើទូរសព្ទរបស់អ្នក សូមបង្កើត​ការចាក់សោអេក្រង់ (ហៅថាលេខកូដសម្ងាត់) នៅក្នុង​ការកំណត់​ទូរសព្ទរបស់អ្នក​ជាមុនសិន។"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Associated Device</string>
+ <string name="add_device_title">Add Associated Device</string>
+ <string name="add_associated_device_title">Connect a companion device</string>
+ <string name="add_associated_device_instruction">You can use your phone as a companion device to help manage your driving experience</string>
+ <string name="associated_device_install_app">Make sure you have <b>Companion App</b> installed on your phone</string>
+ <string name="associated_device_pairing_code_title">Confirm code on phone</string>
+ <string name="associated_device_pairing_message">Confirm that this matches the code shown on your phone</string>
+ <string name="associated_device_success">Device has been associated successfully</string>
+ <string name="associated_device_select_device">បើក​កម្មវិធី រួចភ្ជាប់​ជាមួយ &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Open the app and follow instructions in the app</string>
+ <string name="remove_associated_device_title">Forget &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">This car will no longer be paired with this device. You will additionally need to remove this car from the Companion app.</string>
+ <string name="device_removed_success_toast_text">%1$s forgotten</string>
+ <string name="device_removed_failure_toast_text">Failed to forget %1$s</string>
+ <string name="continue_setup_toast_text">Continue setup on your phone</string>
+ <string name="error_screen_title">Something went wrong</string>
+ <string name="error_screen_message">Unfortunately, this screen couldn\'t display properly. Please try again.</string>
+ <string name="turn_on_bluetooth_title">Turn on Bluetooth</string>
+ <string name="turn_on_bluetooth_message">To set up your phone as a companion device, your car needs Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Turn on Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">To connect to your companion device, your car needs Bluetooth.</string>
+ <string name="accept">Accept</string>
+ <string name="reject">Reject</string>
+ <string name="confirm">Confirm</string>
+ <string name="cancel">Cancel</string>
+ <string name="remove">Remove</string>
+ <string name="ok">OK</string>
+ <string name="connection">Connection</string>
+ <string name="forget_title">Forget this device</string>
+ <string name="forget">Forget</string>
+ <string name="disable">Disable</string>
+ <string name="enable">Enable</string>
+ <string name="continue_button">Continue</string>
+ <string name="retry">Try again</string>
+ <string name="turn_on">Turn on</string>
+ <string name="not_now">Not now</string>
+ <string name="connected">Connected</string>
+ <string name="notDetected">Not detected</string>
+ <string name="disconnected">Disconnected</string>
+ <string name="unknown">Unknown</string>
+ <string name="app_running_msg_channel_name">Phone text message service running</string>
+ <string name="app_running_msg_notification_title">Phone text messaging service is active</string>
+ <string name="app_running_msg_notification_content">Receiving text messages via companion device</string>
+ <string name="trusted_device_feature_title">Unlock profile with phone</string>
+ <string name="trusted_device_feature_instruction">Check your Companion App to set unlocking options</string>
+ <string name="trusted_device_item_title">Let &lt;b&gt;%1$s&lt;/b&gt; unlock my profile</string>
+ <string name="device_not_connected_dialog_title">Your phone must be actively connected</string>
+ <string name="device_not_connected_dialog_message">To turn on this feature, make sure your car and phone have bluetooth turned on and are near each other</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; can now unlock your profile</string>
+ <string name="create_profile_lock_dialog_title">Create a primary profile lock</string>
+ <string name="create_profile_lock_dialog_message">To use your phone to unlock your profile, you need a primary profile lock as a backup</string>
+ <string name="unlock_profile_to_finish_title">Unlock your profile to finish</string>
+ <string name="unlock_profile_to_finish_message">You\'ve created a new profile lock. Next, enter it again to confirm that your phone can unlock your profile automatically</string>
+ <string name="disable_device_connection_text">Disconnect this device</string>
+ <string name="enable_device_connection_text">Reconnect this device</string>
+ <string name="trusted_device_notification_channel_name">Unlock with phone</string>
+ <string name="trusted_device_notification_title">Let your phone unlock your profile</string>
+ <string name="trusted_device_notification_content">Tap here to authorize this feature</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Something went wrong</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Unfortunately, this feature could not be turned on at this time. Please try again.</string>
+ <string name="create_phone_lock_dialog_title">Create a screen lock on your phone</string>
+ <string name="create_phone_lock_dialog_message">Your phone doesn\'t have a screen lock set. To unlock your car profile with your phone, first create a screen lock (also known as passcode) in your phone\'s settings.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">New message</item>
+ <item quantity="other">%d new messages</item>
+ </plurals>
+ <string name="name_not_available">Name not available</string>
</resources>
diff --git a/companiondevice/res/values-kn/strings.xml b/companiondevice/res/values-kn/strings.xml
index e2e2c52..f32c10c 100644
--- a/companiondevice/res/values-kn/strings.xml
+++ b/companiondevice/res/values-kn/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"ಸಂಯೋಜಿತ ಸಾಧನ"</string>
- <string name="add_device_title" msgid="6166003577845888151">"ಸಂಯೋಜಿತ ಸಾಧನವನ್ನು ಸೇರಿಸಿ"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"ಕಂಪ್ಯಾನಿಯನ್ ಸಾಧನ ಒಂದನ್ನು ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"ನಿಮ್ಮ ಚಾಲನಾ ಅನುಭವವನ್ನು ನಿರ್ವಹಿಸಲು ಸಹಾಯವಾಗಲು ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಕಂಪ್ಯಾನಿಯನ್ ಸಾಧನವಾಗಿ ನೀವು ಬಳಸಬಹುದು"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ "<b>"ಕಂಪ್ಯಾನಿಯನ್ ಆ್ಯಪ್"</b>" ಇನ್‌ಸ್ಟಾಲ್ ಆಗಿರಬೇಕು"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"ಫೋನ್‌ನಲ್ಲಿ ಕೋಡ್ ಅನ್ನು ದೃಢೀಕರಿಸಿ"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ ತೋರಿಸಲಾಗುವ ಕೋಡ್‌ಗೆ ಇದು ಹೊಂದಾಣಿಕೆಯಾಗುತ್ತಿರುವುದೇ ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ"</string>
- <string name="associated_device_success" msgid="584760065696870256">"ಸಾಧನವನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸಂಯೋಜಿಸಲಾಗಿದೆ"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"ಆ್ಯಪ್ ತೆರೆಯಿರಿ ಹಾಗೂ &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; ಗೆ ಸಂಪರ್ಕಿಸಿ"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"ಆ್ಯಪ್ ತೆರೆಯಿರಿ, ಆ್ಯಪ್‌ನ ಸೂಚನೆ ಅನುಸರಿಸಿ"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; ಅನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"ಈ ಕಾರ್ ಅನ್ನು ಇನ್ನು ಮುಂದೆ ಈ ಸಾಧನದ ಜೊತೆಗೆ ಜೋಡಿಸಲಾಗುವುದಿಲ್ಲ. ಹೆಚ್ಚುವರಿಯಾಗಿ, ಈ ಕಾರ್ ಅನ್ನು ಕಂಪ್ಯಾನಿಯನ್ ಆ್ಯಪ್‌ನಿಂದ ನೀವು ತೆಗೆದುಹಾಕಬೇಕಾಗುತ್ತದೆ."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> ಅನ್ನು ತೆಗೆದುಹಾಕಲಾಗಿದೆ"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> ಅನ್ನು ತೆಗೆದುಹಾಕಲು ವಿಫಲವಾಗಿದೆ"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ ಸೆಟಪ್ ಮಾಡುವುದನ್ನು ಮುಂದುವರೆಸಿ"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"ಏನೋ ತಪ್ಪಾಗಿದೆ"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"ದುರದೃಷ್ಟವಶಾತ್ ಈ ಸ್ಕ್ರೀನ್‌ಗೆ ಸರಿಯಾಗಿ ಡಿಸ್‌ಪ್ಲೇ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"ಬ್ಲೂಟೂತ್ ಆನ್ ಮಾಡಿ"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಕಂಪ್ಯಾನಿಯನ್ ಸಾಧನವಾಗಿ ಹೊಂದಿಸಲು, ನಿಮ್ಮ ಕಾರ್‌ಗೆ ಬ್ಲೂಟೂತ್‌ನ ಅಗತ್ಯವಿದೆ."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"ಬ್ಲೂಟೂತ್ ಆನ್ ಮಾಡುವುದೇ?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"ನಿಮ್ಮ ಕಂಪ್ಯಾನಿಯನ್ ಸಾಧನಕ್ಕೆ ಕನೆಕ್ಟ್ ಮಾಡಲು, ನಿಮ್ಮ ಕಾರ್‌ಗೆ ಬ್ಲೂಟೂತ್‌ನ ಅಗತ್ಯವಿದೆ."</string>
- <string name="accept" msgid="1454710793329618813">"ಸಮ್ಮತಿಸಿ"</string>
- <string name="reject" msgid="4315432282758892890">"ತಿರಸ್ಕರಿಸಿ"</string>
- <string name="confirm" msgid="3748997214719276945">"ಖಚಿತಪಡಿಸಿ"</string>
- <string name="cancel" msgid="4306609731174629323">"ರದ್ದುಗೊಳಿಸಿ"</string>
- <string name="remove" msgid="5513398257088729188">"ತೆಗೆದುಹಾಕಿ"</string>
- <string name="ok" msgid="2825038997730899083">"ಸರಿ"</string>
- <string name="connection" msgid="2798490936433656846">"ಸಂಪರ್ಕ"</string>
- <string name="forget_title" msgid="3027608547243824729">"ಈ ಸಾಧನವನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
- <string name="forget" msgid="2069897665699141222">"ತೆಗೆದುಹಾಕಿ"</string>
- <string name="disable" msgid="4619854429066283970">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
- <string name="enable" msgid="7656386199154111316">"ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
- <string name="continue_button" msgid="2748318968566159950">"ಮುಂದುವರಿಯಿರಿ"</string>
- <string name="retry" msgid="3783419451480721367">"ಪುನಃ ಪ್ರಯತ್ನಿಸಿ"</string>
- <string name="turn_on" msgid="4288754850470994812">"ಆನ್ ಮಾಡಿ"</string>
- <string name="not_now" msgid="8764692269093707622">"ಈಗ ಬೇಡ"</string>
- <string name="connected" msgid="8051190714042020471">"ಕನೆಕ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
- <string name="notDetected" msgid="4115229772085594506">"ಪತ್ತೆಯಾಗಲಿಲ್ಲ"</string>
- <string name="disconnected" msgid="8526513868622591894">"ಸಂಪರ್ಕ ಕಡಿತಮಾಡಲಾಗಿದೆ"</string>
- <string name="unknown" msgid="555736316465118024">"ಅಪರಿಚಿತ"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"ಫೋನ್ ಪಠ್ಯ ಸಂದೇಶ ಸೇವೆಯು ಚಾಲನೆಯಲ್ಲಿದೆ"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"ಫೋನ್ ಪಠ್ಯ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ ಸೇವೆಯು ಸಕ್ರಿಯವಾಗಿದೆ"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"ಕಂಪ್ಯಾನಿಯನ್ ಸಾಧನದ ಮೂಲಕ ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ಸ್ವೀಕರಿಸಲಾಗುತ್ತಿದೆ"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"ಫೋನ್‌ನ ಮೂಲಕ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಿ"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"ಅನ್‌ಲಾಕ್ ಮಾಡುವ ಆಯ್ಕೆಗಳನ್ನು ಹೊಂದಿಸಲು ನಿಮ್ಮ ಕಂಪ್ಯಾನಿಯನ್ ಆ್ಯಪ್ ಅನ್ನು ಪರಿಶೀಲಿಸಿ"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;; ಗೆ ನನ್ನ ಪ್ರೊಫೈಲ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅನುಮತಿಸಿ"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"ನಿಮ್ಮ ಫೋನ್ ಸಕ್ರಿಯವಾಗಿ ಕನೆಕ್ಟ್ ಆಗಿರಬೇಕು"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆನ್ ಮಾಡಲು, ನಿಮ್ಮ ಕಾರ್ ಮತ್ತು ಫೋನ್‌ನಲ್ಲಿ ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗಿರುವುದನ್ನು ಮತ್ತು ಅವರೆಡೂ ಪರಸ್ಪರ ಹತ್ತಿರದಲ್ಲಿರುವುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;, ಈಗ ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"ಪ್ರಾಥಮಿಕ ಪ್ರೊಫೈಲ್ ಲಾಕ್ ಒಂದನ್ನು ರಚಿಸಿ"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡುವುದಕ್ಕಾಗಿ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಬಳಸಲು, ಬ್ಯಾಕಪ್ ಆಗಿ ನಿಮಗೆ ಪ್ರಾಥಮಿಕ ಪ್ರೊಫೈಲ್ ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"ಪೂರ್ಣಗೊಳಿಸಲು ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಿ"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"ನೀವು ಹೊಸ ಪ್ರೊಫೈಲ್ ಲಾಕ್ ರಚಿಸಿದ್ದೀರಿ. ಮುಂದೆ, ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಅನ್ನು ನಿಮ್ಮ ಫೋನ್ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು ಎಂದು ಖಚಿತಪಡಿಸಲು ಅದನ್ನು ಮತ್ತೊಮ್ಮೆ ನಮೂದಿಸಿ"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"ಈ ಸಾಧನದ ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಿ"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"ಈ ಸಾಧನವನ್ನು ಮರುಸಂಪರ್ಕಗೊಳಿಸಿ"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"ಫೋನ್ ಮೂಲಕ ಅನ್‌ಲಾಕ್ ಮಾಡಿ"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫೋನ್‌ಗೆ ಅನುಮತಿಸಿ"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಅನುಮತಿಸಲು ಇಲ್ಲಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"ಏನೋ ತಪ್ಪಾಗಿದೆ"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"ದುರದೃಷ್ಟವಶಾತ್, ಈ ಸಮಯದಲ್ಲಿ ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆನ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಒಂದನ್ನು ರಚಿಸಿ"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ ಸ್ಕ್ರೀನ್‌ ಲಾಕ್ ಅನ್ನು ಸೆಟ್ ಮಾಡಿಲ್ಲ. ನಿಮ್ಮ ಫೋನ್‌ನಿಂದ ನಿಮ್ಮ ಕಾರ್‌ನ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಮೊದಲು ನಿಮ್ಮ ಫೋನ್‌ನ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಸ್ಕ್ರೀನ್ ಲಾಕ್ (ಪಾಸ್‌ಕೋಡ್ ಎಂದೂ ಸಹ ಕರೆಯಲಾಗುತ್ತದೆ) ಒಂದನ್ನು ರಚಿಸಿ."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">ಸಂಯೋಜಿತ ಸಾಧನ</string>
+ <string name="add_device_title">ಸಂಯೋಜಿತ ಸಾಧನವನ್ನು ಸೇರಿಸಿ</string>
+ <string name="add_associated_device_title">ಕಂಪ್ಯಾನಿಯನ್ ಸಾಧನವೊಂದನ್ನು ಕನೆಕ್ಟ್ ಮಾಡಿ</string>
+ <string name="add_associated_device_instruction">ನಿಮ್ಮ ಡ್ರೈವಿಂಗ್ ಅನುಭವವನ್ನು ನಿರ್ವಹಿಸಲು ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ನೀವು ಕಂಪ್ಯಾನಿಯನ್ ಸಾಧನವಾಗಿ ಬಳಸಬಹುದು</string>
+ <string name="associated_device_install_app">ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ <b>ಕಂಪ್ಯಾನಿಯನ್ ಆ್ಯಪ್</b> ಇನ್‌ಸ್ಟಾಲ್ ಆಗಿದೆಯೇ ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ</string>
+ <string name="associated_device_pairing_code_title">ಫೋನ್‌ನಲ್ಲಿ ಕೋಡ್ ಅನ್ನು ದೃಢೀಕರಿಸಿ</string>
+ <string name="associated_device_pairing_message">ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ ತೋರಿಸಲಾಗುವ ಕೋಡ್‌ಗೆ ಇದು ಹೊಂದಾಣಿಕೆಯಾಗುತ್ತಿದೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ</string>
+ <string name="associated_device_success">ಸಾಧನವನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸಂಯೋಜಿಸಲಾಗಿದೆ</string>
+ <string name="associated_device_select_device">ಆ್ಯಪ್ ತೆರೆಯಿರಿ ಮತ್ತು &lt;b&gt;%1$s&lt;/b&gt; ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿ</string>
+ <string name="associated_device_open_app">ಆ್ಯಪ್ ತೆರೆಯಿರಿ, ಆ್ಯಪ್‌ನಲ್ಲಿರುವ ಸೂಚನೆಗಳನ್ನು ಅನುಸರಿಸಿ</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; ಅನ್ನು ಮರೆಯಬೇಕೇ?</string>
+ <string name="remove_associated_device_message">ಈ ಕಾರ್ ಅನ್ನು ಇನ್ನು ಮುಂದೆ ಈ ಸಾಧನದ ಜೊತೆಗೆ ಜೋಡಿಸಲಾಗುವುದಿಲ್ಲ. ಹೆಚ್ಚುವರಿಯಾಗಿ, ಈ ಕಾರ್ ಅನ್ನು ಕಂಪ್ಯಾನಿಯನ್ ಆ್ಯಪ್‌ನಿಂದ ನೀವು ತೆಗೆದುಹಾಕಬೇಕಾಗುತ್ತದೆ.</string>
+ <string name="device_removed_success_toast_text">%1$s ಅನ್ನು ತೆಗೆದುಹಾಕಲಾಗಿದೆ</string>
+ <string name="device_removed_failure_toast_text">%1$s ಅನ್ನು ತೆಗೆದುಹಾಕಲು ವಿಫಲವಾಗಿದೆ</string>
+ <string name="continue_setup_toast_text">ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ ಸೆಟಪ್ ಮುಂದುವರೆಸಿ</string>
+ <string name="error_screen_title">ಏನೋ ತಪ್ಪಾಗಿದೆ</string>
+ <string name="error_screen_message">ದುರದೃಷ್ಟವಶಾತ್ ಸರಿಯಾಗಿ ಡಿಸ್‌ಪ್ಲೇ ಮಾಡಲು ಈ ಸ್ಕ್ರೀನ್‌ಗೆ ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ಪುನಃ ಪ್ರಯತ್ನಿಸಿ.</string>
+ <string name="turn_on_bluetooth_title">ಬ್ಲೂಟೂತ್ ಆನ್ ಮಾಡಿ</string>
+ <string name="turn_on_bluetooth_message">ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಕಂಪ್ಯಾನಿಯನ್ ಸಾಧನವಾಗಿ ಸೆಟಪ್ ಮಾಡಲು, ನಿಮ್ಮ ಕಾರ್‌ಗೆ ಬ್ಲೂಟೂತ್ ಬೇಕಾಗುತ್ತದೆ.</string>
+ <string name="turn_on_bluetooth_dialog_title">ಬ್ಲೂಟೂತ್ ಆನ್ ಮಾಡಬೇಕೇ?</string>
+ <string name="turn_on_bluetooth_dialog_message">ನಿಮ್ಮ ಕಂಪ್ಯಾನಿಯನ್ ಸಾಧನಕ್ಕೆ ಕನೆಕ್ಟ್ ಮಾಡಲು, ನಿಮ್ಮ ಕಾರ್‌ಗೆ ಬ್ಲೂಟೂತ್ ಬೇಕಾಗುತ್ತದೆ.</string>
+ <string name="accept">ಸಮ್ಮತಿಸಿ</string>
+ <string name="reject">ತಿರಸ್ಕರಿಸಿ</string>
+ <string name="confirm">ಖಚಿತಪಡಿಸಿ</string>
+ <string name="cancel">ರದ್ದುಗೊಳಿಸಿ</string>
+ <string name="remove">ತೆಗೆದುಹಾಕಿ</string>
+ <string name="ok">ಸರಿ</string>
+ <string name="connection">ಕನೆಕ್ಷನ್</string>
+ <string name="forget_title">ಈ ಸಾಧನವನ್ನು ಮರೆಯಿರಿ</string>
+ <string name="forget">ಮರೆಯಿರಿ</string>
+ <string name="disable">ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
+ <string name="enable">ಸಕ್ರಿಯಗೊಳಿಸಿ</string>
+ <string name="continue_button">ಮುಂದುವರಿಸಿ</string>
+ <string name="retry">ಪುನಃ ಪ್ರಯತ್ನಿಸಿ</string>
+ <string name="turn_on">ಆನ್ ಮಾಡಿ</string>
+ <string name="not_now">ಈಗ ಬೇಡ</string>
+ <string name="connected">ಕನೆಕ್ಟ್ ಆಗಿದೆ</string>
+ <string name="notDetected">ಪತ್ತೆಯಾಗಲಿಲ್ಲ</string>
+ <string name="disconnected">ಡಿಸ್‌ಕನೆಕ್ಟ್ ಆಗಿದೆ</string>
+ <string name="unknown">ಅಪರಿಚಿತ</string>
+ <string name="app_running_msg_channel_name">ಫೋನ್ ಪಠ್ಯ ಸಂದೇಶ ಸೇವೆಯು ಚಾಲನೆಯಲ್ಲಿದೆ</string>
+ <string name="app_running_msg_notification_title">ಫೋನ್ ಪಠ್ಯ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ ಸೇವೆಯು ಸಕ್ರಿಯವಾಗಿದೆ</string>
+ <string name="app_running_msg_notification_content">ಕಂಪ್ಯಾನಿಯನ್ ಸಾಧನದ ಮೂಲಕ ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ಸ್ವೀಕರಿಸಲಾಗುತ್ತಿದೆ</string>
+ <string name="trusted_device_feature_title">ಫೋನ್‌ನ ಮೂಲಕ ಪ್ರೊಫೈಲ್ ಅನ್‌ಲಾಕ್ ಮಾಡಿ</string>
+ <string name="trusted_device_feature_instruction">ಅನ್‌ಲಾಕ್ ಮಾಡುವ ಆಯ್ಕೆಗಳನ್ನು ಹೊಂದಿಸಲು ನಿಮ್ಮ ಕಂಪ್ಯಾನಿಯನ್ ಆ್ಯಪ್ ಅನ್ನು ಪರಿಶೀಲಿಸಿ</string>
+ <string name="trusted_device_item_title">ನನ್ನ ಪ್ರೊಫೈಲ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು &lt;b&gt;%1$s&lt;/b&gt; ಗೆ ಅನುಮತಿಸಿ</string>
+ <string name="device_not_connected_dialog_title">ನಿಮ್ಮ ಫೋನ್ ಸಕ್ರಿಯವಾಗಿ ಕನೆಕ್ಟ್ ಆಗಿರಬೇಕು</string>
+ <string name="device_not_connected_dialog_message">ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆನ್ ಮಾಡಲು, ನಿಮ್ಮ ಕಾರ್ ಮತ್ತು ಫೋನ್‌ನಲ್ಲಿ ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗಿರುವುದನ್ನು ಮತ್ತು ಅವರೆಡೂ ಪರಸ್ಪರ ಹತ್ತಿರದಲ್ಲಿರುವುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; ಈಗ ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು</string>
+ <string name="create_profile_lock_dialog_title">ಪ್ರಾಥಮಿಕ ಪ್ರೊಫೈಲ್ ಲಾಕ್ ಒಂದನ್ನು ರಚಿಸಿ</string>
+ <string name="create_profile_lock_dialog_message">ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಅನ್‌ಲಾಕ್ ಮಾಡುವುದಕ್ಕಾಗಿ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಬಳಸಲು, ಬ್ಯಾಕಪ್ ಆಗಿ ನಿಮಗೆ ಪ್ರಾಥಮಿಕ ಪ್ರೊಫೈಲ್ ಲಾಕ್ ಬೇಕಾಗುತ್ತದೆ</string>
+ <string name="unlock_profile_to_finish_title">ಪೂರ್ಣಗೊಳಿಸಲು ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಅನ್‌ಲಾಕ್ ಮಾಡಿ</string>
+ <string name="unlock_profile_to_finish_message">ನೀವು ಹೊಸ ಪ್ರೊಫೈಲ್ ಲಾಕ್ ರಚಿಸಿದ್ದೀರಿ. ಮುಂದೆ, ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಅನ್ನು ನಿಮ್ಮ ಫೋನ್ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು ಎಂದು ಖಚಿತಪಡಿಸಲು ಅದನ್ನು ಮತ್ತೊಮ್ಮೆ ನಮೂದಿಸಿ</string>
+ <string name="disable_device_connection_text">ಈ ಸಾಧನವನ್ನು ಡಿಸ್‌ಕನೆಕ್ಟ್ ಮಾಡಿ</string>
+ <string name="enable_device_connection_text">ಈ ಸಾಧನವನ್ನು ಮರುಸಂಪರ್ಕಗೊಳಿಸಿ</string>
+ <string name="trusted_device_notification_channel_name">ಫೋನ್ ಮೂಲಕ ಅನ್‌ಲಾಕ್ ಮಾಡಿ</string>
+ <string name="trusted_device_notification_title">ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫೋನ್‌ಗೆ ಅನುಮತಿಸಿ</string>
+ <string name="trusted_device_notification_content">ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಅನುಮತಿಸಲು ಇಲ್ಲಿ ಟ್ಯಾಪ್ ಮಾಡಿ</string>
+ <string name="trusted_device_enrollment_error_dialog_title">ಏನೋ ತಪ್ಪಾಗಿದೆ</string>
+ <string name="trusted_device_enrollment_error_dialog_message">ದುರದೃಷ್ಟವಶಾತ್, ಈ ಸಮಯದಲ್ಲಿ ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆನ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ಪುನಃ ಪ್ರಯತ್ನಿಸಿ.</string>
+ <string name="create_phone_lock_dialog_title">ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಒಂದನ್ನು ರಚಿಸಿ</string>
+ <string name="create_phone_lock_dialog_message">ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ ಸ್ಕ್ರೀನ್‌ ಲಾಕ್ ಅನ್ನು ಸೆಟ್ ಮಾಡಲಾಗಿಲ್ಲ. ನಿಮ್ಮ ಫೋನ್‌ನಿಂದ ನಿಮ್ಮ ಕಾರ್‌ನ ಪ್ರೊಫೈಲ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಮೊದಲು ನಿಮ್ಮ ಫೋನ್‌ನ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಸ್ಕ್ರೀನ್ ಲಾಕ್ (ಪಾಸ್‌ಕೋಡ್ ಎಂದೂ ಕರೆಯಲಾಗುತ್ತದೆ) ಒಂದನ್ನು ರಚಿಸಿ.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d ಹೊಸ ಸಂದೇಶಗಳು</item>
+ <item quantity="other">%d ಹೊಸ ಸಂದೇಶಗಳು</item>
+ </plurals>
+ <string name="name_not_available">ಹೆಸರು ಲಭ್ಯವಿಲ್ಲ</string>
</resources>
diff --git a/companiondevice/res/values-ko/strings.xml b/companiondevice/res/values-ko/strings.xml
index 91cc473..090c124 100644
--- a/companiondevice/res/values-ko/strings.xml
+++ b/companiondevice/res/values-ko/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"연결된 기기"</string>
- <string name="add_device_title" msgid="6166003577845888151">"연결된 기기 추가"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"컴패니언 기기 연결"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"운전 환경을 관리하는 데 도움이 되도록 휴대전화를 컴패니언 기기로 사용하세요."</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"휴대전화에 "<b>"컴패니언 앱"</b>"이 설치되어 있어야 합니다."</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"휴대전화의 코드 확인"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"이 코드가 휴대전화에 표시된 코드와 일치하는지 확인하세요."</string>
- <string name="associated_device_success" msgid="584760065696870256">"기기가 연결되었습니다."</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"앱을 열고 &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;에 연결"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"앱을 열어 앱에 표시된 안내를 따르세요."</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; 차량을 삭제하시겠습니까?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"차량이 더 이상 이 기기와 페어링되지 않습니다. 컴패니언 앱에서도 차량을 삭제해야 합니다."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> 휴대전화가 삭제됨"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> 휴대전화를 삭제할 수 없음"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"휴대전화에서 설정 계속"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"문제 발생"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"이 화면을 올바르게 표시할 수 없습니다. 다시 시도해 보세요."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"블루투스 사용 설정"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"휴대전화를 컴패니언 기기로 설정하려면 차량에 블루투스가 필요합니다."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"블루투스를 사용 설정하시겠습니까?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"컴패니언 기기에 연결하려면 차량에 블루투스가 필요합니다."</string>
- <string name="accept" msgid="1454710793329618813">"동의"</string>
- <string name="reject" msgid="4315432282758892890">"거부"</string>
- <string name="confirm" msgid="3748997214719276945">"확인"</string>
- <string name="cancel" msgid="4306609731174629323">"취소"</string>
- <string name="remove" msgid="5513398257088729188">"삭제"</string>
- <string name="ok" msgid="2825038997730899083">"확인"</string>
- <string name="connection" msgid="2798490936433656846">"연결"</string>
- <string name="forget_title" msgid="3027608547243824729">"기기 삭제"</string>
- <string name="forget" msgid="2069897665699141222">"삭제"</string>
- <string name="disable" msgid="4619854429066283970">"사용 중지"</string>
- <string name="enable" msgid="7656386199154111316">"사용 설정"</string>
- <string name="continue_button" msgid="2748318968566159950">"계속"</string>
- <string name="retry" msgid="3783419451480721367">"다시 시도"</string>
- <string name="turn_on" msgid="4288754850470994812">"사용 설정"</string>
- <string name="not_now" msgid="8764692269093707622">"나중에"</string>
- <string name="connected" msgid="8051190714042020471">"연결됨"</string>
- <string name="notDetected" msgid="4115229772085594506">"감지되지 않음"</string>
- <string name="disconnected" msgid="8526513868622591894">"연결 해제됨"</string>
- <string name="unknown" msgid="555736316465118024">"알 수 없음"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"휴대전화 SMS 서비스 실행 중"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"휴대전화 SMS 서비스가 활성화됨"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"컴패니언 기기를 통해 SMS 수신 중"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"휴대전화로 프로필 잠금 해제"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"컴패니언 앱을 확인하여 잠금 해제 옵션을 설정하세요."</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;에서 프로필을 잠금 해제하도록 허용"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"휴대전화가 현재 연결되어 있어야 함"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"이 기능을 사용 설정하려면 차량과 휴대전화에서 블루투스가 사용 설정되어 있으며 서로 가까이 있어야 합니다."</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"이제 &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;에서 프로필을 잠금 해제할 수 있습니다."</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"기본 프로필 잠금 생성"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"휴대전화를 사용하여 프로필을 잠금 해제하려면 백업으로 기본 프로필 잠금이 필요합니다."</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"프로필을 잠금 해제하여 완료"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"새 프로필 잠금을 생성했습니다. 비밀번호를 다시 입력하여 휴대전화에서 프로필을 자동으로 잠금 해제하도록 할지 확인하세요."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"기기 연결 해제"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"기기 다시 연결"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"휴대전화로 잠금 해제"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"휴대전화에서 프로필을 잠금 해제하도록 허용"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"이 기능을 허용하려면 여기를 탭하세요."</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"문제 발생"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"현재 이 기능을 사용 설정할 수 없습니다. 다시 시도해 보세요."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"휴대전화에서 화면 잠금 생성"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"휴대전화에 화면 잠금이 설정되어 있지 않습니다. 휴대전화로 차량 프로필을 잠금 해제하려면 휴대전화 설정에서 화면 잠금(비밀번호라고도 함)을 생성하세요."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">연결된 기기</string>
+ <string name="add_device_title">연결된 기기 추가</string>
+ <string name="add_associated_device_title">호환 기기 연결</string>
+ <string name="add_associated_device_instruction">운전 환경을 관리하는 데 도움이 되도록 휴대전화를 호환 기기로 사용하세요.</string>
+ <string name="associated_device_install_app">휴대전화에 <b>호환 앱</b>이 설치되어 있어야 합니다.</string>
+ <string name="associated_device_pairing_code_title">휴대전화의 코드 확인</string>
+ <string name="associated_device_pairing_message">이 코드가 휴대전화에 표시된 코드와 일치하는지 확인하세요.</string>
+ <string name="associated_device_success">기기가 연결되었습니다.</string>
+ <string name="associated_device_select_device">앱을 열고 &lt;b&gt;%1$s&lt;b&gt;에 연결</string>
+ <string name="associated_device_open_app">앱을 열어 앱에 표시된 안내를 따르세요.</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; 차량을 삭제하시겠습니까?</string>
+ <string name="remove_associated_device_message">차량이 더 이상 이 기기와 페어링되지 않습니다. 호환 앱에서도 차량을 삭제해야 합니다.</string>
+ <string name="device_removed_success_toast_text">%1$s 휴대전화가 삭제되었습니다.</string>
+ <string name="device_removed_failure_toast_text">%1$s 휴대전화를 삭제할 수 없습니다.</string>
+ <string name="continue_setup_toast_text">휴대전화에서 설정을 계속하세요.</string>
+ <string name="error_screen_title">문제 발생</string>
+ <string name="error_screen_message">화면을 제대로 표시할 수 없습니다. 다시 시도해 주세요.</string>
+ <string name="turn_on_bluetooth_title">블루투스 켜기</string>
+ <string name="turn_on_bluetooth_message">휴대전화를 호환 기기로 설정하려면 차량에 블루투스가 필요합니다.</string>
+ <string name="turn_on_bluetooth_dialog_title">블루투스를 사용 설정하시겠습니까?</string>
+ <string name="turn_on_bluetooth_dialog_message">호환 기기에 연결하려면 차량에 블루투스가 필요합니다.</string>
+ <string name="accept">동의</string>
+ <string name="reject">거부</string>
+ <string name="confirm">확인</string>
+ <string name="cancel">취소</string>
+ <string name="remove">삭제</string>
+ <string name="ok">확인</string>
+ <string name="connection">연결</string>
+ <string name="forget_title">기기 삭제</string>
+ <string name="forget">삭제</string>
+ <string name="disable">사용 중지</string>
+ <string name="enable">사용</string>
+ <string name="continue_button">계속</string>
+ <string name="retry">다시 시도</string>
+ <string name="turn_on">사용 설정</string>
+ <string name="not_now">나중에</string>
+ <string name="connected">연결됨</string>
+ <string name="notDetected">감지되지 않음</string>
+ <string name="disconnected">연결 끊김</string>
+ <string name="unknown">알 수 없음</string>
+ <string name="app_running_msg_channel_name">휴대전화 문자 메시지 서비스 실행 중</string>
+ <string name="app_running_msg_notification_title">휴대전화 문자 메시지 서비스가 활성화됨</string>
+ <string name="app_running_msg_notification_content">호환 기기를 통해 문자 메시지 수신 중</string>
+ <string name="trusted_device_feature_title">휴대전화로 프로필 잠금 해제</string>
+ <string name="trusted_device_feature_instruction">호환 앱을 확인하여 잠금 해제 옵션을 설정하세요.</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt;에서 프로필을 잠금 해제하도록 허용</string>
+ <string name="device_not_connected_dialog_title">휴대전화가 현재 연결되어 있어야 함</string>
+ <string name="device_not_connected_dialog_message">이 기능을 사용 설정하려면 차량과 휴대전화에서 블루투스가 사용 설정되어 있으며 서로 가까이 있어야 합니다.</string>
+ <string name="trusted_device_enrollment_success_message">이제 &lt;b&gt;%1$s&lt;/b&gt;에서 프로필을 잠금 해제할 수 있습니다.</string>
+ <string name="create_profile_lock_dialog_title">기본 프로필 잠금 생성</string>
+ <string name="create_profile_lock_dialog_message">휴대전화를 사용하여 프로필을 잠금 해제하려면 백업으로 기본 프로필 잠금이 필요합니다.</string>
+ <string name="unlock_profile_to_finish_title">프로필을 잠금 해제하여 완료</string>
+ <string name="unlock_profile_to_finish_message">새 프로필 잠금을 생성했습니다. 비밀번호를 다시 입력하여 휴대전화에서 프로필을 자동으로 잠금 해제하도록 할지 확인하세요.</string>
+ <string name="disable_device_connection_text">기기 연결 해제</string>
+ <string name="enable_device_connection_text">기기 다시 연결</string>
+ <string name="trusted_device_notification_channel_name">휴대전화로 잠금 해제</string>
+ <string name="trusted_device_notification_title">휴대전화에서 프로필을 잠금 해제하도록 허용</string>
+ <string name="trusted_device_notification_content">이 기능을 허용하려면 여기를 탭하세요.</string>
+ <string name="trusted_device_enrollment_error_dialog_title">문제 발생</string>
+ <string name="trusted_device_enrollment_error_dialog_message">현재 이 기능을 사용 설정할 수 없습니다. 다시 시도해 주세요.</string>
+ <string name="create_phone_lock_dialog_title">휴대전화에서 화면 잠금 생성</string>
+ <string name="create_phone_lock_dialog_message">휴대전화에 화면 잠금이 설정되어 있지 않습니다. 휴대전화로 차량 프로필을 잠금 해제하려면 휴대전화 설정에서 화면 잠금(비밀번호라고도 함)을 생성하세요.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">새 메시지</item>
+ <item quantity="other">새 메시지 %d개</item>
+ </plurals>
+ <string name="name_not_available">이름을 사용할 수 없습니다.</string>
</resources>
diff --git a/companiondevice/res/values-ky/strings.xml b/companiondevice/res/values-ky/strings.xml
index 53c2b60..c5c72ce 100644
--- a/companiondevice/res/values-ky/strings.xml
+++ b/companiondevice/res/values-ky/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Байланышкан түзмөк"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Байланышкан түзмөктү кошуу"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Өнөктөш түзмөктү туташтыруу"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Унаа айдаганда жардам алуу үчүн телефонуңузду өнөктөш түзмөк катары колдоно аласыз"</string>
- <string name="associated_device_install_app" msgid="981663561198924864"><b>"Өнөктөш колдонмо "</b>" телефонуңузга орнотулганын текшериңиз"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Телефондогу кодду ырастоо"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Бул телефонуңуздагы кодго дал келерин ырастаңыз"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Түзмөк ийгиликтүү байланыштырылды"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Колдонмону ачып, &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; туташтырыңыз"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Колдонмону ачып, нускамаларды аткарыңыз"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; унутулсунбу?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Бул унаа бул түзмөк менен мындан ары жупташтырылбайт. Бул унааны Өнөктөш колдонмодон өчүрүшүңүз керек."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> унутулду"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> унутулган жок"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Жөндөөнү телефонуңуздан улантыңыз"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Бир жерден ката кетти"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Тилекке каршы, бул экран туура көрсөтүлгөн жок. Кайра аракет кылыңыз."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Bluetooth\'ду күйгүзүү"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Телефонуңузду өнөктөш түзмөк катары жөндөө үчүн унааңыздагы Bluetooth\'ду күйгүзүү керек."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Bluetooth күйгүзүлсүнбү?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Өнөктөш түзмөктү туташтыруу үчүн унааңыздагы Bluetooth\'ду күйгүзүү керек."</string>
- <string name="accept" msgid="1454710793329618813">"Кабыл алуу"</string>
- <string name="reject" msgid="4315432282758892890">"Четке кагуу"</string>
- <string name="confirm" msgid="3748997214719276945">"Ырастоо"</string>
- <string name="cancel" msgid="4306609731174629323">"Жок"</string>
- <string name="remove" msgid="5513398257088729188">"Өчүрүү"</string>
- <string name="ok" msgid="2825038997730899083">"ЖАРАЙТ"</string>
- <string name="connection" msgid="2798490936433656846">"Туташуу"</string>
- <string name="forget_title" msgid="3027608547243824729">"Бул түзмөк унутулсун"</string>
- <string name="forget" msgid="2069897665699141222">"Унутулсун"</string>
- <string name="disable" msgid="4619854429066283970">"Өчүрүү"</string>
- <string name="enable" msgid="7656386199154111316">"Иштетүү"</string>
- <string name="continue_button" msgid="2748318968566159950">"Улантуу"</string>
- <string name="retry" msgid="3783419451480721367">"Кайталоо"</string>
- <string name="turn_on" msgid="4288754850470994812">"Күйгүзүү"</string>
- <string name="not_now" msgid="8764692269093707622">"Азыр эмес"</string>
- <string name="connected" msgid="8051190714042020471">"Туташты"</string>
- <string name="notDetected" msgid="4115229772085594506">"Аныкталган жок"</string>
- <string name="disconnected" msgid="8526513868622591894">"Ажыратылды"</string>
- <string name="unknown" msgid="555736316465118024">"Белгисиз"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Телефондун жазышуу кызматы иштеп жатат"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Телефондун жазышуу кызматы иштеп жатат"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"SMS билдирүүлөрдү Өнөктөш түзмөк аркылуу алуу"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Профилдин кулпусун телефон менен ачуу"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Кулпуну ачуу параметрлерин жөндөө үчүн Өнөктөш колдонмого өтүңүз"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; телефонуна профилимдин кулпусун ачууга уруксат берүү"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Телефонуңуз туташтырылышы керек"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Бул функцияны иштетүү үчүн унааңызда жана телефонуңузда Bluetooth күйгүзүлүп, алар бири-бирине жакын жайгашканын текшериңиз"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; эми профилиңиздин кулпусун ача алат"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Негизги профилдин кулпусун түзүү"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Профилди телефондун жардамы менен ачуу үчүн негизги профилдин кулпусун түзүшүңүз керек"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Бүтүрүү үчүн профилиңиздин кулпусун ачыңыз"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Профилдин жаңы кулпусун түздүңүз. Эми аны кайра киргизип, телефонуңуз профилиңиздин кулпусун автоматтык түрдө ача аларын текшериңиз"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Бул түзмөктү ажыратуу"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Бул түзмөктү кайра туташтыруу"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Телефон менен ачуу"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Телефонуңузга профилиңиздин кулпусун ачууга уруксат бериңиз"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Бул функцияга уруксат берүү үчүн бул жерди таптаңыз"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Бир жерден ката кетти"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Тилекке каршы, бул функция азырынча иштетилген жок. Кайра аракет кылыңыз."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Телефонуңуздун экранынын кулпусун түзүңүз"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Телефонуңузда экрандын кулпусу жөндөлгөн эмес. Унааңыздын профилинин кулпусун ачуу үчүн, адегенде телефонуңуздун жөндөөлөрүнө өтүп, экрандын кулпусун (өткөрүүчү кодду) түзүңүз."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Байланышкан түзмөк</string>
+ <string name="add_device_title">Байланышкан түзмөктү кошуу</string>
+ <string name="add_associated_device_title">Өнөктөш түзмөктү туташтыруу</string>
+ <string name="add_associated_device_instruction">Унаа айдаганда жардам алуу үчүн телефонуңузду өнөктөш түзмөк катары колдоно аласыз</string>
+ <string name="associated_device_install_app"><b>Өнөктөш колдонмо </b> телефонуңузга орнотулганын текшериңиз</string>
+ <string name="associated_device_pairing_code_title">Телефондогу кодду ырастоо</string>
+ <string name="associated_device_pairing_message">Бул телефонуңуздагы кодго дал келерин ырастаңыз</string>
+ <string name="associated_device_success">Түзмөк ийгиликтүү байланыштырылды</string>
+ <string name="associated_device_select_device">Колдонмону ачып, &lt;b&gt;%1$s&lt;b&gt; түзмөгүнө байланыштырыңыз</string>
+ <string name="associated_device_open_app">Колдонмону ачып, нускамаларды аткарыңыз</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; унутулсунбу?</string>
+ <string name="remove_associated_device_message">Бул унаа бул түзмөк менен мындан ары жупташтырылбайт. Бул унааны Өнөктөш колдонмодон өчүрүшүңүз керек.</string>
+ <string name="device_removed_success_toast_text">%1$s унутулду</string>
+ <string name="device_removed_failure_toast_text">%1$s унутулган жок</string>
+ <string name="continue_setup_toast_text">Жөндөөнү телефонуңуздан улантыңыз</string>
+ <string name="error_screen_title">Бир жерден ката кетти</string>
+ <string name="error_screen_message">Тилекке каршы, бул экран туура көрсөтүлгөн жок. Кайталап көрүңүз.</string>
+ <string name="turn_on_bluetooth_title">Bluetooth\'ду күйгүзүү</string>
+ <string name="turn_on_bluetooth_message">Телефонуңузду өнөктөш түзмөк катары жөндөө үчүн унааңыздагы Bluetooth\'ду күйгүзүү керек.</string>
+ <string name="turn_on_bluetooth_dialog_title">Bluetooth күйгүзүлсүнбү?</string>
+ <string name="turn_on_bluetooth_dialog_message">Өнөктөш түзмөктү туташтыруу үчүн унааңыздагы Bluetooth\'ду күйгүзүү керек.</string>
+ <string name="accept">Кабыл алуу</string>
+ <string name="reject">Четке кагуу</string>
+ <string name="confirm">Ырастоо</string>
+ <string name="cancel">Жокко чыгаруу</string>
+ <string name="remove">Өчүрүү</string>
+ <string name="ok">Макул</string>
+ <string name="connection">Туташуу</string>
+ <string name="forget_title">Бул түзмөк унутулсун</string>
+ <string name="forget">Унутулсун</string>
+ <string name="disable">Өчүрүү</string>
+ <string name="enable">Иштетүү</string>
+ <string name="continue_button">Улантуу</string>
+ <string name="retry">Кайталоо</string>
+ <string name="turn_on">Күйгүзүү</string>
+ <string name="not_now">Азыр эмес</string>
+ <string name="connected">Туташты</string>
+ <string name="notDetected">Аныкталган жок</string>
+ <string name="disconnected">Ажыратылды</string>
+ <string name="unknown">Белгисиз</string>
+ <string name="app_running_msg_channel_name">Телефондун жазышуу кызматы иштеп жатат</string>
+ <string name="app_running_msg_notification_title">Телефондун жазышуу кызматы иштеп жатат</string>
+ <string name="app_running_msg_notification_content">SMS билдирүүлөрдү Өнөктөш түзмөк аркылуу алуу</string>
+ <string name="trusted_device_feature_title">Профилдин кулпусун телефон менен ачуу</string>
+ <string name="trusted_device_feature_instruction">Кулпуну ачуу параметрлерин жөндөө үчүн Өнөктөш колдонмого өтүңүз</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; менин профилимдин кулпусун ачсын</string>
+ <string name="device_not_connected_dialog_title">Телефонуңуз туташтырылышы керек</string>
+ <string name="device_not_connected_dialog_message">Бул функцияны иштетүү үчүн унааңызда жана телефонуңузда Bluetooth күйгүзүлүп, алар бири-бирине жакын жайгашканын текшериңиз</string>
+ <string name="trusted_device_enrollment_success_message">Эми &lt;b&gt;%1$s&lt;/b&gt; профилиңиздин кулпусун ача алат</string>
+ <string name="create_profile_lock_dialog_title">Негизги профилдин кулпусун түзүү</string>
+ <string name="create_profile_lock_dialog_message">Профилди телефондун жардамы менен ачуу үчүн негизги профилдин кулпусун түзүшүңүз керек</string>
+ <string name="unlock_profile_to_finish_title">Бүтүрүү үчүн профилиңиздин кулпусун ачыңыз</string>
+ <string name="unlock_profile_to_finish_message">Профилдин жаңы кулпусун түздүңүз. Эми аны кайра киргизип, телефонуңуз профилиңиздин кулпусун автоматтык түрдө ача аларын текшериңиз</string>
+ <string name="disable_device_connection_text">Бул түзмөктү ажыратуу</string>
+ <string name="enable_device_connection_text">Бул түзмөктү кайра туташтыруу</string>
+ <string name="trusted_device_notification_channel_name">Телефон менен ачуу</string>
+ <string name="trusted_device_notification_title">Телефонуңузга профилиңиздин кулпусун ачууга уруксат бериңиз</string>
+ <string name="trusted_device_notification_content">Бул функцияга уруксат берүү үчүн бул жерди таптаңыз</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Бир жерден ката кетти</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Тилекке каршы, бул функция азырынча иштетилген жок. Кайталап көрүңүз.</string>
+ <string name="create_phone_lock_dialog_title">Телефонуңуздун экранынын кулпусун түзүңүз</string>
+ <string name="create_phone_lock_dialog_message">Телефонуңузда экрандын кулпусу жөндөлгөн эмес. Унааңыздын профилинин кулпусун ачуу үчүн, адегенде телефонуңуздун жөндөөлөрүнө өтүп, экрандын кулпусун (өткөрүүчү кодду) түзүңүз.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Жаңы билдирүү</item>
+ <item quantity="other">%d жаңы билдирүү</item>
+ </plurals>
+ <string name="name_not_available">Аты-жөнү жеткиликсиз</string>
</resources>
diff --git a/companiondevice/res/values-lo/strings.xml b/companiondevice/res/values-lo/strings.xml
index 149dae4..e757bac 100644
--- a/companiondevice/res/values-lo/strings.xml
+++ b/companiondevice/res/values-lo/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"ອຸປະກອນທີ່ເຊື່ອມໂຍງ"</string>
- <string name="add_device_title" msgid="6166003577845888151">"ເພີ່ມອຸປະກອນທີ່ເຊື່ອມໂຍງ"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"ເຊື່ອມຕໍ່ອຸປະກອນຊ່ວຍເຫຼືອ"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"ທ່ານສາມາດໃຊ້ໂທລະສັບຂອງທ່ານເປັນອຸປະກອນຊ່ວຍເຫຼືອເພື່ອຊ່ວຍຈັດການປະສົບການຂັບຂີ່ຂອງທ່ານໄດ້"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"ກວດໃຫ້ແນ່ໃຈວ່າທ່ານໄດ້ຕິດຕັ້ງ "<b>"ແອັບຊ່ວຍເຫຼືອ"</b>" ໃນໂທລະສັບຂອງທ່ານແລ້ວ"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"ຢືນຢັນລະຫັດຜ່ານໃນໂທລະສັບ"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"ຢືນຢັນວ່າລະຫັດນີ້ກົງກັບລະຫັດທີ່ສະແດງໃນໂທລະສັບຂອງທ່ານ"</string>
- <string name="associated_device_success" msgid="584760065696870256">"ເຊື່ອມໂຍງອຸປະກອນສຳເລັດແລ້ວ."</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"ເປີດແອັບ ແລະ ເຊື່ອມຕໍ່ກັບ &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"ເປີດແອັບແລະ ປະຕິບັດຕາມຄຳແນະນຳໃນແອັບ"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"ລືມ &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"ລົດນີ້ຈະບໍ່ຖືກຈັບຄູ່ກັບອຸປະກອນນີ້ອີກຕໍ່ໄປ. ນອກນັ້ນທ່ານຈຳເປັນຕ້ອງລຶບລົດນີ້ອອກຈາກແອັບຊ່ວຍເຫຼືອນຳ."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"ລືມ <xliff:g id="PHONE_NAME">%1$s</xliff:g> ແລ້ວ"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"ລືມ <xliff:g id="PHONE_NAME">%1$s</xliff:g> ບໍ່ສຳເລັດ"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"ສືບຕໍ່ການຕັ້ງຄ່າຢູ່ໂທລະສັບຂອງທ່ານ"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"ມີບາງຢ່າງຜິດພາດ"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"ແນວໃດກໍຕາມ, ໜ້າຈໍນີ້ບໍ່ສາມາດສະແດງໄດ້ຢ່າງຖືກຕ້ອງ. ກະລຸນາລອງໃໝ່."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"ເປີດ Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"ເພື່ອຕັ້ງຄ່າໂທລະສັບຂອງທ່ານເປັນອຸປະກອນຊ່ວຍເຫຼືອ, ລົດຂອງທ່ານຈຳເປັນຕ້ອງມີ Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"ເປີດ Bluetooth ບໍ?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"ເຊື່ອມຕໍ່ກັບອຸປະກອນຊ່ວຍຂອງທ່ານ, ລົດຂອງທ່ານຈຳເປັນຕ້ອງມີ Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"ຍອມຮັບ"</string>
- <string name="reject" msgid="4315432282758892890">"ປະຕິເສດ"</string>
- <string name="confirm" msgid="3748997214719276945">"ຢືນຢັນ"</string>
- <string name="cancel" msgid="4306609731174629323">"ຍົກເລີກ"</string>
- <string name="remove" msgid="5513398257088729188">"ລຶບອອກ"</string>
- <string name="ok" msgid="2825038997730899083">"ຕົກລົງ"</string>
- <string name="connection" msgid="2798490936433656846">"ການເຊື່ອມຕໍ່"</string>
- <string name="forget_title" msgid="3027608547243824729">"ລືມອຸປະກອນນີ້"</string>
- <string name="forget" msgid="2069897665699141222">"ລືມ"</string>
- <string name="disable" msgid="4619854429066283970">"ປິດການນຳໃຊ້"</string>
- <string name="enable" msgid="7656386199154111316">"ເປິດການນຳໃຊ້"</string>
- <string name="continue_button" msgid="2748318968566159950">"ສືບຕໍ່"</string>
- <string name="retry" msgid="3783419451480721367">"ລອງໃໝ່"</string>
- <string name="turn_on" msgid="4288754850470994812">"ເປີດ"</string>
- <string name="not_now" msgid="8764692269093707622">"ບໍ່ຟ້າວເທື່ອ"</string>
- <string name="connected" msgid="8051190714042020471">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
- <string name="notDetected" msgid="4115229772085594506">"ກວດບໍ່ເຫັນ"</string>
- <string name="disconnected" msgid="8526513868622591894">"ຕັດການເຊື່ອມຕໍ່ແລ້ວ"</string>
- <string name="unknown" msgid="555736316465118024">"ບໍ່ຮູ້ຈັກ"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"ການບໍລິການຂໍ້ຄວາມທາງໂທລະສັບເຮັດວຽກຢູ່"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"ການບໍລິການຮັບສົ່ງຂໍ້ຄວາມທາງໂທລະສັບເປີດນຳໃຊ້ຢູ່"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"ກຳລັງຮັບຂໍ້ຄວາມຜ່ານອຸປະກອນທີ່ໃຊ້ຮ່ວມກັນ"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"ປົດລັອກໂປຣໄຟລ໌ດ້ວຍໂທລະສັບ"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"ກວດເບິ່ງແອັບຊ່ວຍເຫຼືອຂອງທ່ານເພື່ອຕັ້ງຄ່າຕົວເລືອການປົດລັອກ"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"ອະນຸຍາດໃຫ້ &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; ປົດລັອກໂປຣໄຟລ໌ຂອງຂ້ອຍ"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"ໂທລະສັບຕ້ອງເຊື່ອມຕໍ່ຢູ່"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"ເພື່ອເປີດຄຸນສົມບັດນີ້, ກະລຸນາກວດໃຫ້ແນ່ໃຈວ່າລົດ ແລະ ໂທລະສັບຂອງທ່ານໄດ້ເປີດ Bluetooth ແລະ ຢູ່ໃກ້ກັນແລ້ວ"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; ດຽວນີ້ສາມາດປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານໄດ້"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"ສ້າງລັອກໂປຣໄຟລ໌ຫຼັກ"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"ເພື່ອໃຊ້ໂທລະສັບຂອງທ່ານປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ, ທ່ານຈຳເປັນຕ້ອງມີລັອກໂປຣໄຟລ໌ຫຼັກເປັນລາຍການສຳຮອງ"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"ປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານເພື່ອສຳເລັດ"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"ທ່ານໄດ້ສ້າງລັອກໂປຣໄຟລ໌ໃໝ່ແລ້ວ. ຕໍ່ໄປ, ກະລຸນາປ້ອນມັນອີກຄັ້ງເພື່ອຢືນຢັນວ່າໂທລະສັບຂອງທ່ານສາມາດປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານໄດ້ໂດຍອັດຕະໂນມັດ"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"ຕັດການເຊື່ອມຕໍ່ອຸປະກອນນີ້"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"ເຊື່ອມຕໍ່ອຸປະກອນນີ້ຄືນໃໝ່"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"ປົດລັອກດ້ວຍໂທລະສັບ"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"ອະນຸຍາດໃຫ້ໂທລະສັບປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"ແຕະບ່ອນນີ້ເພື່ອອະນຸຍາດຄຸນສົມບັດນີ້"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"ມີບາງຢ່າງຜິດພາດ"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"ແນວໃດກໍຕາມ, ບໍ່ສາມາດເປີດຄຸນສົມບັດນີ້ໃນເວລານີ້ໄດ້. ກະລຸນາລອງໃໝ່."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"ສ້າງລັອກໜ້າຈໍໃນໂທລະສັບຂອງທ່ານ"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"ໂທລະສັບຂອງທ່ານບໍ່ໄດ້ຕັ້ງຄ່າລັອກໜ້າຈໍ. ເພື່ອປົດລັອກໂປຣໄຟລ໌ລົດຂອງທ່ານດ້ວຍໂທລະສັບຂອງທ່ານ, ກະລຸນາສ້າງລັອກໜ້າຈໍ (ຍັງເອີ້ນວ່າລະຫັດຜ່ານ) ໃນການຕັ້ງຄ່າໂທລະສັບຂອງທ່ານກ່ອນ."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">ອຸປະກອນທີ່ເຊື່ອມໂຍງ</string>
+ <string name="add_device_title">ເພີ່ມອຸປະກອນທີ່ເຊື່ອມໂຍງ</string>
+ <string name="add_associated_device_title">ເຊື່ອມຕໍ່ອຸປະກອນຊ່ວຍເຫຼືອ</string>
+ <string name="add_associated_device_instruction">ທ່ານສາມາດໃຊ້ໂທລະສັບຂອງທ່ານເປັນອຸປະກອນຊ່ວຍເຫຼືອເພື່ອຊ່ວຍຈັດການປະສົບການຂັບຂີ່ຂອງທ່ານໄດ້</string>
+ <string name="associated_device_install_app">ກວດໃຫ້ແນ່ໃຈວ່າທ່ານໄດ້ຕິດຕັ້ງ <b>ແອັບຊ່ວຍເຫຼືອ</b> ໃນໂທລະສັບຂອງທ່ານແລ້ວ</string>
+ <string name="associated_device_pairing_code_title">ຢືນຢັນລະຫັດຜ່ານໃນໂທລະສັບ</string>
+ <string name="associated_device_pairing_message">ຢືນຢັນວ່າລະຫັດນີ້ກົງກັບລະຫັດທີ່ສະແດງໃນໂທລະສັບຂອງທ່ານ</string>
+ <string name="associated_device_success">ເຊື່ອມໂຍງອຸປະກອນສຳເລັດແລ້ວ.</string>
+ <string name="associated_device_select_device">ເປີດແອັບ ແລ້ວເຊື່ອມຕໍ່ກັບ &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">ເປີດແອັບ ແລ້ວປະຕິບັດຕາມຄຳແນະນຳໃນແອັບ</string>
+ <string name="remove_associated_device_title">ລືມ &lt;b&gt;%1$s&lt;/b&gt; ບໍ?</string>
+ <string name="remove_associated_device_message">ລົດນີ້ຈະບໍ່ຖືກຈັບຄູ່ກັບອຸປະກອນນີ້ອີກຕໍ່ໄປ. ນອກນັ້ນທ່ານຈຳເປັນຕ້ອງລຶບລົດນີ້ອອກຈາກແອັບຊ່ວຍເຫຼືອນຳ.</string>
+ <string name="device_removed_success_toast_text">ລືມ %1$s ແລ້ວ</string>
+ <string name="device_removed_failure_toast_text">ລືມ %1$s ບໍ່ສຳເລັດ</string>
+ <string name="continue_setup_toast_text">ສືບຕໍ່ການຕັ້ງຄ່າຢູ່ໂທລະສັບຂອງທ່ານ</string>
+ <string name="error_screen_title">ມີບາງຢ່າງຜິດພາດ</string>
+ <string name="error_screen_message">ແນວໃດກໍຕາມ, ໜ້າຈໍນີ້ບໍ່ສາມາດສະແດງໄດ້ຢ່າງຖືກຕ້ອງ. ກະລຸນາລອງໃໝ່.</string>
+ <string name="turn_on_bluetooth_title">ເປີດ Bluetooth</string>
+ <string name="turn_on_bluetooth_message">ເພື່ອຕັ້ງຄ່າໂທລະສັບຂອງທ່ານເປັນອຸປະກອນຊ່ວຍເຫຼືອ, ລົດຂອງທ່ານຈຳເປັນຕ້ອງມີ Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">ເປີດໃຊ້ Bluetooth ບໍ?</string>
+ <string name="turn_on_bluetooth_dialog_message">ເຊື່ອມຕໍ່ກັບອຸປະກອນຊ່ວຍຂອງທ່ານ, ລົດຂອງທ່ານຈຳເປັນຕ້ອງມີ Bluetooth.</string>
+ <string name="accept">ຍອມຮັບ</string>
+ <string name="reject">ປະຕິເສດ</string>
+ <string name="confirm">ຢືນຢັນ</string>
+ <string name="cancel">ຍົກເລີກ</string>
+ <string name="remove">ລຶບອອກ</string>
+ <string name="ok">ຕົກລົງ</string>
+ <string name="connection">ການເຊື່ອມຕໍ່</string>
+ <string name="forget_title">ລືມອຸປະກອນນີ້</string>
+ <string name="forget">ລືມ</string>
+ <string name="disable">ປິດການນຳໃຊ້</string>
+ <string name="enable">ເປີດການນຳໃຊ້</string>
+ <string name="continue_button">ສືບຕໍ່</string>
+ <string name="retry">ລອງໃໝ່</string>
+ <string name="turn_on">ເປີດໃຊ້</string>
+ <string name="not_now">ບໍ່ແມ່ນຕອນນີ້</string>
+ <string name="connected">ເຊື່ອມຕໍ່ແລ້ວ</string>
+ <string name="notDetected">ກວດບໍ່ເຫັນ</string>
+ <string name="disconnected">ຕັດການເຊື່ອມຕໍ່ແລ້ວ</string>
+ <string name="unknown">ບໍ່ຮູ້ຈັກ</string>
+ <string name="app_running_msg_channel_name">ການບໍລິການຂໍ້ຄວາມທາງໂທລະສັບເຮັດວຽກຢູ່</string>
+ <string name="app_running_msg_notification_title">ການບໍລິການຮັບສົ່ງຂໍ້ຄວາມທາງໂທລະສັບເປີດນຳໃຊ້ຢູ່</string>
+ <string name="app_running_msg_notification_content">ກຳລັງຮັບຂໍ້ຄວາມຜ່ານອຸປະກອນທີ່ໃຊ້ຮ່ວມກັນ</string>
+ <string name="trusted_device_feature_title">ປົດລັອກໂປຣໄຟລ໌ດ້ວຍໂທລະສັບ</string>
+ <string name="trusted_device_feature_instruction">ກວດເບິ່ງແອັບຊ່ວຍເຫຼືອຂອງທ່ານເພື່ອຕັ້ງຄ່າຕົວເລືອການປົດລັອກ</string>
+ <string name="trusted_device_item_title">ອະນຸຍາດໃຫ້ &lt;b&gt;%1$s&lt;/b&gt; ປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ</string>
+ <string name="device_not_connected_dialog_title">ໂທລະສັບຕ້ອງເຊື່ອມຕໍ່ຢູ່</string>
+ <string name="device_not_connected_dialog_message">ເພື່ອເປີດຄຸນສົມບັດນີ້, ກະລຸນາກວດໃຫ້ແນ່ໃຈວ່າລົດ ແລະ ໂທລະສັບຂອງທ່ານໄດ້ເປີດ Bluetooth ແລະ ຢູ່ໃກ້ກັນແລ້ວ</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; ດຽວນີ້ສາມາດປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ</string>
+ <string name="create_profile_lock_dialog_title">ສ້າງລັອກໂປຣໄຟລ໌ຫຼັກ</string>
+ <string name="create_profile_lock_dialog_message">ເພື່ອໃຊ້ໂທລະສັບຂອງທ່ານປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ, ທ່ານຈຳເປັນຕ້ອງມີລັອກໂປຣໄຟລ໌ຫຼັກເປັນລາຍການສຳຮອງ</string>
+ <string name="unlock_profile_to_finish_title">ປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານເພື່ອສຳເລັດ</string>
+ <string name="unlock_profile_to_finish_message">ທ່ານໄດ້ສ້າງລັອກໂປຣໄຟລ໌ໃໝ່ແລ້ວ. ຕໍ່ໄປ, ກະລຸນາປ້ອນມັນອີກຄັ້ງເພື່ອຢືນຢັນວ່າໂທລະສັບຂອງທ່ານສາມາດປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານໄດ້ໂດຍອັດຕະໂນມັດ</string>
+ <string name="disable_device_connection_text">ຕັດການເຊື່ອມຕໍ່ອຸປະກອນນີ້</string>
+ <string name="enable_device_connection_text">ເຊື່ອມຕໍ່ອຸປະກອນນີ້ຄືນໃໝ່</string>
+ <string name="trusted_device_notification_channel_name">ປົດລັອກດ້ວຍໂທລະສັບ</string>
+ <string name="trusted_device_notification_title">ອະນຸຍາດໃຫ້ໂທລະສັບປົດລັອກໂປຣໄຟລ໌ຂອງທ່ານ</string>
+ <string name="trusted_device_notification_content">ແຕະບ່ອນນີ້ເພື່ອອະນຸຍາດຄຸນສົມບັດນີ້</string>
+ <string name="trusted_device_enrollment_error_dialog_title">ມີບາງຢ່າງຜິດພາດ</string>
+ <string name="trusted_device_enrollment_error_dialog_message">ແນວໃດກໍຕາມ, ບໍ່ສາມາດເປີດຄຸນສົມບັດນີ້ໃນເວລານີ້ໄດ້. ກະລຸນາລອງໃໝ່.</string>
+ <string name="create_phone_lock_dialog_title">ສ້າງລັອກໜ້າຈໍໃນໂທລະສັບຂອງທ່ານ</string>
+ <string name="create_phone_lock_dialog_message">ໂທລະສັບຂອງທ່ານບໍ່ໄດ້ຕັ້ງຄ່າລັອກໜ້າຈໍ. ເພື່ອປົດລັອກໂປຣໄຟລ໌ລົດຂອງທ່ານດ້ວຍໂທລະສັບຂອງທ່ານ, ກະລຸນາສ້າງລັອກໜ້າຈໍ (ຍັງເອີ້ນວ່າລະຫັດຜ່ານ) ໃນການຕັ້ງຄ່າໂທລະສັບຂອງທ່ານກ່ອນ.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">ຂໍ້ຄວາມໃໝ່</item>
+ <item quantity="other">%d ຂໍ້ຄວາມໃໝ່</item>
+ </plurals>
+ <string name="name_not_available">ຊື່ບໍ່ສາມາດໃຊ້ໄດ້</string>
</resources>
diff --git a/companiondevice/res/values-lt/strings.xml b/companiondevice/res/values-lt/strings.xml
index 3f58c58..2169967 100644
--- a/companiondevice/res/values-lt/strings.xml
+++ b/companiondevice/res/values-lt/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,76 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Susietas įrenginys"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Pridėti susijusį įrenginį"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Papildomo įrenginio prijungimas"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Savo telefoną galite naudoti kaip papildomą įrenginį funkcijoms vairuojant valdyti"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Įsitikinkite, kad telefone įdiegėte "<b>"papildomą programą"</b></string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Kodo patvirtinimas telefonu"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Patvirtinkite, kad kodas atitinka telefone rodomą kodą"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Įrenginys sėkmingai prijungtas"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Atid. pr. ir prisij. prie &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Atid. pr. ir vadov. joje pat. instrukc."</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Pamiršti &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Šis automobilis nebebus susietas su šiuo įrenginiu. Turėsite taip pat pašalinti šį automobilį iš papildomos programos."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"„<xliff:g id="PHONE_NAME">%1$s</xliff:g>“ pamirštas"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Nepavyko pamiršti „<xliff:g id="PHONE_NAME">%1$s</xliff:g>“"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Tęsti sąranką telefonu"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Įvyko klaida"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Deja, nepavyko tinkamai pateikti šio ekrano. Bandykite dar kartą."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"„Bluetooth“ įjungimas"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Norint nustatyti telefoną kaip papildomą įrenginį, automobilyje turi veikti „Bluetooth“ ryšys."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Įjungti „Bluetooth“?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Norint prisijungti prie papildomo įrenginio, automobilyje turi veikti „Bluetooth“ ryšys."</string>
- <string name="accept" msgid="1454710793329618813">"Sutikti"</string>
- <string name="reject" msgid="4315432282758892890">"Atmesti"</string>
- <string name="confirm" msgid="3748997214719276945">"Patvirtinti"</string>
- <string name="cancel" msgid="4306609731174629323">"Atšaukti"</string>
- <string name="remove" msgid="5513398257088729188">"Pašalinti"</string>
- <string name="ok" msgid="2825038997730899083">"Gerai"</string>
- <string name="connection" msgid="2798490936433656846">"Ryšys"</string>
- <string name="forget_title" msgid="3027608547243824729">"Pamiršti šį įrenginį"</string>
- <string name="forget" msgid="2069897665699141222">"Pamiršti"</string>
- <string name="disable" msgid="4619854429066283970">"Išjungti"</string>
- <string name="enable" msgid="7656386199154111316">"Įgalinti"</string>
- <string name="continue_button" msgid="2748318968566159950">"Tęsti"</string>
- <string name="retry" msgid="3783419451480721367">"Bandyti dar kartą"</string>
- <string name="turn_on" msgid="4288754850470994812">"Įjungti"</string>
- <string name="not_now" msgid="8764692269093707622">"Ne dabar"</string>
- <string name="connected" msgid="8051190714042020471">"Prijungta"</string>
- <string name="notDetected" msgid="4115229772085594506">"Neaptikta"</string>
- <string name="disconnected" msgid="8526513868622591894">"Atjungta"</string>
- <string name="unknown" msgid="555736316465118024">"Nežinoma"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Vykdoma telefono teksto pranešimų paslauga"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Telefono teksto pranešimų paslauga aktyvi"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Pranešimai gaunami per papildomą įrenginį"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Profilio atrakinimas telefonu"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Patikrinkite papildomą programą, kad nustatytumėte atrakinimo parinktis"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Leidimas &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; atrakinti profilį"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefonas turi būti aktyviai susietas"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Jei norite įjungti šią funkciją, įsitikinkite, kad automobilyje ir telefone įjungtas „Bluetooth“ ryšys ir jie yra vienas šalia kito"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; dabar gali atrakinti jūsų profilį"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Pagrindinio profilio užrakto kūrimas"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Jei norite telefonu atrakinti profilį, turite nustatyti pagrindinį profilio užraktą kaip atsarginį"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Profilio atrakinimas norint užbaigti procesą"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Sukūrėte naują profilio užraktą. Dabar vėl jį įveskite, kad patvirtintumėte, jog telefonu galima automatiškai atrakinti profilį"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Atjungti šį įrenginį"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Iš naujo prijungti šį įrenginį"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Atrakinimas telefonu"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Leidimas telefonu atrakinti profilį"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Palieskite čia, kad leistumėte šią funkciją"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Įvyko klaida"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Deja, šiuo metu nepavyko įjungti šios funkcijos. Bandykite dar kartą."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Ekrano užrakto kūrimas telefone"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Telefone nenustatytas ekrano užraktas. Jei norite atrakinti automobilio profilį telefonu, pirmiausia sukurkite ekrano užraktą (dar vadinamas slaptažodžiu) telefono nustatymuose."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Susietas įrenginys</string>
+ <string name="add_device_title">Pridėti susietą įrenginį</string>
+ <string name="add_associated_device_title">Papildomo įrenginio susiejimas</string>
+ <string name="add_associated_device_instruction">Savo telefoną galite naudoti kaip papildomą įrenginį funkcijoms vairuojant valdyti</string>
+ <string name="associated_device_install_app">Įsitikinkite, kad telefone įdiegėte <b>papildomą programą</b></string>
+ <string name="associated_device_pairing_code_title">Kodo patvirtinimas telefonu</string>
+ <string name="associated_device_pairing_message">Patvirtinkite, kad kodas atitinka telefone rodomą kodą</string>
+ <string name="associated_device_success">Įrenginys sėkmingai susietas</string>
+ <string name="associated_device_select_device">Atidarykite programą ir susiekite su &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Atidarykite programą ir vadovaukitės jos instrukcijomis</string>
+ <string name="remove_associated_device_title">Pamiršti &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Šis automobilis nebebus susietas su šiuo įrenginiu. Turėsite taip pat pašalinti šį automobilį iš papildomos programos.</string>
+ <string name="device_removed_success_toast_text">„%1$s“ pamirštas</string>
+ <string name="device_removed_failure_toast_text">Nepavyko pamiršti „%1$s“</string>
+ <string name="continue_setup_toast_text">Tęsti sąranką telefonu</string>
+ <string name="error_screen_title">Kažkas negerai</string>
+ <string name="error_screen_message">Deja, nepavyko tinkamai pateikti šio ekrano. Bandykite dar kartą.</string>
+ <string name="turn_on_bluetooth_title">„Bluetooth“ įjungimas</string>
+ <string name="turn_on_bluetooth_message">Norint nustatyti telefoną kaip papildomą įrenginį, automobilyje turi veikti „Bluetooth“ ryšys.</string>
+ <string name="turn_on_bluetooth_dialog_title">Įjungti „Bluetooth“?</string>
+ <string name="turn_on_bluetooth_dialog_message">Norint prisijungti prie papildomo įrenginio, automobilyje turi veikti „Bluetooth“ ryšys.</string>
+ <string name="accept">Sutikti</string>
+ <string name="reject">Atmesti</string>
+ <string name="confirm">Patvirtinti</string>
+ <string name="cancel">Atšaukti</string>
+ <string name="remove">Pašalinti</string>
+ <string name="ok">Gerai</string>
+ <string name="connection">Ryšys</string>
+ <string name="forget_title">Pamiršti šį įrenginį</string>
+ <string name="forget">Pamiršti</string>
+ <string name="disable">Išjungti</string>
+ <string name="enable">Įgalinti</string>
+ <string name="continue_button">Tęsti</string>
+ <string name="retry">Bandyti dar kartą</string>
+ <string name="turn_on">Įjungti</string>
+ <string name="not_now">Ne dabar</string>
+ <string name="connected">Susieta</string>
+ <string name="notDetected">Neaptikta</string>
+ <string name="disconnected">Atjungta</string>
+ <string name="unknown">Nežinoma</string>
+ <string name="app_running_msg_channel_name">Vykdoma telefono teksto pranešimų paslauga</string>
+ <string name="app_running_msg_notification_title">Telefono teksto pranešimų paslauga aktyvi</string>
+ <string name="app_running_msg_notification_content">Pranešimai gaunami per papildomą įrenginį</string>
+ <string name="trusted_device_feature_title">Profilio atrakinimas telefonu</string>
+ <string name="trusted_device_feature_instruction">Patikrinkite papildomą programą, kad nustatytumėte atrakinimo parinktis</string>
+ <string name="trusted_device_item_title">Leisti &lt;b&gt;%1$s&lt;/b&gt; atrakinti mano profilį</string>
+ <string name="device_not_connected_dialog_title">Telefonas turi būti aktyviai susietas</string>
+ <string name="device_not_connected_dialog_message">Jei norite įjungti šią funkciją, įsitikinkite, kad automobilyje ir telefone įjungtas „Bluetooth“ ryšys ir jie yra vienas šalia kito</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; dabar gali atrakinti jūsų profilį</string>
+ <string name="create_profile_lock_dialog_title">Pagrindinio profilio užrakto kūrimas</string>
+ <string name="create_profile_lock_dialog_message">Jei norite telefonu atrakinti profilį, turite nustatyti pagrindinį profilio užraktą kaip atsarginį</string>
+ <string name="unlock_profile_to_finish_title">Profilio atrakinimas norint užbaigti procesą</string>
+ <string name="unlock_profile_to_finish_message">Sukūrėte naują profilio užraktą. Dabar vėl jį įveskite, kad patvirtintumėte, jog telefonu galima automatiškai atrakinti profilį</string>
+ <string name="disable_device_connection_text">Atjungti šį įrenginį</string>
+ <string name="enable_device_connection_text">Iš naujo susieti šį įrenginį</string>
+ <string name="trusted_device_notification_channel_name">Atrakinimas telefonu</string>
+ <string name="trusted_device_notification_title">Leidimas telefonu atrakinti profilį</string>
+ <string name="trusted_device_notification_content">Palieskite čia, kad leistumėte šią funkciją</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Kažkas negerai</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Deja, šiuo metu nepavyko įjungti šios funkcijos. Bandykite dar kartą.</string>
+ <string name="create_phone_lock_dialog_title">Ekrano užrakto kūrimas telefone</string>
+ <string name="create_phone_lock_dialog_message">Telefone nenustatytas ekrano užraktas. Jei norite atrakinti automobilio profilį telefonu, pirmiausia sukurkite ekrano užraktą (dar vadinamas slaptažodžiu) telefono nustatymuose.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d naujas pranešimas</item>
+ <item quantity="few">%d nauji pranešimai</item>
+ <item quantity="many">%d naujo pranešimo</item>
+ <item quantity="other">%d naujų pranešimų</item>
+ </plurals>
+ <string name="name_not_available">Vardas nepasiekiamas</string>
</resources>
diff --git a/companiondevice/res/values-lv/strings.xml b/companiondevice/res/values-lv/strings.xml
index f16b155..10b095b 100644
--- a/companiondevice/res/values-lv/strings.xml
+++ b/companiondevice/res/values-lv/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,75 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Saistītā ierīce"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Pievienot saistīto ierīci"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Palīgierīces pievienošana"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Varat izmantot savu tālruni kā palīgierīci braukšanas iespēju pārvaldībai."</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Jūsu tālrunī ir jābūt instalētai "<b>"palīglietotnei"</b>"."</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Koda apstiprināšana tālrunī"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Apstipriniet, ka šis kods atbilst jūsu tālrunī redzamajam kodam."</string>
- <string name="associated_device_success" msgid="584760065696870256">"Ierīce tika sekmīgi saistīta."</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Atveriet lietotni un savienojiet to ar &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Atveriet lietotni un ievērojiet norādīj."</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Vai noņemt ierīci &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Šī automašīna vairs nebūs savienota pārī ar šo ierīci. Jums būs arī jānoņem šī automašīna no palīglietotnes."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Tālrunis <xliff:g id="PHONE_NAME">%1$s</xliff:g> tika noņemts."</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Neizdevās noņemt tālruni <xliff:g id="PHONE_NAME">%1$s</xliff:g>."</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Turpiniet iestatīšanu tālrunī."</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Radās problēma"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Diemžēl nevarēja pareizi parādīt šo ekrānu. Mēģiniet vēlreiz."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Bluetooth ieslēgšana"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Lai iestatītu tālruni kā palīgierīci, automašīnai ir nepieciešams Bluetooth savienojums."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Vai ieslēgt Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Lai pievienotu palīgierīci, automašīnai ir nepieciešams Bluetooth savienojums."</string>
- <string name="accept" msgid="1454710793329618813">"Piekrist"</string>
- <string name="reject" msgid="4315432282758892890">"Noraidīt"</string>
- <string name="confirm" msgid="3748997214719276945">"Apstiprināt"</string>
- <string name="cancel" msgid="4306609731174629323">"Atcelt"</string>
- <string name="remove" msgid="5513398257088729188">"Noņemt"</string>
- <string name="ok" msgid="2825038997730899083">"Labi"</string>
- <string name="connection" msgid="2798490936433656846">"Savienojums"</string>
- <string name="forget_title" msgid="3027608547243824729">"Neiegaumēt šo ierīci"</string>
- <string name="forget" msgid="2069897665699141222">"Neiegaumēt"</string>
- <string name="disable" msgid="4619854429066283970">"Atspējot"</string>
- <string name="enable" msgid="7656386199154111316">"Iespējot"</string>
- <string name="continue_button" msgid="2748318968566159950">"Tālāk"</string>
- <string name="retry" msgid="3783419451480721367">"Mēģināt vēlreiz"</string>
- <string name="turn_on" msgid="4288754850470994812">"Ieslēgt"</string>
- <string name="not_now" msgid="8764692269093707622">"Vēlāk"</string>
- <string name="connected" msgid="8051190714042020471">"Saistīta"</string>
- <string name="notDetected" msgid="4115229772085594506">"Netika atrasta"</string>
- <string name="disconnected" msgid="8526513868622591894">"Atvienota"</string>
- <string name="unknown" msgid="555736316465118024">"Nezināms"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Darbojas tālruņa īsziņu pakalpojums"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Tālruņa īsziņu pakalpojums ir aktīvs"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Īsziņas tiek saņemtas, izmantojot palīgierīci"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Profila atbloķēšana, izmantojot tālruni"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Pārbaudiet palīglietotni, lai iestatītu atbloķēšanas iespējas."</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Atļauja tālrunim &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; atbloķēt manu profilu"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Tālrunī ir jābūt aktīvam savienojumam"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Lai ieslēgtu šo funkciju, automašīnai un tālrunim ir jābūt ar ieslēgtu Bluetooth savienojumu un ir jāatrodas tuvu cits citam."</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"Tagad &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; var atbloķēt jūsu profilu."</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Profila bloķēšanas galvenā veida iestatīšana"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Lai varētu atbloķēt profilu, izmantojot tālruni, galvenajam profila bloķēšanas veidam ir jābūt iestatītam kā rezerves iespējai."</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Profila atbloķēšana, lai pabeigtu procesu"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Jūs izveidojāt jaunu profila bloķēšanas veidu. Ievadiet to vēlreiz, lai apstiprinātu, ka jūsu tālrunis var automātiski atbloķēt jūsu profilu."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Atvienot šo ierīci"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Atkārtoti pievienot šo ierīci"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Atbloķēšana, izmantojot tālruni"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Atļauja atbloķēt profilu, izmantojot tālruni"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Pieskarieties šeit, lai atļautu šo funkciju."</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Radās problēma"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Diemžēl šobrīd nevarēja ieslēgt šo funkciju. Mēģiniet vēlreiz."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Ekrāna bloķēšanas iestatīšana tālrunī"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Tālrunim nav iestatīta ekrāna bloķēšana. Lai varētu atbloķēt automašīnas profilu, izmantojot tālruni, vispirms tālruņa iestatījumos izveidojiet ekrāna bloķēšanu (piekļuves kodu)."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Saistītā ierīce</string>
+ <string name="add_device_title">Pievienot saistīto ierīci</string>
+ <string name="add_associated_device_title">Palīgierīces pievienošana</string>
+ <string name="add_associated_device_instruction">Varat izmantot savu tālruni kā palīgierīci braukšanas iespēju pārvaldībai.</string>
+ <string name="associated_device_install_app">Jūsu tālrunī ir jābūt instalētai <b>palīglietotnei</b>.</string>
+ <string name="associated_device_pairing_code_title">Koda apstiprināšana tālrunī</string>
+ <string name="associated_device_pairing_message">Apstipriniet, ka šis kods atbilst jūsu tālrunī redzamajam kodam.</string>
+ <string name="associated_device_success">Ierīce tika sekmīgi saistīta.</string>
+ <string name="associated_device_select_device">Atveriet lietotni un savienojiet to ar &lt;b&gt;%1$s&lt;/b&gt;.</string>
+ <string name="associated_device_open_app">Atveriet lietotni un izpildiet tajā sniegtos norādījumus.</string>
+ <string name="remove_associated_device_title">Vai aizmirst &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Šī automašīna vairs nebūs savienota pārī ar šo ierīci. Jums būs arī jānoņem šī automašīna no palīglietotnes.</string>
+ <string name="device_removed_success_toast_text">Tālrunis %1$s tika noņemts.</string>
+ <string name="device_removed_failure_toast_text">Neizdevās noņemt tālruni %1$s.</string>
+ <string name="continue_setup_toast_text">Turpiniet iestatīšanu tālrunī.</string>
+ <string name="error_screen_title">Radās problēma</string>
+ <string name="error_screen_message">Diemžēl nevarēja pareizi parādīt šo ekrānu. Lūdzu, mēģiniet vēlreiz.</string>
+ <string name="turn_on_bluetooth_title">Bluetooth ieslēgšana</string>
+ <string name="turn_on_bluetooth_message">Lai iestatītu tālruni kā palīgierīci, automašīnai ir nepieciešams Bluetooth savienojums.</string>
+ <string name="turn_on_bluetooth_dialog_title">Vai ieslēgt Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Lai pievienotu palīgierīci, automašīnai ir nepieciešams Bluetooth savienojums.</string>
+ <string name="accept">Piekrist</string>
+ <string name="reject">Noraidīt</string>
+ <string name="confirm">Apstiprināt</string>
+ <string name="cancel">Atcelt</string>
+ <string name="remove">Noņemt</string>
+ <string name="ok">Labi</string>
+ <string name="connection">Savienojums</string>
+ <string name="forget_title">Aizmirst šo ierīci</string>
+ <string name="forget">Aizmirst</string>
+ <string name="disable">Atspējot</string>
+ <string name="enable">Iespējot</string>
+ <string name="continue_button">Turpināt</string>
+ <string name="retry">Mēģināt vēlreiz</string>
+ <string name="turn_on">Ieslēgt</string>
+ <string name="not_now">Vēlāk</string>
+ <string name="connected">Pievienots</string>
+ <string name="notDetected">Netika atrasts</string>
+ <string name="disconnected">Atvienots</string>
+ <string name="unknown">Nezināms</string>
+ <string name="app_running_msg_channel_name">Darbojas tālruņa īsziņu pakalpojums</string>
+ <string name="app_running_msg_notification_title">Tālruņa īsziņu pakalpojums ir aktīvs.</string>
+ <string name="app_running_msg_notification_content">Īsziņas tiek saņemtas, izmantojot palīgierīci.</string>
+ <string name="trusted_device_feature_title">Profila atbloķēšana, izmantojot tālruni</string>
+ <string name="trusted_device_feature_instruction">Skatiet palīglietotni, lai iestatītu atbloķēšanas iespējas.</string>
+ <string name="trusted_device_item_title">Atļauja atbloķēt profilu, izmantojot tālruni &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="device_not_connected_dialog_title">Tālrunī ir jābūt aktīvam savienojumam</string>
+ <string name="device_not_connected_dialog_message">Lai ieslēgtu šo funkciju, automašīnā un tālrunī ir jābūt ieslēgtam Bluetooth savienojumam un tiem ir jāatrodas netālu vienam no otra.</string>
+ <string name="trusted_device_enrollment_success_message">Jūsu profilu tagad var atbloķēt, izmantojot tālruni &lt;b&gt;%1$s&lt;/b&gt;.</string>
+ <string name="create_profile_lock_dialog_title">Profila bloķēšanas galvenā veida iestatīšana</string>
+ <string name="create_profile_lock_dialog_message">Lai varētu atbloķēt profilu, izmantojot tālruni, galvenajam profila bloķēšanas veidam ir jābūt iestatītam kā rezerves iespējai.</string>
+ <string name="unlock_profile_to_finish_title">Profila atbloķēšana, lai pabeigtu procesu</string>
+ <string name="unlock_profile_to_finish_message">Jūs izveidojāt jaunu profila bloķēšanas veidu. Ievadiet to vēlreiz, lai apstiprinātu, ka jūsu tālrunis var automātiski atbloķēt jūsu profilu.</string>
+ <string name="disable_device_connection_text">Atvienot šo ierīci</string>
+ <string name="enable_device_connection_text">Atkārtoti pievienot šo ierīci</string>
+ <string name="trusted_device_notification_channel_name">Atbloķēšana, izmantojot tālruni</string>
+ <string name="trusted_device_notification_title">Atļauja atbloķēt profilu, izmantojot tālruni</string>
+ <string name="trusted_device_notification_content">Pieskarieties šeit, lai atļautu šo funkciju.</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Radās problēma</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Diemžēl šobrīd nevarēja ieslēgt šo funkciju. Lūdzu, mēģiniet vēlreiz.</string>
+ <string name="create_phone_lock_dialog_title">Ekrāna bloķēšanas iestatīšana tālrunī</string>
+ <string name="create_phone_lock_dialog_message">Tālrunim nav iestatīta ekrāna bloķēšana. Lai varētu atbloķēt automašīnas profilu, izmantojot tālruni, vispirms tālruņa iestatījumos izveidojiet ekrāna bloķēšanu (piekļuves kodu).</string>
+ <plurals name="notification_new_message">
+ <item quantity="zero">%d jaunu ziņojumu</item>
+ <item quantity="one">%d jauns ziņojums</item>
+ <item quantity="other">%d jauni ziņojumi</item>
+ </plurals>
+ <string name="name_not_available">Vārds nav pieejams.</string>
</resources>
diff --git a/companiondevice/res/values-mk/strings.xml b/companiondevice/res/values-mk/strings.xml
index de08382..1b9e343 100644
--- a/companiondevice/res/values-mk/strings.xml
+++ b/companiondevice/res/values-mk/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Поврзан уред"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Додајте поврзан уред"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Поврзете придружен уред"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Може да го користите телефонот како придружен уред за да ви помогне да управувате со возењето"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Треба да имате инсталирано "<b>"придружна апликација"</b>" на телефонот"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Потврдете го кодот на телефонот"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Потврдете дека ова се совпаѓа со кодот на телефонот"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Уредот е поврзан успешно"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Отворете ја апликацијата и поврзете се со &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Отворете ја апликацијата и следете ги упатствата"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Да се заборави &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Автомобилов веќе нема да биде спарен со уредов. Ќе треба да го отстраните автомобилов и од придружната апликација."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> е заборавен"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Не успеа да се заборави <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Продолжете со поставување на телефонот"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Нешто тргна наопаку"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"За жал, екранов не може да се прикаже правилно. Обидете се повторно."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Вклучи Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"За да се постави телефонот како придружен уред, на автомобилот му треба Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Да се вклучи Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"За да се поврзе со придружниот уред, на автомобилот му треба Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Прифати"</string>
- <string name="reject" msgid="4315432282758892890">"Одбиј"</string>
- <string name="confirm" msgid="3748997214719276945">"Потврди"</string>
- <string name="cancel" msgid="4306609731174629323">"Откажи"</string>
- <string name="remove" msgid="5513398257088729188">"Отстрани"</string>
- <string name="ok" msgid="2825038997730899083">"Во ред"</string>
- <string name="connection" msgid="2798490936433656846">"Врска"</string>
- <string name="forget_title" msgid="3027608547243824729">"Заборави го уредов"</string>
- <string name="forget" msgid="2069897665699141222">"Заборави"</string>
- <string name="disable" msgid="4619854429066283970">"Оневозможи"</string>
- <string name="enable" msgid="7656386199154111316">"Овозможи"</string>
- <string name="continue_button" msgid="2748318968566159950">"Продолжи"</string>
- <string name="retry" msgid="3783419451480721367">"Обиди се пак"</string>
- <string name="turn_on" msgid="4288754850470994812">"Вклучи"</string>
- <string name="not_now" msgid="8764692269093707622">"Не сега"</string>
- <string name="connected" msgid="8051190714042020471">"Поврзан"</string>
- <string name="notDetected" msgid="4115229772085594506">"Не е пронајдено"</string>
- <string name="disconnected" msgid="8526513868622591894">"Прекината врска"</string>
- <string name="unknown" msgid="555736316465118024">"Непознат"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Услугата за текстуални пораки на телефонот се извршува"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Услугата за текстуални пораки на телефонот е активна"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Добивање текстуални пораки преку придружен уред"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Отклучете го профилот со телефон"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Проверете ја придружната апликација за да поставите опции за отклучување"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Дозволи &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; да го отклучува мојот профил"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Телефонот мора да биде активно поврзан"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"За да ја вклучите функцијава, проверете дали е вклучен Bluetooth во автомобилот и на телефонот и дека се блиску еден до друг"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; сега може да го отклучува профилот"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Создајте примарно заклучување на профилот"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"За да го користите телефонот за отклучување на профилот, потребно е примарно заклучување на профилот како резерва"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Отклучете го профилот за да завршите"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Создадовте ново заклучување на профилот. Внесете го повторно за да потврдите дека телефонот може да го отклучува вашиот профил автоматски"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Прекинете ја врската со уредов"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Повторно поврзете го уредов"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Отклучувајте со телефонот"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Дозволете телефонот да го отклучува вашиот профил"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Допрете тука за да ја одобрите функцијава"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Нешто тргна наопаку"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"За жал, функцијава не може да се вклучи во моментов. Обидете се повторно."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Создајте заклучување екран на телефонот"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Немате поставено заклучување екран на телефонот. За да го отклучите профилот на автомобилот преку телефонот, прво создајте заклучување екран (познато како лозинка) во поставките за телефонот."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Поврзан уред</string>
+ <string name="add_device_title">Додајте поврзан уред</string>
+ <string name="add_associated_device_title">Поврзете придружен уред</string>
+ <string name="add_associated_device_instruction">Може да го користите телефонот како придружен уред за да ви помогне да управувате со возењето</string>
+ <string name="associated_device_install_app">Треба да имате инсталирано <b>придружна апликација</b> на телефонот</string>
+ <string name="associated_device_pairing_code_title">Потврдете го кодот на телефонот</string>
+ <string name="associated_device_pairing_message">Потврдете дека ова се совпаѓа со кодот прикажан на телефонот</string>
+ <string name="associated_device_success">Уредот е успешно поврзан</string>
+ <string name="associated_device_select_device">Отворете ја апликацијата и поврзете се со &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Отворете ја апликацијата и следете ги упатствата во неа</string>
+ <string name="remove_associated_device_title">Да се заборави &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Автомобилов веќе нема да биде спарен со уредов. Ќе треба да го отстраните автомобилов и од придружната апликација.</string>
+ <string name="device_removed_success_toast_text">%1$s е заборавен</string>
+ <string name="device_removed_failure_toast_text">Не успеа да се заборави %1$s</string>
+ <string name="continue_setup_toast_text">Продолжете со поставување на телефонот</string>
+ <string name="error_screen_title">Нешто тргна наопаку</string>
+ <string name="error_screen_message">За жал, екранов не можеше да се прикаже правилно. Обидете се повторно.</string>
+ <string name="turn_on_bluetooth_title">Вклучете Bluetooth</string>
+ <string name="turn_on_bluetooth_message">За да се постави телефонот како придружен уред, на автомобилот му треба Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Да се вклучи Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">За да се поврзе со придружниот уред, на автомобилот му треба Bluetooth.</string>
+ <string name="accept">Прифати</string>
+ <string name="reject">Одбиј</string>
+ <string name="confirm">Потврди</string>
+ <string name="cancel">Откажи</string>
+ <string name="remove">Отстрани</string>
+ <string name="ok">Во ред</string>
+ <string name="connection">Врска</string>
+ <string name="forget_title">Заборави го уредов</string>
+ <string name="forget">Заборави</string>
+ <string name="disable">Оневозможи</string>
+ <string name="enable">Овозможи</string>
+ <string name="continue_button">Продолжи</string>
+ <string name="retry">Обиди се пак</string>
+ <string name="turn_on">Вклучи</string>
+ <string name="not_now">Не сега</string>
+ <string name="connected">Поврзано</string>
+ <string name="notDetected">Не е пронајдено</string>
+ <string name="disconnected">Прекината врска</string>
+ <string name="unknown">Непознато</string>
+ <string name="app_running_msg_channel_name">Се извршува услугата за SMS-пораки на телефонот</string>
+ <string name="app_running_msg_notification_title">Услугата за SMS-пораки на телефонот е активна</string>
+ <string name="app_running_msg_notification_content">Се примаат SMS-пораки преку придружен уред</string>
+ <string name="trusted_device_feature_title">Отклучете го профилот со телефон</string>
+ <string name="trusted_device_feature_instruction">Проверете ја придружната апликација за да поставите опции за отклучување</string>
+ <string name="trusted_device_item_title">Дозволи &lt;b&gt;%1$s&lt;/b&gt; да го отклучува мојот профил</string>
+ <string name="device_not_connected_dialog_title">Телефонот мора да биде активно поврзан</string>
+ <string name="device_not_connected_dialog_message">За да ја вклучите функцијава, уверете се дека автомобилот и телефонот имаат вклучено Bluetooth и дека се близу еден до друг</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; отсега може да го отклучува вашиот профил</string>
+ <string name="create_profile_lock_dialog_title">Создајте примарно заклучување на профилот</string>
+ <string name="create_profile_lock_dialog_message">За да го користите телефонот за отклучување на профилот, ви треба примарно заклучување на профилот како резервна опција</string>
+ <string name="unlock_profile_to_finish_title">Отклучете го профилот за да завршите</string>
+ <string name="unlock_profile_to_finish_message">Создадовте ново заклучување на профилот. Внесете го повторно за да потврдите дека телефонот може да го отклучува вашиот профил автоматски</string>
+ <string name="disable_device_connection_text">Прекинете ја врската со уредов</string>
+ <string name="enable_device_connection_text">Повторно поврзете го уредов</string>
+ <string name="trusted_device_notification_channel_name">Отклучувајте со телефонот</string>
+ <string name="trusted_device_notification_title">Дозволете телефонот да го отклучува вашиот профил</string>
+ <string name="trusted_device_notification_content">Допрете тука за да ја одобрите функцијава</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Нешто тргна наопаку</string>
+ <string name="trusted_device_enrollment_error_dialog_message">За жал, функцијава не можеше да се вклучи во моментов. Обидете се повторно.</string>
+ <string name="create_phone_lock_dialog_title">Создајте заклучување екран на телефонот</string>
+ <string name="create_phone_lock_dialog_message">Немате поставено заклучување екран на телефонот. За да го отклучите профилот на автомобилот преку телефонот, прво создајте заклучување екран (познато и како лозинка) во поставките за телефонот.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d нова порака</item>
+ <item quantity="other">%d нови пораки</item>
+ </plurals>
+ <string name="name_not_available">Името не е достапно</string>
</resources>
diff --git a/companiondevice/res/values-ml/strings.xml b/companiondevice/res/values-ml/strings.xml
index 63de9e9..d417048 100644
--- a/companiondevice/res/values-ml/strings.xml
+++ b/companiondevice/res/values-ml/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"ബന്ധപ്പെട്ട ഉപകരണം"</string>
- <string name="add_device_title" msgid="6166003577845888151">"ബന്ധപ്പെട്ട ഉപകരണം ചേർക്കുക"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"സഹകാരി ഉപകരണം കണക്റ്റ് ചെയ്യുക"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"നിങ്ങളുടെ ഡ്രൈവിംഗ് അനുഭവം മാനേജ് ചെയ്യാൻ സഹായിക്കുന്നതിന് ഫോൺ സഹകാരി ഉപകരണമായി ഉപയോഗിക്കാം"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"ഫോണിൽ "<b>"സഹകാരി ആപ്പ്"</b>" ഇൻസ്റ്റാൾ ചെയ്തിട്ടുണ്ടെന്ന് ഉറപ്പാക്കുക"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"ഫോണിലെ കോഡ് സ്ഥിരീകരിക്കുക"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"നിങ്ങളുടെ ഫോണിൽ കാണിക്കുന്ന കോഡുമായി ഇത് പൊരുത്തപ്പെടുന്നുണ്ടെന്ന് സ്ഥിരീകരിക്കുക"</string>
- <string name="associated_device_success" msgid="584760065696870256">"ഉപകരണം കാറുമായി ബന്ധിപ്പിച്ചു"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"ആപ്പ് തുറന്ന് &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; എന്നതിലേക്ക് കണക്റ്റ് ചെയ്യൂ"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"ആപ്പ് തുറന്ന്, നിർദ്ദേശങ്ങൾ പിന്തുടരുക"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; മറക്കണോ?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"ഈ കാർ ഇനി ഈ ഉപകരണവുമായി ജോടിയാകില്ല. നിങ്ങൾ സഹകാരി ആപ്പിൽ നിന്ന് ഈ കാർ നീക്കം ചെയ്യേണ്ടതുണ്ട്."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> മറന്നു"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> മറക്കാനായില്ല"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"നിങ്ങളുടെ ഫോണിൽ സജ്ജീകരിക്കൽ തുടരുക"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"എന്തോ കുഴപ്പമുണ്ടായി"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"നിർഭാഗ്യവശാൽ, ഈ സ്ക്രീൻ ശരിയായി പ്രദർശിപ്പിക്കാനായില്ല. വീണ്ടും ശ്രമിക്കുക."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Bluetooth ഓണാക്കുക"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"നിങ്ങളുടെ ഫോണിനെ സഹകാരി ഉപകരണമായി സജ്ജീകരിക്കാൻ, കാറിന് Bluetooth ആവശ്യമാണ്."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Bluetooth ഓണാക്കണോ?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"നിങ്ങളുടെ സഹകാരി ഉപകരണവുമായി കണക്റ്റ് ചെയ്യാൻ, കാറിന് Bluetooth ആവശ്യമാണ്"</string>
- <string name="accept" msgid="1454710793329618813">"അംഗീകരിക്കുക"</string>
- <string name="reject" msgid="4315432282758892890">"നിരസിക്കുക"</string>
- <string name="confirm" msgid="3748997214719276945">"സ്ഥിരീകരിക്കുക"</string>
- <string name="cancel" msgid="4306609731174629323">"റദ്ദാക്കുക"</string>
- <string name="remove" msgid="5513398257088729188">"നീക്കം ചെയ്യുക"</string>
- <string name="ok" msgid="2825038997730899083">"ശരി"</string>
- <string name="connection" msgid="2798490936433656846">"കണക്ഷൻ"</string>
- <string name="forget_title" msgid="3027608547243824729">"ഈ ഉപകരണം മറക്കുക"</string>
- <string name="forget" msgid="2069897665699141222">"മറക്കുക"</string>
- <string name="disable" msgid="4619854429066283970">"പ്രവർത്തനരഹിതമാക്കുക"</string>
- <string name="enable" msgid="7656386199154111316">"പ്രവർത്തനക്ഷമമാക്കുക"</string>
- <string name="continue_button" msgid="2748318968566159950">"തുടരുക"</string>
- <string name="retry" msgid="3783419451480721367">"വീണ്ടും ശ്രമിക്കുക"</string>
- <string name="turn_on" msgid="4288754850470994812">"ഓണാക്കുക"</string>
- <string name="not_now" msgid="8764692269093707622">"ഇപ്പോൾ വേണ്ട"</string>
- <string name="connected" msgid="8051190714042020471">"കണക്റ്റ് ചെയ്തു"</string>
- <string name="notDetected" msgid="4115229772085594506">"കണ്ടെത്തിയില്ല"</string>
- <string name="disconnected" msgid="8526513868622591894">"വിച്ഛേദിച്ചു"</string>
- <string name="unknown" msgid="555736316465118024">"അജ്ഞാതം"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"ഫോണിലെ ടെക്സ്റ്റ് മെസേജ് സേവനം റൺ ചെയ്യുന്നു"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"ഫോണിലെ ടെക്സ്റ്റ് മെസേജ് സേവനം സജീവമാണ്"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"സഹകാരി ഉപകരണം വഴി ടെക്സ്റ്റ് മെസേജുകൾ സ്വീകരിക്കുന്നു"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"ഫോൺ ഉപയോഗിച്ച് പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യുക"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"അൺലോക്ക് ചെയ്യാനുള്ള ഓപ്ഷനുകൾ സജ്ജീകരിക്കാൻ സഹകാരി ആപ്പ് പരിശോധിക്കുക"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"എന്റെ പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യാൻ &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; എന്നതിനെ അനുവദിക്കുക"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"നിങ്ങളുടെ ഫോൺ സജീവമായി കണക്റ്റ് ചെയ്തിരിക്കണം"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"ഈ ഫീച്ചർ ഓണാക്കാൻ, നിങ്ങളുടെ കാറിന്റെയും ഫോണിന്റെയും Bluetooth ഓണാണെന്നും അവ അടുത്തടുത്ത് ആണെന്നും ഉറപ്പാക്കുക"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"ഇപ്പോൾ &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; എന്നതിന് നിങ്ങളുടെ പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യാനാവും"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"പ്രാഥമിക പ്രൊഫൈൽ ലോക്ക് സൃഷ്ടിക്കുക"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"നിങ്ങളുടെ പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യുന്നതിന് ഫോൺ ഉപയോഗിക്കാൻ ബാക്കപ്പ് എന്ന നിലയിൽ പ്രാഥമിക പ്രൊഫൈൽ ലോക്ക് ആവശ്യമാണ്"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"പൂർത്തിയാക്കാൻ നിങ്ങളുടെ പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യുക"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"നിങ്ങളൊരു പുതിയ പ്രൊഫൈൽ ലോക്ക് സൃഷ്ടിച്ചു. അടുത്തതായി, ഫോണിന് നിങ്ങളുടെ പ്രൊഫൈൽ സ്വയമേവ അൺലോക്ക് ചെയ്യാനാവുമെന്ന് സ്ഥിരീകരിക്കാൻ ഇത് വീണ്ടും നൽകുക"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"ഈ ഉപകരണം വിച്‌ഛേദിക്കുക"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"ഈ ഉപകരണം വീണ്ടും കണക്റ്റ് ചെയ്യുക"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"ഫോൺ ഉപയോഗിച്ച് അൺലോക്ക് ചെയ്യുക"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"നിങ്ങളുടെ പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യാൻ ഫോണിനെ അനുവദിക്കുക"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"ഈ ഫീച്ചർ അംഗീകരിക്കാൻ ഇവിടെ ടാപ്പ് ചെയ്യുക"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"എന്തോ കുഴപ്പമുണ്ടായി"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"നിർഭാഗ്യവശാൽ, ഈ ഫീച്ചർ ഇപ്പോൾ ഓണാക്കാനായില്ല. വീണ്ടും ശ്രമിക്കുക."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"നിങ്ങളുടെ ഫോണിൽ സ്ക്രീൻ ലോക്ക് സൃഷ്ടിക്കുക"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"നിങ്ങളുടെ ഫോണിൽ സ്ക്രീൻ ലോക്ക് സജ്ജീകരിച്ചിട്ടില്ല. നിങ്ങളുടെ ഫോൺ ഉപയോഗിച്ച് കാർ പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യാൻ ആദ്യം ഫോൺ ക്രമീകരണത്തിൽ സ്ക്രീൻ ലോക്ക് (പാസ്‌വേഡ് എന്നും അറിയപ്പെടുന്നു) സൃഷ്ടിക്കുക."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">ബന്ധപ്പെട്ട ഉപകരണം</string>
+ <string name="add_device_title">ബന്ധപ്പെട്ട ഉപകരണം ചേർക്കുക</string>
+ <string name="add_associated_device_title">സഹകാരി ഉപകരണം കണക്റ്റ് ചെയ്യുക</string>
+ <string name="add_associated_device_instruction">നിങ്ങളുടെ ഡ്രൈവിംഗ് അനുഭവം മാനേജ് ചെയ്യാൻ സഹായിക്കുന്നതിന് ഫോൺ സഹകാരി ഉപകരണമായി ഉപയോഗിക്കാം</string>
+ <string name="associated_device_install_app">ഫോണിൽ <b>സഹകാരി ആപ്പ്</b> ഇൻസ്റ്റാൾ ചെയ്‌തിട്ടുണ്ടെന്ന് ഉറപ്പാക്കുക</string>
+ <string name="associated_device_pairing_code_title">ഫോണിലെ കോഡ് സ്ഥിരീകരിക്കുക</string>
+ <string name="associated_device_pairing_message">നിങ്ങളുടെ ഫോണിൽ കാണിക്കുന്ന കോഡുമായി ഇത് പൊരുത്തപ്പെടുന്നുണ്ടെന്ന് സ്ഥിരീകരിക്കുക</string>
+ <string name="associated_device_success">ഉപകരണം ശരിയായി ബന്ധിപ്പിച്ചു</string>
+ <string name="associated_device_select_device">ആപ്പ് തുറന്ന് &lt;b&gt;%1$s&lt;/b&gt; എന്നതിലേക്ക് കണക്റ്റ് ചെയ്യൂ</string>
+ <string name="associated_device_open_app">ആപ്പ് തുറന്ന്, നിർദ്ദേശങ്ങൾ പിന്തുടരുക</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; എന്നതിനെ മറക്കണോ?</string>
+ <string name="remove_associated_device_message">ഈ കാർ ഇനി ഈ ഉപകരണവുമായി ജോടിയാകില്ല. നിങ്ങൾ സഹകാരി ആപ്പിൽ നിന്ന് ഈ കാർ നീക്കം ചെയ്യേണ്ടതുണ്ട്.</string>
+ <string name="device_removed_success_toast_text">%1$s മറന്നു</string>
+ <string name="device_removed_failure_toast_text">%1$s മറക്കാനായില്ല</string>
+ <string name="continue_setup_toast_text">നിങ്ങളുടെ ഫോണിൽ സജ്ജീകരിക്കൽ തുടരുക</string>
+ <string name="error_screen_title">എന്തോ കുഴപ്പമുണ്ടായി</string>
+ <string name="error_screen_message">നിർഭാഗ്യവശാൽ, ഈ സ്ക്രീൻ ശരിയായി പ്രദർശിപ്പിക്കാനായില്ല. വീണ്ടും ശ്രമിക്കുക.</string>
+ <string name="turn_on_bluetooth_title">Bluetooth ഓണാക്കുക</string>
+ <string name="turn_on_bluetooth_message">നിങ്ങളുടെ ഫോണിനെ സഹകാരി ഉപകരണമായി സജ്ജീകരിക്കാൻ, കാറിന് Bluetooth ആവശ്യമാണ്.</string>
+ <string name="turn_on_bluetooth_dialog_title">Bluetooth ഓണാക്കണോ?</string>
+ <string name="turn_on_bluetooth_dialog_message">നിങ്ങളുടെ സഹകാരി ഉപകരണവുമായി കണക്റ്റ് ചെയ്യാൻ, കാറിന് Bluetooth ആവശ്യമാണ്.</string>
+ <string name="accept">അംഗീകരിക്കുക</string>
+ <string name="reject">നിരസിക്കുക</string>
+ <string name="confirm">സ്ഥിരീകരിക്കുക</string>
+ <string name="cancel">റദ്ദാക്കുക</string>
+ <string name="remove">നീക്കം ചെയ്യുക</string>
+ <string name="ok">ശരി</string>
+ <string name="connection">കണക്ഷൻ</string>
+ <string name="forget_title">ഈ ഉപകരണം മറക്കുക</string>
+ <string name="forget">മറക്കുക</string>
+ <string name="disable">പ്രവർത്തനരഹിതമാക്കുക</string>
+ <string name="enable">പ്രവർത്തനക്ഷമമാക്കുക</string>
+ <string name="continue_button">തുടരുക</string>
+ <string name="retry">വീണ്ടും ശ്രമിക്കുക</string>
+ <string name="turn_on">ഓണാക്കുക</string>
+ <string name="not_now">ഇപ്പോൾ വേണ്ട</string>
+ <string name="connected">കണക്റ്റ് ചെയ്‌തു</string>
+ <string name="notDetected">കണ്ടെത്തിയില്ല</string>
+ <string name="disconnected">വിച്ഛേദിച്ചു</string>
+ <string name="unknown">അജ്ഞാതം</string>
+ <string name="app_running_msg_channel_name">ഫോണിലെ ടെക്‌സ്‌റ്റ് മെസേജ് സേവനം റൺ ചെയ്യുന്നു</string>
+ <string name="app_running_msg_notification_title">ഫോണിലെ ടെക്‌സ്‌റ്റ് മെസേജ് സേവനം സജീവമാണ്</string>
+ <string name="app_running_msg_notification_content">സഹകാരി ഉപകരണം വഴി ടെക്‌സ്‌റ്റ് മെസേജുകൾ സ്വീകരിക്കുന്നു</string>
+ <string name="trusted_device_feature_title">ഫോൺ ഉപയോഗിച്ച് പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യുക</string>
+ <string name="trusted_device_feature_instruction">അൺലോക്ക് ചെയ്യാനുള്ള ഓപ്ഷനുകൾ സജ്ജീകരിക്കാൻ സഹകാരി ആപ്പ് പരിശോധിക്കുക</string>
+ <string name="trusted_device_item_title">എന്റെ പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യാൻ &lt;b&gt;%1$s&lt;/b&gt; എന്നതിനെ അനുവദിക്കുക</string>
+ <string name="device_not_connected_dialog_title">നിങ്ങളുടെ ഫോൺ സജീവമായി കണക്റ്റ് ചെയ്‌തിരിക്കണം</string>
+ <string name="device_not_connected_dialog_message">ഈ ഫീച്ചർ ഓണാക്കാൻ, നിങ്ങളുടെ കാറിന്റെയും ഫോണിന്റെയും Bluetooth ഓണാണെന്നും അവ അടുത്തടുത്ത് ആണെന്നും ഉറപ്പാക്കുക</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; എന്നതിന് നിങ്ങളുടെ പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യാൻ കഴിയും</string>
+ <string name="create_profile_lock_dialog_title">പ്രാഥമിക പ്രൊഫൈൽ ലോക്ക് സൃഷ്‌ടിക്കുക</string>
+ <string name="create_profile_lock_dialog_message">നിങ്ങളുടെ പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യുന്നതിന് ഫോൺ ഉപയോഗിക്കാൻ, ബാക്കപ്പ് എന്ന നിലയിൽ പ്രാഥമിക പ്രൊഫൈൽ ലോക്ക് ആവശ്യമാണ്</string>
+ <string name="unlock_profile_to_finish_title">പൂർത്തിയാക്കാൻ നിങ്ങളുടെ പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യുക</string>
+ <string name="unlock_profile_to_finish_message">നിങ്ങൾ പുതിയൊരു പ്രൊഫൈൽ ലോക്ക് സൃഷ്‌ടിച്ചു. അടുത്തതായി, ഫോണിന് നിങ്ങളുടെ പ്രൊഫൈൽ സ്വയമേവ അൺലോക്ക് ചെയ്യാനാവുമെന്ന് സ്ഥിരീകരിക്കാൻ ഇത് വീണ്ടും നൽകുക</string>
+ <string name="disable_device_connection_text">ഈ ഉപകരണം വിച്‌ഛേദിക്കുക</string>
+ <string name="enable_device_connection_text">ഈ ഉപകരണം വീണ്ടും കണക്റ്റ് ചെയ്യുക</string>
+ <string name="trusted_device_notification_channel_name">ഫോൺ ഉപയോഗിച്ച് അൺലോക്ക് ചെയ്യുക</string>
+ <string name="trusted_device_notification_title">നിങ്ങളുടെ പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യാൻ ഫോണിനെ അനുവദിക്കുക</string>
+ <string name="trusted_device_notification_content">ഈ ഫീച്ചർ അംഗീകരിക്കാൻ ഇവിടെ ടാപ്പ് ചെയ്യുക</string>
+ <string name="trusted_device_enrollment_error_dialog_title">എന്തോ കുഴപ്പമുണ്ടായി</string>
+ <string name="trusted_device_enrollment_error_dialog_message">നിർഭാഗ്യവശാൽ, ഈ ഫീച്ചർ ഇപ്പോൾ ഓണാക്കാനാകില്ല. വീണ്ടും ശ്രമിക്കുക.</string>
+ <string name="create_phone_lock_dialog_title">നിങ്ങളുടെ ഫോണിൽ സ്ക്രീൻ ലോക്ക് സൃഷ്‌ടിക്കുക</string>
+ <string name="create_phone_lock_dialog_message">നിങ്ങളുടെ ഫോണിൽ സ്ക്രീൻ ലോക്ക് സജ്ജീകരിച്ചിട്ടില്ല. നിങ്ങളുടെ ഫോൺ ഉപയോഗിച്ച് കാർ പ്രൊഫൈൽ അൺലോക്ക് ചെയ്യാൻ, ആദ്യം ഫോൺ ക്രമീകരണത്തിൽ സ്ക്രീൻ ലോക്ക് (പാസ്‌വേഡ് എന്നും അറിയപ്പെടുന്നു) സൃഷ്‌ടിക്കുക.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">പുതിയ സന്ദേശം</item>
+ <item quantity="other">%d പുതിയ സന്ദേശങ്ങൾ</item>
+ </plurals>
+ <string name="name_not_available">പേര് ലഭ്യമല്ല</string>
</resources>
diff --git a/companiondevice/res/values-mn/strings.xml b/companiondevice/res/values-mn/strings.xml
index 34b81ad..c483e4a 100644
--- a/companiondevice/res/values-mn/strings.xml
+++ b/companiondevice/res/values-mn/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Холбоотой төхөөрөмж"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Холбоотой төхөөрөмж нэмэх"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Дэмжигч төхөөрөмж холбох"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Та жолоо барих туршлагаа удирдахад туслах дэмжигч төхөөрөмжөөр утсаа ашиглах боломжтой"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Та утсан дээрээ "<b>"Дэмжигч апп"</b>"-ыг суулгасан эсэхээ шалгана уу"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Утсан дээрх кодыг баталгаажуулна уу"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Энэ нь таны утсан дээр харуулсан кодтой таарч байгаа эсэхийг баталгаажуулна уу"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Төхөөрөмжийг амжилттай холболоо"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Аппыг нээж &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;-д холбо"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Аппыг нээж, апп дахь зааварчилгааг дага"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;-г мартах уу?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Энэ машин цаашид энэ төхөөрөмжтэй хослохгүй. Та нэмэлтээр энэ машиныг Дэмжигч аппаас хасах шаардлагатай болно."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g>-г мартсан"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g>-г мартаж чадсангүй"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Тохируулгыг утсан дээрээ үргэлжлүүлнэ үү"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Алдаа гарлаа"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Уучлаарай, энэ дэлгэц зөв үзүүлж чадсангүй. Дахин оролдоно уу."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Bluetooth-г асаана уу"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Таны утсыг дэмжигч төхөөрөмжөөр тохируулахын тулд таны машинд Bluetooth шаардлагатай."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Bluetooth-г асаах уу?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Таны дэмжигч төхөөрөмжид холбогдохын тулд таны машинд Bluetooth шаардлагатай."</string>
- <string name="accept" msgid="1454710793329618813">"Зөвшөөрөх"</string>
- <string name="reject" msgid="4315432282758892890">"Татгалзах"</string>
- <string name="confirm" msgid="3748997214719276945">"Баталгаажуулах"</string>
- <string name="cancel" msgid="4306609731174629323">"Цуцлах"</string>
- <string name="remove" msgid="5513398257088729188">"Хасах"</string>
- <string name="ok" msgid="2825038997730899083">"ОК"</string>
- <string name="connection" msgid="2798490936433656846">"Холболт"</string>
- <string name="forget_title" msgid="3027608547243824729">"Энэ төхөөрөмжийг мартах"</string>
- <string name="forget" msgid="2069897665699141222">"Мартах"</string>
- <string name="disable" msgid="4619854429066283970">"Идэвхгүй болгох"</string>
- <string name="enable" msgid="7656386199154111316">"Идэвхжүүлэх"</string>
- <string name="continue_button" msgid="2748318968566159950">"Үргэлжлүүлэх"</string>
- <string name="retry" msgid="3783419451480721367">"Дахин оролдох"</string>
- <string name="turn_on" msgid="4288754850470994812">"Асаах"</string>
- <string name="not_now" msgid="8764692269093707622">"Одоо биш"</string>
- <string name="connected" msgid="8051190714042020471">"Холбогдсон"</string>
- <string name="notDetected" msgid="4115229772085594506">"Илрээгүй"</string>
- <string name="disconnected" msgid="8526513868622591894">"Салгасан"</string>
- <string name="unknown" msgid="555736316465118024">"Тодорхойгүй"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Утасны мессежийн үйлчилгээ ажиллаж байна"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Утасны мессежийн үйлчилгээ идэвхтэй байна"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Дэмжигч төхөөрөмжөөр мессеж хүлээн авч байна"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Утсаараа профайлын түгжээг тайлна уу"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Түгжээг тайлах сонголт тохируулахын тулд Дэмжигч аппаа шалгана уу"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;-д миний профайлын түгжээг тайлахыг зөвшөөрнө үү"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Таны утас идэвхтэй холбогдсон байх ёстой"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Энэ онцлогийг асаахын тулд машин болон утсаа bluetooth-г асаасан бөгөөд хоорондоо ойр байгаа эсэхийг шалгана уу"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; одоо таны профайлын түгжээг тайлах боломжтой"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Үндсэн профайлын түгжээ үүсгэнэ үү"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Та утсаараа профайлынхаа түгжээг тайлахын тулд үндсэн профайлын түгжээгээ нөөцөөр ашиглах шаардлагатай"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Дуусгахын тулд профайлынхаа түгжээг тайлна уу"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Та профайлын шинэ түгжээ үүсгэлээ. Дараа нь таны утас профайлын тань түгжээг автоматаар тайлах боломжтойг баталгаажуулахын тулд үүнийг дахин оруул"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Энэ төхөөрөмжийг салгах"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Энэ төхөөрөмжийг дахин холбох"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Түгжээг утсаар тайлах"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Утсандаа таны профайлын түгжээг тайлахыг зөвшөөрнө үү"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Энэ онцлогт зөвшөөрөл өгөхийн тулд энд товшино уу"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Алдаа гарлаа"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Уучлаарай, энэ онцлогийг одоогоор асаах боломжгүй байна. Дахин оролдоно уу."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Утсан дээрээ дэлгэцийн түгжээ үүсгэнэ үү"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Та утсандаа дэлгэцийн түгжээ тохируулаагүй байна. Та утсаараа машиныхаа профайлын түгжээг тайлахын тулд эхлээд утасныхаа тохиргоо хэсэгт дэлгэцийн түгжээ (өөрөөр нууц код гэдэг) үүсгэнэ үү."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Холбоотой төхөөрөмж</string>
+ <string name="add_device_title">Холбоотой төхөөрөмж нэмэх</string>
+ <string name="add_associated_device_title">Дэмжигч төхөөрөмж холбох</string>
+ <string name="add_associated_device_instruction">Та жолоо барих туршлагаа удирдахад туслах дэмжигч төхөөрөмжөөр утсаа ашиглах боломжтой</string>
+ <string name="associated_device_install_app">Та утсан дээрээ <b>Дэмжигч апп</b>-ыг суулгасан эсэхээ шалгана уу</string>
+ <string name="associated_device_pairing_code_title">Утсан дээрх кодыг баталгаажуулна уу</string>
+ <string name="associated_device_pairing_message">Энэ нь таны утсан дээр харуулсан кодтой таарч байгаа эсэхийг баталгаажуулна уу</string>
+ <string name="associated_device_success">Төхөөрөмжийг амжилттай холболоо</string>
+ <string name="associated_device_select_device">Аппыг нээж, &lt;b&gt;%1$s&lt;b&gt;-д холбогдоно уу</string>
+ <string name="associated_device_open_app">Аппыг нээж, апп дахь зааварчилгааг дагана уу</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt;-г мартах уу?</string>
+ <string name="remove_associated_device_message">Энэ машин цаашид энэ төхөөрөмжтэй хослохгүй. Та нэмэлтээр энэ машиныг Дэмжигч аппаас хасах шаардлагатай болно.</string>
+ <string name="device_removed_success_toast_text">%1$s-г мартсан</string>
+ <string name="device_removed_failure_toast_text">%1$s-г мартаж чадсангүй</string>
+ <string name="continue_setup_toast_text">Тохируулгыг утсан дээрээ үргэлжлүүлнэ үү</string>
+ <string name="error_screen_title">Алдаа гарлаа</string>
+ <string name="error_screen_message">Уучлаарай, энэ дэлгэц зөв үзүүлж чадсангүй. Дахин оролдоно уу.</string>
+ <string name="turn_on_bluetooth_title">Bluetooth-г асаах</string>
+ <string name="turn_on_bluetooth_message">Таны утсыг дэмжигч төхөөрөмжөөр тохируулахын тулд таны машинд Bluetooth шаардлагатай.</string>
+ <string name="turn_on_bluetooth_dialog_title">Bluetooth-г асаах уу?</string>
+ <string name="turn_on_bluetooth_dialog_message">Таны дэмжигч төхөөрөмжид холбогдохын тулд таны машинд Bluetooth шаардлагатай.</string>
+ <string name="accept">Зөвшөөрөх</string>
+ <string name="reject">Татгалзах</string>
+ <string name="confirm">Баталгаажуулах</string>
+ <string name="cancel">Цуцлах</string>
+ <string name="remove">Хасах</string>
+ <string name="ok">OK</string>
+ <string name="connection">Холболт</string>
+ <string name="forget_title">Энэ төхөөрөмжийг мартах</string>
+ <string name="forget">Мартах</string>
+ <string name="disable">Идэвхгүй болгох</string>
+ <string name="enable">Идэвхжүүлэх</string>
+ <string name="continue_button">Үргэлжлүүлэх</string>
+ <string name="retry">Дахин оролдох</string>
+ <string name="turn_on">Асаах</string>
+ <string name="not_now">Одоо биш</string>
+ <string name="connected">Холбогдсон</string>
+ <string name="notDetected">Илрээгүй</string>
+ <string name="disconnected">Салсан</string>
+ <string name="unknown">Тодорхойгүй</string>
+ <string name="app_running_msg_channel_name">Утасны мессежийн үйлчилгээ ажиллаж байна</string>
+ <string name="app_running_msg_notification_title">Утасны мессежийн үйлчилгээ идэвхтэй байна</string>
+ <string name="app_running_msg_notification_content">Дэмжигч төхөөрөмжөөр мессеж хүлээн авч байна</string>
+ <string name="trusted_device_feature_title">Утсаараа профайлын түгжээг тайлна уу</string>
+ <string name="trusted_device_feature_instruction">Түгжээг тайлах сонголт тохируулахын тулд Дэмжигч аппаа шалгана уу</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt;-д миний профайлын түгжээг тайлахыг зөвшөөрөх</string>
+ <string name="device_not_connected_dialog_title">Таны утас идэвхтэй холбогдсон байх ёстой</string>
+ <string name="device_not_connected_dialog_message">Энэ онцлогийг асаахын тулд машин болон утсаа bluetooth-г асаасан бөгөөд хоорондоо ойр байгаа эсэхийг шалгана уу</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; одоо таны профайлын түгжээг тайлах боломжтой</string>
+ <string name="create_profile_lock_dialog_title">Үндсэн профайлын түгжээ үүсгэнэ үү</string>
+ <string name="create_profile_lock_dialog_message">Та утсаараа профайлынхаа түгжээг тайлахын тулд үндсэн профайлын түгжээгээ нөөцөөр ашиглах шаардлагатай</string>
+ <string name="unlock_profile_to_finish_title">Дуусгахын тулд профайлынхаа түгжээг тайлна уу</string>
+ <string name="unlock_profile_to_finish_message">Та профайлын шинэ түгжээ үүсгэлээ. Дараа нь таны утас профайлын тань түгжээг автоматаар тайлах боломжтойг баталгаажуулахын тулд үүнийг дахин оруул</string>
+ <string name="disable_device_connection_text">Энэ төхөөрөмжийг салгах</string>
+ <string name="enable_device_connection_text">Энэ төхөөрөмжийг дахин холбох</string>
+ <string name="trusted_device_notification_channel_name">Түгжээг утсаар тайлах</string>
+ <string name="trusted_device_notification_title">Утсандаа таны профайлын түгжээг тайлахыг зөвшөөрнө үү</string>
+ <string name="trusted_device_notification_content">Энэ онцлогт зөвшөөрөл өгөхийн тулд энд товшино уу</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Алдаа гарлаа</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Уучлаарай, энэ онцлогийг одоогоор асаах боломжгүй байна. Дахин оролдоно уу.</string>
+ <string name="create_phone_lock_dialog_title">Утсан дээрээ дэлгэцийн түгжээ үүсгэнэ үү</string>
+ <string name="create_phone_lock_dialog_message">Та утсандаа дэлгэцийн түгжээ тохируулаагүй байна. Та утсаараа машиныхаа профайлын түгжээг тайлахын тулд эхлээд утасныхаа тохиргоо хэсэгт дэлгэцийн түгжээ (өөрөөр нууц код гэдэг) үүсгэнэ үү.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Шинэ мессеж</item>
+ <item quantity="other">%d шинэ мессеж</item>
+ </plurals>
+ <string name="name_not_available">Нэр боломжгүй байна</string>
</resources>
diff --git a/companiondevice/res/values-mr/strings.xml b/companiondevice/res/values-mr/strings.xml
index 662943b..0ffe788 100644
--- a/companiondevice/res/values-mr/strings.xml
+++ b/companiondevice/res/values-mr/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"संबंधित डिव्हाइस"</string>
- <string name="add_device_title" msgid="6166003577845888151">"संबंधित डिव्हाइस जोडा"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"सहयोगी डिव्हाइस कनेक्ट करा"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"ड्रायव्हिंग अनुभव व्यवस्थापित करण्यात मदत करण्यासाठी तुमचा फोन सहयोगी डिव्हाइस म्हणून वापरू शकता"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"तुमच्या फोनवर "<b>"सहयोगी अ‍ॅप"</b>" इंस्टॉल केले असल्याची खात्री करा"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"फोनवरील कोडची खात्री करा"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"तुमच्या फोनवर दिसणाऱ्या कोडशी हे जुळत असल्याची खात्री करा"</string>
- <string name="associated_device_success" msgid="584760065696870256">"डिव्हाइस यशस्वीरीत्या संबद्ध केले गेले आहे"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"ॲप उघडा आणि &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; शी कनेक्ट करा"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"ॲप उघडा आणि त्यामधील सूचना फॉलो करा"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;विसरायचे आहे का?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"ही कार यापुढे या डिव्हाइससह पेअर होणार नाही. तुम्हाला या व्यतिरिक्त सहयोगी अ‍ॅपमधून ही कार काढून टाकणे आवश्यक असेल."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> विसरण्यात आला आहे"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> विसरता आला नाही"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"तुमच्‍या फोनवर सेट करणे सुरू ठेवा"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"काहीतरी चूक झाली"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"दुर्दैवाने, ही स्क्रीन योग्यप्रकारे प्रदर्शित होऊ शकली नाही. कृपया पुन्हा प्रयत्न करा."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"ब्लूटूथ सुरू करा"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"तुमचा फोन सहयोगी डिव्हाइस म्हणून सेट करण्यासाठी तुमच्या कारला ब्लूटूथ आवश्यक आहे."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"ब्लूटूथ सुरू करायचे आहे का?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"तुमच्या सहयोगी डिव्हाइससह कनेक्ट करण्यासाठी तुमच्या कारला ब्लूटूथ आवश्यक आहे."</string>
- <string name="accept" msgid="1454710793329618813">"स्वीकारा"</string>
- <string name="reject" msgid="4315432282758892890">"नकार द्या"</string>
- <string name="confirm" msgid="3748997214719276945">"निश्चित करा"</string>
- <string name="cancel" msgid="4306609731174629323">"रद्द करा"</string>
- <string name="remove" msgid="5513398257088729188">"काढून टाका"</string>
- <string name="ok" msgid="2825038997730899083">"ओके"</string>
- <string name="connection" msgid="2798490936433656846">"कनेक्शन"</string>
- <string name="forget_title" msgid="3027608547243824729">"हे डिव्हाइस विसरा"</string>
- <string name="forget" msgid="2069897665699141222">"विसरा"</string>
- <string name="disable" msgid="4619854429066283970">"बंद करा"</string>
- <string name="enable" msgid="7656386199154111316">"सुरू करा"</string>
- <string name="continue_button" msgid="2748318968566159950">"पुढे सुरू ठेवा"</string>
- <string name="retry" msgid="3783419451480721367">"पुन्हा प्रयत्न करा"</string>
- <string name="turn_on" msgid="4288754850470994812">"सुरू करा"</string>
- <string name="not_now" msgid="8764692269093707622">"आता नको"</string>
- <string name="connected" msgid="8051190714042020471">"कनेक्ट केले आहे"</string>
- <string name="notDetected" msgid="4115229772085594506">"आढळले नाही"</string>
- <string name="disconnected" msgid="8526513868622591894">"डिस्कनेक्ट केले आहे"</string>
- <string name="unknown" msgid="555736316465118024">"अज्ञात"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"फोन एसएमएस सेवा रन होत आहे"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"फोन एसएमएस सेवा अ‍ॅक्टिव्ह आहे"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"सहयोगी डिव्हाइसद्वारे एसएमएस मिळवत आहे"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"फोनसह प्रोफाइल अनलॉक करा"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"अनलॉक करण्याचे पर्याय सेट करण्यासाठी तुमचे सहयोगी अ‍ॅप तपासा"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;ला माझी प्रोफाइल अनलॉक करू द्या"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"तुमचा फोन सक्रियपणे कनेक्ट केलेला असणे आवश्यक आहे"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"हे वैशिष्ट्य सुरू करण्यासाठी तुमच्या कार आणि फोनमध्ये ब्लूटूथ सुरू असल्याची आणि एकमेकांच्या जवळ असल्याची खात्री करा"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"आता &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; तुमची प्रोफाइल अनलॉक करू शकते"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"प्राथमिक प्रोफाइल लॉक तयार करा"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"तुमची प्रोफाइल अनलॉक करण्यासाठी तुमचा फोन वापरण्याकरिता तुम्हाला बॅकअप म्हणून प्राथमिक प्रोफाइल लॉक आवश्यक आहे"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"पूर्ण करण्यासाठी तुमची प्रोफाइल अनलॉक करा"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"तुम्ही नवीन प्रोफाइल लॉक तयार केला आहे. पुढे, तुमचा फोन आपोआप तुमची प्रोफाइल अनलॉक करू शकतो याची खात्री करण्यासाठी ते पुन्हा एंटर करा"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"हे डिव्हाइस डिस्कनेक्ट करा"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"हे डिव्हाइस पुन्हा कनेक्ट करा"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"फोनसह अनलॉक करा"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"तुमच्या फोनला तुमची प्रोफाइल अनलॉक करू द्या"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"या वैशिष्ट्याला परवानगी देण्यासाठी येथे टॅप करा"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"काहीतरी चूक झाली"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"दुर्दैवाने, हे वैशिष्ट्य यावेळी सुरू करता आले नाही. कृपया पुन्हा प्रयत्न करा."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"तुमच्या फोनवर स्क्रीन लॉक तयार करा"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"तुमच्या फोनवर स्क्रीन लॉक सेट केलेला नाही. तुमच्या फोनसह तुमची कार प्रोफाइल अनलॉक करण्यासाठी आधी तुमच्या फोन सेटिंग्जमध्ये स्क्रीन लॉक (पासकोड म्हणूनदेखील ओळखले जाते) तयार करा."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">संबंधित डिव्हाइस</string>
+ <string name="add_device_title">संबंधित डिव्हाइस जोडा</string>
+ <string name="add_associated_device_title">सहयोगी डिव्हाइस कनेक्ट करा</string>
+ <string name="add_associated_device_instruction">ड्रायव्हिंगचा अनुभव व्यवस्थापित करण्यात मदत करण्यासाठी तुमचा फोन सहयोगी डिव्हाइस म्हणून वापरू शकता</string>
+ <string name="associated_device_install_app">तुमच्या फोनवर <b>Companion अ‍ॅप</b> इंस्टॉल्ड असल्याची खात्री करा</string>
+ <string name="associated_device_pairing_code_title">फोनवरील कोडची खात्री करा</string>
+ <string name="associated_device_pairing_message">तुमच्या फोनवर दाखवलेल्या कोडशी हा जुळत असल्याची खात्री करा</string>
+ <string name="associated_device_success">डिव्हाइस यशस्वीरीत्या जोडले</string>
+ <string name="associated_device_select_device">ॲप उघडा आणि &lt;b&gt;%1$s&lt;/b&gt; सह कनेक्ट करा</string>
+ <string name="associated_device_open_app">ॲप उघडा आणि त्यामधील सूचना फॉलो करा</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; विसरायचे का?</string>
+ <string name="remove_associated_device_message">ही कार यापुढे या डिव्हाइससह पेअर केली जाणार नाही. तुम्हाला याव्यतिरिक्त Companion अ‍ॅप मधून ही कार काढून टाकणे आवश्यक आहे.</string>
+ <string name="device_removed_success_toast_text">%1$s विसरण्यात आला आहे</string>
+ <string name="device_removed_failure_toast_text">%1$s विसरता आले नाही</string>
+ <string name="continue_setup_toast_text">तुमचा फोन सेट करणे पुढे सुरू ठेवा</string>
+ <string name="error_screen_title">काहीतरी चूक झाली</string>
+ <string name="error_screen_message">दुर्दैवाने, ही स्क्रीन योग्यप्रकारे डिस्प्ले होऊ शकली नाही. कृपया पुन्हा प्रयत्न करा.</string>
+ <string name="turn_on_bluetooth_title">ब्लूटूथ सुरू करा</string>
+ <string name="turn_on_bluetooth_message">तुमचा फोन सहयोगी डिव्हाइस म्हणून सेट करण्यासाठी, तुमच्या कारला ब्लूटूथ आवश्यक आहे.</string>
+ <string name="turn_on_bluetooth_dialog_title">ब्लूटूथ सुरू करायचे का?</string>
+ <string name="turn_on_bluetooth_dialog_message">तुमच्या सहयोगी डिव्हाइससह कनेक्ट करण्यासाठी तुमच्या कारला ब्लूटूथ आवश्यक आहे.</string>
+ <string name="accept">स्वीकारा</string>
+ <string name="reject">नकार द्या</string>
+ <string name="confirm">निश्चित करा</string>
+ <string name="cancel">रद्द करा</string>
+ <string name="remove">काढून टाका</string>
+ <string name="ok">ओके</string>
+ <string name="connection">कनेक्शन</string>
+ <string name="forget_title">हे डिव्हाइस विसरा</string>
+ <string name="forget">विसरा</string>
+ <string name="disable">बंद करा</string>
+ <string name="enable">सुरू करा</string>
+ <string name="continue_button">पुढे सुरू ठेवा</string>
+ <string name="retry">पुन्हा प्रयत्न करा</string>
+ <string name="turn_on">सुरू करा</string>
+ <string name="not_now">आता नको</string>
+ <string name="connected">कनेक्ट केले आहे</string>
+ <string name="notDetected">आढळले नाही</string>
+ <string name="disconnected">डिस्कनेक्ट केले आहे</string>
+ <string name="unknown">अज्ञात</string>
+ <string name="app_running_msg_channel_name">फोनवर एसएमएस सेवा रन होत आहे</string>
+ <string name="app_running_msg_notification_title">फोनवर एसएमएस सेवा अ‍ॅक्टिव्ह आहे</string>
+ <string name="app_running_msg_notification_content">सहयोगी डिव्हाइसद्वारे एसएमएस मिळवत आहे</string>
+ <string name="trusted_device_feature_title">फोन वापरून प्रोफाइल अनलॉक करा</string>
+ <string name="trusted_device_feature_instruction">अनलॉक करण्याचे पर्याय सेट करण्यासाठी तुमचे Companion अ‍ॅप तपासा</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; ला माझी प्रोफाइल अनलॉक करू द्या</string>
+ <string name="device_not_connected_dialog_title">तुमचा फोन सक्रियपणे कनेक्ट केलेला असणे आवश्यक आहे</string>
+ <string name="device_not_connected_dialog_message">हे वैशिष्ट्य सुरू करण्यासाठी तुमच्या कार आणि फोनमधील ब्लूटूथ सुरू असल्याची आणि ते एकमेकांच्या जवळ असल्याची खात्री करा</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; आता तुमची प्रोफाइल अनलॉक करू शकते</string>
+ <string name="create_profile_lock_dialog_title">प्राथमिक प्रोफाइल लॉक तयार करा</string>
+ <string name="create_profile_lock_dialog_message">तुमची प्रोफाइल अनलॉक करण्यासाठी तुमचा फोन वापरण्याकरिता बॅकअप म्हणून प्राथमिक प्रोफाइल लॉक आवश्यक आहे</string>
+ <string name="unlock_profile_to_finish_title">पूर्ण करण्यासाठी तुमची प्रोफाइल अनलॉक करा</string>
+ <string name="unlock_profile_to_finish_message">तुम्ही नवीन प्रोफाइल लॉक तयार केले आहे. यानंतर, तुमचा फोन आपोआप तुमची प्रोफाइल अनलॉक करू शकतो याची खात्री करण्यासाठी तो पुन्हा एंटर करा</string>
+ <string name="disable_device_connection_text">हे डिव्हाइस डिस्कनेक्ट करा</string>
+ <string name="enable_device_connection_text">हे डिव्हाइस पुन्हा कनेक्ट करा</string>
+ <string name="trusted_device_notification_channel_name">फोन वापरून अनलॉक करा</string>
+ <string name="trusted_device_notification_title">तुमच्या फोनला तुमची प्रोफाइल अनलॉक करू द्या</string>
+ <string name="trusted_device_notification_content">या वैशिष्ट्याला परवानगी देण्यासाठी येथे टॅप करा</string>
+ <string name="trusted_device_enrollment_error_dialog_title">काहीतरी चूक झाली</string>
+ <string name="trusted_device_enrollment_error_dialog_message">दुर्दैवाने, हे वैशिष्ट्य यावेळी सुरू करता आले नाही. कृपया पुन्हा प्रयत्न करा.</string>
+ <string name="create_phone_lock_dialog_title">तुमच्या फोनवर स्क्रीन लॉक तयार करा</string>
+ <string name="create_phone_lock_dialog_message">तुमच्या फोनवर स्क्रीन लॉक सेट केलेले नाही. तुमचा फोन वापरून तुमची कार प्रोफाइल अनलॉक करण्यासाठी सर्वप्रथम फोनच्या सेटिंग्जमध्ये स्क्रीन लॉक (पासकोड म्हणूनदेखील ओळखले जाते) तयार करा.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">नवीन मेसेज</item>
+ <item quantity="other">%d नवीन मेसेज</item>
+ </plurals>
+ <string name="name_not_available">नाव उपलब्ध नाही</string>
</resources>
diff --git a/companiondevice/res/values-ms/strings.xml b/companiondevice/res/values-ms/strings.xml
index 6d11edd..d6421f7 100644
--- a/companiondevice/res/values-ms/strings.xml
+++ b/companiondevice/res/values-ms/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Peranti Dikaitkan"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Tambah Peranti Dikaitkan"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Sambungkan peranti rakan"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Anda boleh menggunakan telefon anda sebagai peranti rakan untuk mengurus pengalaman memandu anda."</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Pastikan anda telah memasang "<b>"Apl Rakan"</b>" pada telefon anda"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Sahkan kod pada telefon"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Sahkan kod ini sepadan dengan kod yang dipaparkan pada telefon anda"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Peranti telah berjaya dikaitkan"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Buka apl dan sambung kepada &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Buka apl dan ikut arahan dalam apl itu"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Lupakan &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Kereta ini tidak akan digadingkan dengan peranti ini lagi. Selain itu, anda perlu mengalih keluar kereta ini daripada apl Rakan."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> dilupakan"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Gagal melupakan <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Teruskan penyediaan pada telefon anda"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Kesilapan telah berlaku"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Malangnya, skrin ini tidak dapat dipaparkan dengan betul. Sila cuba lagi."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Hidupkan Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Untuk menyediakan telefon anda sebagai peranti rakan, kereta anda memerlukan Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Hidupkan Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Untuk bersambung dengan peranti rakan anda, kereta anda memerlukan Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Terima"</string>
- <string name="reject" msgid="4315432282758892890">"Tolak"</string>
- <string name="confirm" msgid="3748997214719276945">"Sahkan"</string>
- <string name="cancel" msgid="4306609731174629323">"Batal"</string>
- <string name="remove" msgid="5513398257088729188">"Alih keluar"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Sambungan"</string>
- <string name="forget_title" msgid="3027608547243824729">"Lupakan peranti ini"</string>
- <string name="forget" msgid="2069897665699141222">"Lupakan"</string>
- <string name="disable" msgid="4619854429066283970">"Lumpuhkan"</string>
- <string name="enable" msgid="7656386199154111316">"Dayakan"</string>
- <string name="continue_button" msgid="2748318968566159950">"Teruskan"</string>
- <string name="retry" msgid="3783419451480721367">"Cuba lagi"</string>
- <string name="turn_on" msgid="4288754850470994812">"Hidupkan"</string>
- <string name="not_now" msgid="8764692269093707622">"Bukan sekarang"</string>
- <string name="connected" msgid="8051190714042020471">"Disambungkan"</string>
- <string name="notDetected" msgid="4115229772085594506">"Tidak dikesan"</string>
- <string name="disconnected" msgid="8526513868622591894">"Diputuskan sambungan"</string>
- <string name="unknown" msgid="555736316465118024">"Tidak diketahui"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Perkhidmatan mesej teks telefon sedang berjalan"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Perkhidmatan pemesejan teks telefon aktif"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Menerima mesej teks melalui peranti rakan"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Buka kunci profil dengan telefon"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Semak Apl Rakan anda untuk menetapkan pilihan membuka kunci"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Benarkan &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; membuka kunci profil saya"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefon anda mestilah disambungkan secara aktif"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Untuk menghidupkan ciri ini, pastikan kereta dan telefon anda telah menghidupkan bluetooth serta terletak berdekatan antara satu sama lain"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; kini boleh membuka kunci profil anda"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Buat kunci profil utama"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Anda memerlukan kunci profil utama sebagai sandaran untuk membuka kunci profil menggunakan telefon anda."</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Buka kunci profil anda untuk menyelesaikan proses"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Anda telah membuat kunci profil baharu. Seterusnya, masukkan sekali lagi untuk mengesahkan telefon anda boleh membuka kunci profil secara automatik"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Putuskan sambungan peranti ini"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Sambungkan semula peranti ini"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Buka kunci dengan telefon"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Benarkan telefon anda membuka kunci profil anda"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Ketik di sini untuk membenarkan ciri ini"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Kesilapan telah berlaku"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Malangnya, ciri ini tidak dapat dihidupkan pada masa ini. Sila cuba lagi."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Buat kunci skrin pada telefon anda"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Telefon anda tidak menetapkan kunci skrin. Untuk membuka kunci profil kereta menggunakan telefon anda, buat kunci skrin dahulu (juga dikenali sebagai kod laluan) dalam tetapan telefon anda."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Peranti Dikaitkan</string>
+ <string name="add_device_title">Tambah Peranti Dikaitkan</string>
+ <string name="add_associated_device_title">Sambungkan peranti rakan</string>
+ <string name="add_associated_device_instruction">Anda boleh menggunakan telefon anda sebagai peranti rakan untuk mengurus pengalaman memandu anda.</string>
+ <string name="associated_device_install_app">Pastikan anda telah memasang <b>Apl Rakan</b> pada telefon anda</string>
+ <string name="associated_device_pairing_code_title">Sahkan kod pada telefon</string>
+ <string name="associated_device_pairing_message">Sahkan kod ini sepadan dengan kod yang dipaparkan pada telefon anda</string>
+ <string name="associated_device_success">Peranti telah berjaya dikaitkan</string>
+ <string name="associated_device_select_device">Buka apl dan sambung ke &lt;b&gt;%1$s&lt;b&gt;</string>
+ <string name="associated_device_open_app">Buka apl dan ikut arahan dalam apl itu</string>
+ <string name="remove_associated_device_title">Lupakan &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Kereta ini tidak akan digandingkan dengan peranti ini lagi. Selain itu, anda perlu mengalih keluar kereta ini daripada apl Rakan.</string>
+ <string name="device_removed_success_toast_text">%1$s dilupakan</string>
+ <string name="device_removed_failure_toast_text">Gagal melupakan %1$s</string>
+ <string name="continue_setup_toast_text">Teruskan penyediaan pada telefon anda</string>
+ <string name="error_screen_title">Ralat telah berlaku</string>
+ <string name="error_screen_message">Malangnya, skrin ini tidak dapat dipaparkan dengan betul. Sila cuba lagi.</string>
+ <string name="turn_on_bluetooth_title">Hidupkan Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Untuk menyediakan telefon anda sebagai peranti rakan, kereta anda memerlukan Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Hidupkan Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Untuk bersambung dengan peranti rakan anda, kereta anda memerlukan Bluetooth.</string>
+ <string name="accept">Terima</string>
+ <string name="reject">Tolak</string>
+ <string name="confirm">Sahkan</string>
+ <string name="cancel">Batal</string>
+ <string name="remove">Alih keluar</string>
+ <string name="ok">OK</string>
+ <string name="connection">Sambungan</string>
+ <string name="forget_title">Lupakan peranti ini</string>
+ <string name="forget">Lupakan</string>
+ <string name="disable">Lumpuhkan</string>
+ <string name="enable">Dayakan</string>
+ <string name="continue_button">Teruskan</string>
+ <string name="retry">Cuba lagi</string>
+ <string name="turn_on">Hidupkan</string>
+ <string name="not_now">Bukan sekarang</string>
+ <string name="connected">Disambungkan</string>
+ <string name="notDetected">Tidak dikesan</string>
+ <string name="disconnected">Terputus</string>
+ <string name="unknown">Tidak diketahui</string>
+ <string name="app_running_msg_channel_name">Perkhidmatan mesej teks telefon sedang berjalan</string>
+ <string name="app_running_msg_notification_title">Perkhidmatan pemesejan teks telefon aktif</string>
+ <string name="app_running_msg_notification_content">Menerima mesej teks melalui peranti rakan</string>
+ <string name="trusted_device_feature_title">Buka kunci profil dengan telefon</string>
+ <string name="trusted_device_feature_instruction">Semak Apl Rakan anda untuk menetapkan pilihan membuka kunci</string>
+ <string name="trusted_device_item_title">Benarkan &lt;b&gt;%1$s&lt;/b&gt; membuka kunci profil saya</string>
+ <string name="device_not_connected_dialog_title">Telefon anda mestilah disambungkan secara aktif</string>
+ <string name="device_not_connected_dialog_message">Untuk menghidupkan ciri ini, pastikan kereta dan telefon anda telah menghidupkan bluetooth serta terletak berdekatan antara satu sama lain</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; boleh membuka kunci profil anda sekarang</string>
+ <string name="create_profile_lock_dialog_title">Buat kunci profil utama</string>
+ <string name="create_profile_lock_dialog_message">Anda memerlukan kunci profil utama sebagai sandaran untuk membuka kunci profil menggunakan telefon anda.</string>
+ <string name="unlock_profile_to_finish_title">Buka kunci profil anda untuk menyelesaikan proses</string>
+ <string name="unlock_profile_to_finish_message">Anda telah membuat kunci profil baharu. Seterusnya, masukkan sekali lagi untuk mengesahkan telefon anda boleh membuka kunci profil secara automatik</string>
+ <string name="disable_device_connection_text">Putuskan sambungan peranti ini</string>
+ <string name="enable_device_connection_text">Sambungkan semula peranti ini</string>
+ <string name="trusted_device_notification_channel_name">Buka kunci dengan telefon</string>
+ <string name="trusted_device_notification_title">Benarkan telefon anda membuka kunci profil anda</string>
+ <string name="trusted_device_notification_content">Ketik di sini untuk membenarkan ciri ini</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Ralat telah berlaku</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Malangnya, ciri ini tidak dapat dihidupkan pada masa ini. Sila cuba lagi.</string>
+ <string name="create_phone_lock_dialog_title">Buat kunci skrin pada telefon anda</string>
+ <string name="create_phone_lock_dialog_message">Telefon anda tidak menetapkan kunci skrin. Untuk membuka kunci profil kereta menggunakan telefon anda, buat kunci skrin dahulu (juga dikenali sebagai kod laluan) dalam tetapan telefon anda.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Mesej baharu</item>
+ <item quantity="other">%d mesej baharu</item>
+ </plurals>
+ <string name="name_not_available">Nama tidak tersedia</string>
</resources>
diff --git a/companiondevice/res/values-my/strings.xml b/companiondevice/res/values-my/strings.xml
index fedeb29..bd48e86 100644
--- a/companiondevice/res/values-my/strings.xml
+++ b/companiondevice/res/values-my/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"ဆက်စပ် စက်ပစ္စည်း"</string>
- <string name="add_device_title" msgid="6166003577845888151">"ဆက်စပ်နေသော စက်ပစ္စည်း ထည့်ရန်"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"တွဲဖက်စက်ပစ္စည်းတစ်ခု ချိတ်ခြင်း"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"ယာဉ်မောင်းခြင်းကို စီမံရာတွင် အထောက်အကူဖြစ်စေရန် သင့်ဖုန်းကို တွဲဖက်စက်ပစ္စည်းအဖြစ် သုံးနိုင်သည်"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"သင့်ဖုန်းထဲတွင် "<b>"တွဲဖက်အက်ပ်"</b>" ကို ထည့်သွင်းထားရပါမည်"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"ဖုန်းပေါ်တွင် ကုဒ်ကို အတည်ပြုခြင်း"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"ဤကုဒ်သည် သင့်ဖုန်းပေါ်တွင် ပေါ်သည့်ကုဒ်နှင့် တူညီကြောင်း အတည်ပြုပါ"</string>
- <string name="associated_device_success" msgid="584760065696870256">"စက်ကို ချိတ်ဆက်ပြီးပါပြီ"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"အက်ပ်ကိုဖွင့်ပြီး &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; သို့ ချိတ်ပါ"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"အက်ပ်ဖွင့်ပြီး လမ်းညွှန်အတိုင်းလုပ်ပါ"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; ကို မေ့မလား။"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"ဤကားကို ဤစက်ဖြင့် တွဲချိတ်ထားတော့မည် မဟုတ်ပါ။ ဤကားကို \'တွဲဖက်အက်ပ်\' မှနေ၍ ထပ်မံဖယ်ရှားရန် လိုအပ်ပါမည်။"</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> ကို မေ့လိုက်ပါပြီ"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> ကို မေ့ပစ်၍မရပါ"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"သင်၏ဖုန်းတွင် ဆက်လက်၍ စနစ်ထည့်သွင်းပါ"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"တစ်ခုခု မှားသွားသည်"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"ဝမ်းနည်းပါသည်၊ ဤမျက်နှာပြင်ကို မှန်ကန်စွာ ပြသ၍မရပါ။ ထပ်စမ်းကြည့်ပါ။"</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"ဘလူးတုသ်ဖွင့်ခြင်း"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"သင့်ဖုန်းကို တွဲဖက်စက်အဖြစ် စနစ်ထည့်သွင်းရန် သင့်ကားတွင် ဘလူးတုသ်လိုအပ်သည်။"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"ဘလူးတုသ် ဖွင့်ရမလား။"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"သင့်တွဲ‌ဖက်စက်သို့ ချိတ်ရန် သင့်ကားတွင် ဘလူးတုသ်လိုအပ်သည်။"</string>
- <string name="accept" msgid="1454710793329618813">"လက်ခံရန်"</string>
- <string name="reject" msgid="4315432282758892890">"ပယ်ရန်"</string>
- <string name="confirm" msgid="3748997214719276945">"အတည်ပြုရန်"</string>
- <string name="cancel" msgid="4306609731174629323">"မလုပ်တော့"</string>
- <string name="remove" msgid="5513398257088729188">"ဖယ်ရှားရန်"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"ချိတ်ဆက်မှု"</string>
- <string name="forget_title" msgid="3027608547243824729">"ဤစက်ပစ္စည်းကို မေ့ပစ်ရန်"</string>
- <string name="forget" msgid="2069897665699141222">"မေ့ပစ်ရန်"</string>
- <string name="disable" msgid="4619854429066283970">"ပိတ်ရန်"</string>
- <string name="enable" msgid="7656386199154111316">"ဖွင့်ရန်"</string>
- <string name="continue_button" msgid="2748318968566159950">"ရှေ့ဆက်ရန်"</string>
- <string name="retry" msgid="3783419451480721367">"ထပ်လုပ်ရန်"</string>
- <string name="turn_on" msgid="4288754850470994812">"ဖွင့်ရန်"</string>
- <string name="not_now" msgid="8764692269093707622">"ယခုမလုပ်ပါ"</string>
- <string name="connected" msgid="8051190714042020471">"ချိတ်ဆက်ထားသည်"</string>
- <string name="notDetected" msgid="4115229772085594506">"ရှာမတွေ့ပါ"</string>
- <string name="disconnected" msgid="8526513868622591894">"ချိတ်ဆက်မထားပါ"</string>
- <string name="unknown" msgid="555736316465118024">"အမျိုးအမည်မသိ"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"ဖုန်း၏ မိုဘိုင်းမက်ဆေ့ဂျ်ဝန်ဆောင်မှု ဖွင့်ထားသည်"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"ဖုန်း၏ မိုဘိုင်းမက်ဆေ့ဂျ်ဝန်ဆောင်မှု ဖွင့်ထားသည်"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"တွဲဖက်စက်မှတစ်ဆင့် မိုဘိုင်းမက်ဆေ့ဂျ်များ ရယူနေသည်"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"ဖုန်းဖြင့် ပရိုဖိုင်ကို လော့ခ်ဖွင့်ခြင်း"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"လောခ့်ဖွင့်ခြင်းနည်းလမ်းများ သတ်မှတ်ရန် သင့် \'တွဲဖက်အက်ပ်\' ကို စစ်ဆေးပါ"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"သင့်ပရိုဖိုင်ကို &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; အား လော့ခ်ဖွင့်ခွင့်ပြုခြင်း"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"သင့်ဖုန်းကို ချိတ်ဆက်ထားရပါမည်"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"ဤလုပ်ဆောင်ချက်ကို ဖွင့်ရန် သင့်ကားနှင့် ဖုန်းတွင် ဘလူးတုသ်ဖွင့်ထားပြီး တစ်ခုနှင့်တစ်ခု အနီး၌ရှိနေရပါမည်"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"ယခုအခါ &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; သည် သင့်ပရိုဖိုင်ကို လောခ့်ဖွင့်နိုင်ပါပြီ"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"ပင်မပရိုဖိုင်လော့ခ် သတ်မှတ်ခြင်း"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"သင့်ဖုန်းဖြင့် သင့်ပရိုဖိုင်ကို လော့ခ်ဖွင့်ရန်အတွက် ပင်မပရိုဖိုင်လော့ခ်ကို အရန်အဖြစ်ထားရန် လိုအပ်နိုင်ပါသည်"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"အပြီးသတ်ရန် သင့်ပရိုဖိုင်ကို လော့ခ်ဖွင့်ခြင်း"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"သင်သည် ပရိုဖိုင်လော့ခ်အသစ် သတ်မှတ်ထားသည်။ နောက်တစ်ဆင့်တွင် သင့်ဖုန်းသည် ပရိုဖိုင်ကို အလိုအလျောက်‌လော့ခ်ဖွင့်နိုင်ကြောင်း အတည်ပြုရန် ၎င်းကို ထပ်ထည့်ပါ"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"ဤစက်ကို ချိတ်ဆက်မှုဖြုတ်ရန်"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"ဤစက်ကို ပြန်ချိတ်ရန်"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"ဖုန်းဖြင့် လော့ခ်ဖွင့်ရန်"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"သင့်ပရိုဖိုင်ကို သင့်ဖုန်းအား ဖွင့်ခွင့်ပြုခြင်း"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"ဤလုပ်ဆောင်ချက်ကို ခွင့်ပြုရန် ဤနေရာတွင် တို့ပါ"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"တစ်ခုခု မှားသွားသည်"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"ဝမ်းနည်းပါသည်၊ ဤလုပ်ဆောင်ချက်ကို လောလောဆယ်ဖွင့်၍မရပါ။ ထပ်စမ်းကြည့်ပါ။"</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"သင့်ဖုန်းပေါ်တွင် မျက်နှာပြင်လော့ခ် သတ်မှတ်ခြင်း"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"သင့်ဖုန်းတွင် မျက်နှာ့ပြင်လော့ခ်မရှိသေးပါ။ ကားပရိုဖိုင်ကို သင့်ဖုန်းဖြင့် လောခ့်ဖွင့်ရန် သင့်ဖုန်းဆက်တင်များတွင် မျက်နှာပြင်လော့ခ် (လျှို့ဝှက်ကုဒ်ဟုလည်း ခေါ်သည်) ဦးစွာ သတ်မှတ်ပါ။"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">တွဲဖက်စက်ပစ္စည်း</string>
+ <string name="add_device_title">တွဲဖက်စက်ပစ္စည်းကို ထည့်ရန်</string>
+ <string name="add_associated_device_title">တွဲဖက်စက်ပစ္စည်းကို ချိတ်ဆက်ခြင်း</string>
+ <string name="add_associated_device_instruction">ယာဉ်မောင်းခြင်းကို စီမံရာတွင် အထောက်အကူဖြစ်စေရန် သင့်ဖုန်းကို တွဲဖက်စက်ပစ္စည်းအဖြစ် သုံးနိုင်သည်</string>
+ <string name="associated_device_install_app">သင့်ဖုန်းတွင် <b>တွဲဖက်အက်ပ်</b> ကို ထည့်သွင်းထားကြောင်း သေချာပါစေ</string>
+ <string name="associated_device_pairing_code_title">ဖုန်းတွင် ကုဒ်ကိုအတည်ပြုပါ</string>
+ <string name="associated_device_pairing_message">ဤကုဒ်သည် သင့်ဖုန်းတွင်ပြသည့်ကုဒ်နှင့် တူညီကြောင်း အတည်ပြုပါ</string>
+ <string name="associated_device_success">စက်ကို တွဲချိတ်ပြီးပါပြီ</string>
+ <string name="associated_device_select_device">အက်ပ်ကိုဖွင့်ပြီး &lt;b&gt;%1$s&lt;/b&gt; သို့ ချိတ်ဆက်ပါ</string>
+ <string name="associated_device_open_app">အက်ပ်ကိုဖွင့်ပြီး အက်ပ်ထဲရှိလမ်းညွှန်များအတိုင်း လုပ်ဆောင်ပါ</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; ကို မေ့ပစ်မလား။</string>
+ <string name="remove_associated_device_message">ဤကားကို ဤစက်ဖြင့် တွဲချိတ်ထားတော့မည် မဟုတ်ပါ။ ဤကားကို \'တွဲဖက်အက်ပ်\' မှနေ၍ ထပ်မံဖယ်ရှားရန် လိုအပ်ပါမည်။</string>
+ <string name="device_removed_success_toast_text">%1$s ကို မေ့လိုက်ပါပြီ</string>
+ <string name="device_removed_failure_toast_text">%1$s ကို မေ့ပစ်၍မရပါ</string>
+ <string name="continue_setup_toast_text">သင်၏ဖုန်းတွင် ဆက်လက်၍ စနစ်ထည့်သွင်းပါ</string>
+ <string name="error_screen_title">တစ်ခုခု မှားသွားပါသည်</string>
+ <string name="error_screen_message">ဝမ်းနည်းပါသည်၊ ဤစခရင်ကို မှန်ကန်စွာ ပြသ၍မရပါ။ ထပ်စမ်းကြည့်ပါ။</string>
+ <string name="turn_on_bluetooth_title">ဘလူးတုသ် ဖွင့်ပါ</string>
+ <string name="turn_on_bluetooth_message">သင်၏ဖုန်းကို တွဲဖက်စက်ပစ္စည်းအဖြစ် စနစ်ထည့်သွင်းရန် သင့်ကားတွင် ဘလူးတုသ်လိုအပ်သည်။</string>
+ <string name="turn_on_bluetooth_dialog_title">ဘလူးတုသ် ဖွင့်မလား။</string>
+ <string name="turn_on_bluetooth_dialog_message">သင်၏တွဲဖက်စက်ပစ္စည်းသို့ ချိတ်ဆက်ရန် သင့်ကားတွင် ဘလူးတုသ်လိုအပ်သည်။</string>
+ <string name="accept">လက်ခံရန်</string>
+ <string name="reject">ပယ်ရန်</string>
+ <string name="confirm">အတည်ပြုရန်</string>
+ <string name="cancel">မလုပ်တော့</string>
+ <string name="remove">ဖယ်ရှားရန်</string>
+ <string name="ok">OK</string>
+ <string name="connection">ချိတ်ဆက်မှု</string>
+ <string name="forget_title">ဤစက်ပစ္စည်းကို မေ့ပစ်ရန်</string>
+ <string name="forget">မေ့ပစ်ရန်</string>
+ <string name="disable">ပိတ်ရန်</string>
+ <string name="enable">ဖွင့်ရန်</string>
+ <string name="continue_button">ရှေ့ဆက်ရန်</string>
+ <string name="retry">ထပ်စမ်းကြည့်ရန်</string>
+ <string name="turn_on">ဖွင့်ရန်</string>
+ <string name="not_now">ယခုမလုပ်ပါ</string>
+ <string name="connected">ချိတ်ဆက်ထားသည်</string>
+ <string name="notDetected">ရှာမတွေ့ပါ</string>
+ <string name="disconnected">ချိတ်ဆက်မှု မရှိပါ</string>
+ <string name="unknown">အမည်မသိ</string>
+ <string name="app_running_msg_channel_name">ဖုန်း၏ မိုဘိုင်းမက်ဆေ့ဂျ်ဝန်ဆောင်မှု ဖွင့်ထားသည်</string>
+ <string name="app_running_msg_notification_title">ဖုန်း၏ မိုဘိုင်းမက်ဆေ့ဂျ်ဝန်ဆောင်မှု ဖွင့်ထားသည်</string>
+ <string name="app_running_msg_notification_content">တွဲဖက်စက်ပစ္စည်းမှတစ်ဆင့် မိုဘိုင်းမက်ဆေ့ဂျ်များ ရယူနေသည်</string>
+ <string name="trusted_device_feature_title">ဖုန်းဖြင့် ပရိုဖိုင်ကိုလော့ခ်ဖွင့်ခြင်း</string>
+ <string name="trusted_device_feature_instruction">လောခ့်ဖွင့်သည့်နည်းလမ်းများ သတ်မှတ်ရန် သင့် \'တွဲဖက်အက်ပ်\' ကို စစ်ဆေးပါ</string>
+ <string name="trusted_device_item_title">ကျွန်ုပ်၏ပရိုဖိုင်ကို လော့ခ်ဖွင့်ရန် &lt;b&gt;%1$s&lt;/b&gt; ကို ခွင့်ပြုခြင်း</string>
+ <string name="device_not_connected_dialog_title">လက်ရှိတွင် သင့်ဖုန်းကို ချိတ်ဆက်ထားရပါမည်</string>
+ <string name="device_not_connected_dialog_message">ဤဝန်ဆောင်မှုကိုဖွင့်ရန် သင့်ကားနှင့် ဖုန်းတွင် ဘလူးတုသ်ဖွင့်ထားပြီး ၎င်းတို့တစ်ခုနှင့်တစ်ခု အနီးတွင်ရှိကြောင်း သေချာပါစေ</string>
+ <string name="trusted_device_enrollment_success_message">ယခုအခါ &lt;b&gt;%1$s&lt;/b&gt; သည် သင့်ပရိုဖိုင်ကို လောခ့်ဖွင့်နိုင်ပါပြီ</string>
+ <string name="create_profile_lock_dialog_title">ပင်မပရိုဖိုင်လော့ခ် သတ်မှတ်ခြင်း</string>
+ <string name="create_profile_lock_dialog_message">သင်၏ဖုန်းဖြင့် သင့်ပရိုဖိုင်ကို လော့ခ်ဖွင့်ရန်အတွက် ပင်မပရိုဖိုင်လော့ခ်ကို အရန်အဖြစ်ထားရန် လိုအပ်နိုင်ပါသည်</string>
+ <string name="unlock_profile_to_finish_title">အပြီးသတ်ရန် သင့်ပရိုဖိုင်ကို လော့ခ်ဖွင့်ပါ</string>
+ <string name="unlock_profile_to_finish_message">ပရိုဖိုင်လော့ခ်အသစ်ကို သင်သတ်မှတ်လိုက်ပါပြီ။ ထို့နောက် သင်၏ဖုန်းဖြင့် သင့်ပရိုဖိုင်ကို အလိုအလျောက်လော့ခ်ဖွင့်နိုင်ကြောင်း အတည်ပြုရန် ၎င်းကိုထပ်ထည့်ပါ</string>
+ <string name="disable_device_connection_text">ဤစက်ကို ချိတ်ဆက်မှုဖြုတ်ရန်</string>
+ <string name="enable_device_connection_text">ဤစက်ကို ပြန်ချိတ်ဆက်ရန်</string>
+ <string name="trusted_device_notification_channel_name">ဖုန်းဖြင့် လော့ခ်ဖွင့်ရန်</string>
+ <string name="trusted_device_notification_title">သင့်ပရိုဖိုင်ကို လော့ခ်ဖွင့်ရန် သင်၏ဖုန်းကို ခွင့်ပြုခြင်း</string>
+ <string name="trusted_device_notification_content">ဤဝန်ဆောင်မှုကို ခွင့်ပြုရန် ဤနေရာတွင်တို့ပါ</string>
+ <string name="trusted_device_enrollment_error_dialog_title">တစ်ခုခု မှားသွားပါသည်</string>
+ <string name="trusted_device_enrollment_error_dialog_message">ဝမ်းနည်းပါသည်၊ ဤဝန်ဆောင်မှုကို လောလောဆယ်ဖွင့်၍မရပါ။ ထပ်စမ်းကြည့်ပါ။</string>
+ <string name="create_phone_lock_dialog_title">သင့်ဖုန်းတွင် ဖန်သားပြင်လော့ခ် သတ်မှတ်ခြင်း</string>
+ <string name="create_phone_lock_dialog_message">သင့်ဖုန်းတွင် ဖန်သားပြင်လော့ခ် မသတ်မှတ်ရသေးပါ။ ကားပရိုဖိုင်ကို သင့်ဖုန်းဖြင့်လောခ့်ဖွင့်ရန် ဖုန်း၏ဆက်တင်များတွင် ဖန်သားပြင်လော့ခ် (လျှို့ဝှက်ကုဒ်ဟုလည်း ခေါ်သည်) ဦးစွာ သတ်မှတ်ပါ။</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">မက်ဆေ့ဂျ်အသစ်</item>
+ <item quantity="other">မက်ဆေ့ဂျ်အသစ် %d စောင်</item>
+ </plurals>
+ <string name="name_not_available">အမည် မရနိုင်ပါ</string>
</resources>
diff --git a/companiondevice/res/values-nb/strings.xml b/companiondevice/res/values-nb/strings.xml
index 6bea480..b08a7ea 100644
--- a/companiondevice/res/values-nb/strings.xml
+++ b/companiondevice/res/values-nb/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Tilknyttet enhet"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Legg til en tilknyttet enhet"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Koble til en følgeenhet"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Du kan bruke telefonen som en følgeenhet som hjelper deg når du kjører"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Pass på at du har installert "<b>"følgeappen"</b>" på telefonen"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Bekreft koden på telefonen"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Sjekk at den er lik koden som vises på telefonen"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Enheten er tilknyttet"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Åpne appen, og koble til &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Åpne appen og følg veiledningen der"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Vil du glemme &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Denne bilen kommer ikke lenger til å være koblet sammen med denne enheten. Du må også fjerne bilen fra følgeappen."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> er glemt"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Kunne ikke glemme <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Fortsett konfigureringen på telefonen din"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Noe gikk galt"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Denne skjermen kunne dessverre ikke vises skikkelig. Prøv på nytt."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Slå på Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Bilen må ha Bluetooth for at du skal kunne konfigurere telefonen som følgeenhet."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Vil du slå på Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Bilen må ha Bluetooth for at du skal kunne koble til følgeenheten."</string>
- <string name="accept" msgid="1454710793329618813">"Godta"</string>
- <string name="reject" msgid="4315432282758892890">"Avvis"</string>
- <string name="confirm" msgid="3748997214719276945">"Bekreft"</string>
- <string name="cancel" msgid="4306609731174629323">"Avbryt"</string>
- <string name="remove" msgid="5513398257088729188">"Fjern"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Tilkobling"</string>
- <string name="forget_title" msgid="3027608547243824729">"Glem denne enheten"</string>
- <string name="forget" msgid="2069897665699141222">"Glem"</string>
- <string name="disable" msgid="4619854429066283970">"Slå av"</string>
- <string name="enable" msgid="7656386199154111316">"Slå på"</string>
- <string name="continue_button" msgid="2748318968566159950">"Fortsett"</string>
- <string name="retry" msgid="3783419451480721367">"Prøv igjen"</string>
- <string name="turn_on" msgid="4288754850470994812">"Slå på"</string>
- <string name="not_now" msgid="8764692269093707622">"Ikke nå"</string>
- <string name="connected" msgid="8051190714042020471">"Tilkoblet"</string>
- <string name="notDetected" msgid="4115229772085594506">"Ikke oppdaget"</string>
- <string name="disconnected" msgid="8526513868622591894">"Frakoblet"</string>
- <string name="unknown" msgid="555736316465118024">"Ukjent"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Tjenesten for telefon-SMS kjører"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Tjenesten for telefon-SMS er aktiv"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Mottar SMS-er via følgeenhet"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Lås opp profilen med telefonen"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Bruk følgeappen til å angi alternativer for å låse opp profilen"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"La &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; låse opp profilen min"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefonen din må være aktivt tilkoblet"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"For å slå på denne funksjonen må du passe på at Bluetooth er slått på i bilen og på telefonen, og at de er i nærheten av hverandre."</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"Nå kan &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; låse opp profilen din"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Opprett en hovedprofillås"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Du må ha en hovedprofillås som sikkerhet for å kunne bruke telefonen til å låse opp profilen"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Lås opp profilen din for å fullføre"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Du har opprettet en ny profillås. Angi den på nytt for å bekrefte at telefonen kan låse opp profilen din automatisk"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Koble fra denne enheten"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Koble til denne enheten igjen"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Lås opp med telefonen"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"La telefonen låse opp profilen din"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Trykk her for å godkjenne denne funksjonen"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Noe gikk galt"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Denne funksjonen kan dessverre ikke slås på akkurat nå. Prøv på nytt."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Opprett en skjermlås på telefonen"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Telefonen din har ikke skjermlås. Før du kan låse opp bilprofilen med telefonen, må du opprette en skjermlås (også kalt adgangskode) i innstillingene på telefonen."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Tilknyttet enhet</string>
+ <string name="add_device_title">Legg til en tilknyttet enhet</string>
+ <string name="add_associated_device_title">Koble til en følgeenhet</string>
+ <string name="add_associated_device_instruction">Du kan bruke telefonen som en følgeenhet for å få hjelp når du kjører</string>
+ <string name="associated_device_install_app">Pass på at du har installert <b>følgeappen</b> på telefonen</string>
+ <string name="associated_device_pairing_code_title">Bekreft koden på telefonen</string>
+ <string name="associated_device_pairing_message">Sjekk at den er lik koden som vises på telefonen</string>
+ <string name="associated_device_success">Enheten er tilknyttet</string>
+ <string name="associated_device_select_device">Åpne appen og koble til &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Åpne appen og følg veiledningen der</string>
+ <string name="remove_associated_device_title">Vil du glemme &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Denne bilen kommer ikke lenger til å være koblet sammen med denne enheten. Du må også fjerne bilen fra følgeappen.</string>
+ <string name="device_removed_success_toast_text">%1$s er glemt</string>
+ <string name="device_removed_failure_toast_text">Kunne ikke glemme %1$s</string>
+ <string name="continue_setup_toast_text">Fortsett konfigureringen på telefonen din</string>
+ <string name="error_screen_title">Noe gikk galt</string>
+ <string name="error_screen_message">Denne skjermen kunne dessverre ikke vises skikkelig. Prøv igjen.</string>
+ <string name="turn_on_bluetooth_title">Slå på Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Bilen må ha Bluetooth for at du skal kunne konfigurere telefonen som følgeenhet.</string>
+ <string name="turn_on_bluetooth_dialog_title">Vil du slå på Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Bilen må ha Bluetooth for at du skal kunne koble til følgeenheten.</string>
+ <string name="accept">Godta</string>
+ <string name="reject">Avvis</string>
+ <string name="confirm">Bekreft</string>
+ <string name="cancel">Avbryt</string>
+ <string name="remove">Fjern</string>
+ <string name="ok">Ok</string>
+ <string name="connection">Tilkobling</string>
+ <string name="forget_title">Glem denne enheten</string>
+ <string name="forget">Glem</string>
+ <string name="disable">Deaktiver</string>
+ <string name="enable">Aktiver</string>
+ <string name="continue_button">Fortsett</string>
+ <string name="retry">Prøv igjen</string>
+ <string name="turn_on">Slå på</string>
+ <string name="not_now">Ikke nå</string>
+ <string name="connected">Tilkoblet</string>
+ <string name="notDetected">Ikke oppdaget</string>
+ <string name="disconnected">Frakoblet</string>
+ <string name="unknown">Ukjent</string>
+ <string name="app_running_msg_channel_name">Tjenesten for telefon-SMS kjører</string>
+ <string name="app_running_msg_notification_title">Tjenesten for telefon-SMS er aktiv</string>
+ <string name="app_running_msg_notification_content">Mottar SMS-er via følgeenhet</string>
+ <string name="trusted_device_feature_title">Lås opp profilen med telefonen</string>
+ <string name="trusted_device_feature_instruction">Bruk følgeappen til å angi alternativer for å låse opp profilen</string>
+ <string name="trusted_device_item_title">La &lt;b&gt;%1$s&lt;/b&gt; låse opp profilen min</string>
+ <string name="device_not_connected_dialog_title">Telefonen din må være aktivt tilkoblet</string>
+ <string name="device_not_connected_dialog_message">For å slå på denne funksjonen må du passe på at Bluetooth er slått på i bilen og på telefonen, og at de er i nærheten av hverandre.</string>
+ <string name="trusted_device_enrollment_success_message">Nå kan &lt;b&gt;%1$s&lt;/b&gt; låse opp profilen din</string>
+ <string name="create_profile_lock_dialog_title">Opprett en hovedprofillås</string>
+ <string name="create_profile_lock_dialog_message">Du må ha en hovedprofillås som sikkerhet for å kunne bruke telefonen til å låse opp profilen</string>
+ <string name="unlock_profile_to_finish_title">Lås opp profilen din for å fullføre</string>
+ <string name="unlock_profile_to_finish_message">Du har opprettet en ny profillås. Angi den på nytt for å bekrefte at telefonen kan låse opp profilen din automatisk</string>
+ <string name="disable_device_connection_text">Koble fra denne enheten</string>
+ <string name="enable_device_connection_text">Koble til denne enheten igjen</string>
+ <string name="trusted_device_notification_channel_name">Lås opp med telefonen</string>
+ <string name="trusted_device_notification_title">La telefonen låse opp profilen din</string>
+ <string name="trusted_device_notification_content">Trykk her for å godkjenne denne funksjonen</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Noe gikk galt</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Denne funksjonen kan dessverre ikke slås på akkurat nå. Prøv igjen.</string>
+ <string name="create_phone_lock_dialog_title">Opprett en skjermlås på telefonen</string>
+ <string name="create_phone_lock_dialog_message">Telefonen din har ikke skjermlås konfigurert. Før du kan låse opp bilprofilen med telefonen, må du opprette en skjermlås (også kalt adgangskode) i innstillingene på telefonen.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Ny melding</item>
+ <item quantity="other">%d nye meldinger</item>
+ </plurals>
+ <string name="name_not_available">Navnet er ikke tilgjengelig</string>
</resources>
diff --git a/companiondevice/res/values-ne/strings.xml b/companiondevice/res/values-ne/strings.xml
index 0a94ece..157ef6e 100644
--- a/companiondevice/res/values-ne/strings.xml
+++ b/companiondevice/res/values-ne/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"सम्बद्ध यन्त्र"</string>
- <string name="add_device_title" msgid="6166003577845888151">"सम्बद्ध यन्त्र थप्नुहोस्"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"सहयोगी यन्त्र कनेक्ट गर्नुहोस्"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"तपाईं आफ्नो ड्राइभिङ अनुभव व्यवस्थापन गर्न आफ्नो फोनलाई सहयोगी यन्त्रका रूपमा प्रयोग गर्न सक्नुहुन्छ"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"आफ्नो फोनमा "<b>"सहयोगी एप"</b>" इन्स्टल गरिएको छ भन्ने कुरा सुनिश्चित गर्नुहोस्"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"फोनमा देखाइएको कोड पुष्टि गर्नुहोस्"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"यो कोड तपाईंको फोनमा देखाइएको कोडसँग मिल्छ भन्ने कुरा पुष्टि गर्नुहोस्"</string>
- <string name="associated_device_success" msgid="584760065696870256">"यन्त्र सम्बद्ध गर्ने कार्य सफल भएको छ"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"एप खोल्नुहोस् र &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; सँग कनेक्ट गर्नुहोस्"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"एप खोलेर त्यसभित्र दिइएका निर्देशनहरूको पालना गर्नुहोस्"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; हटाउने हो?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"यो कारलाई अब उप्रान्त यस यन्त्रसँग जोडा बनाइने छैन। तपाईंले यो कारलाई सहयोगी एपबाट पनि हटाउनु पर्ने हुन्छ।"</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> हटाइयो"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> हटाउन सकिएन"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"आफ्नो फोनमा सेटअप जारी राख्नुहोस्"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"केही चिज गडबड भयो"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"दुर्भाग्यवश, यो स्क्रिनले राम्ररी देखाउन सकेन। कृपया फेरि प्रयास गर्नुहोस्।"</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"ब्लुटुथ अन गर्नुहोस्"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"फोनलाई सहयोगी यन्त्रका रूपमा सेटअप गर्न तपाईंले आफ्नो कारको ब्लुटुथ अन गर्नु पर्ने हुन्छ।"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"ब्लुटुथ अन गर्ने हो?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"सहयोगी यन्त्रसँग कनेक्ट गर्न तपाईंले आफ्नो कारको ब्लुटुथ अन गर्नु पर्ने हुन्छ।"</string>
- <string name="accept" msgid="1454710793329618813">"स्वीकार गर्नुहोस्"</string>
- <string name="reject" msgid="4315432282758892890">"अस्वीकार गर्नुहोस्"</string>
- <string name="confirm" msgid="3748997214719276945">"पुष्टि गर्नुहोस्"</string>
- <string name="cancel" msgid="4306609731174629323">"रद्द गर्नुहोस्"</string>
- <string name="remove" msgid="5513398257088729188">"हटाउनुहोस्"</string>
- <string name="ok" msgid="2825038997730899083">"ठिक छ"</string>
- <string name="connection" msgid="2798490936433656846">"कनेक्सन"</string>
- <string name="forget_title" msgid="3027608547243824729">"यो यन्त्र हटाउनुहोस्"</string>
- <string name="forget" msgid="2069897665699141222">"हटाउनुहोस्"</string>
- <string name="disable" msgid="4619854429066283970">"असक्षम पार्नुहोस्"</string>
- <string name="enable" msgid="7656386199154111316">"सक्षम पार्नुहोस्"</string>
- <string name="continue_button" msgid="2748318968566159950">"जारी राख्नुहोस्"</string>
- <string name="retry" msgid="3783419451480721367">"फेरि प्रयास गर्नुहोस्"</string>
- <string name="turn_on" msgid="4288754850470994812">"अन गर्नुहोस्"</string>
- <string name="not_now" msgid="8764692269093707622">"अहिले होइन"</string>
- <string name="connected" msgid="8051190714042020471">"कनेक्ट गरियो"</string>
- <string name="notDetected" msgid="4115229772085594506">"पत्ता लागेन"</string>
- <string name="disconnected" msgid="8526513868622591894">"डिस्कनेक्ट गरियो"</string>
- <string name="unknown" msgid="555736316465118024">"अज्ञात"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"फोनबाट पाठ सन्देश पठाउने सेवा चालु छ"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"फोनबाट पाठ सन्देश पठाउने सेवा सक्रिय छ"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"सहयोगी यन्त्रमार्फत टेक्स्ट म्यासेजहरू प्राप्त गरिँदै"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"फोन प्रयोग गरेर प्रोफाइल अनलक गर्नुहोस्"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"अनलक गर्ने विकल्पहरू सेट गर्न आफ्नो सहयोगी एपमा जानुहोस्"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; लाई मेरो प्रोफाइल अनलक गर्न दिनुहोस्"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"तपाईंको फोन सक्रिय रूपमा कनेक्ट भएको हुनु पर्छ"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"यो सुविधा सक्रिय गर्नुअघि तपाईंका कार र फोनमा ब्लुटुथ अन गरिएको छ र ती एकअर्काका नजिक छन् भन्ने कुरा सुनिश्चित गर्नुहोस्"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; ले अब तपाईंको प्रोफाइल अनलक गर्न सक्छ"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"प्राथमिक प्रोफाइल लक सिर्जना गर्नुहोस्"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"फोन प्रयोग गरेर प्रोफाइल अनलक गर्न तपाईंले ब्याकअपका रूपमा प्राथमिक प्रोफाइल लक सिर्जना गर्नु पर्ने हुन्छ"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"यो कार्य सम्पन्न गर्न आफ्नो प्रोफाइल अनलक गर्नुहोस्"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"तपाईंले नयाँ प्रोफाइल लक सिर्जना गर्नुभएको छ। अब, तपाईंको फोनले तपाईंको प्रोफाइल स्वतः अनलक गर्न सक्छ भन्ने कुरा पक्का गर्न प्रोफाइल लक फेरि प्रविष्टि गर्नुहोस्"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"यो यन्त्र डिस्कनेक्ट गर्नुहोस्"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"यो यन्त्र रिकनेक्ट गर्नुहोस्"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"फोन प्रयोग गरेर अनलक गर्नुहोस्"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"तपाईंको फोनलाई प्रोफाइल अनलक गर्ने अनुमति दिनुहोस्"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"यो सुविधा प्रयोग गर्ने अधिकार दिन यहाँ ट्याप गर्नुहोस्"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"केही चिज गडबड भयो"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"दुर्भाग्यवश, यतिबेला यो सुविधा अन गर्न सकिएन। कृपया फेरि प्रयास गर्नुहोस्।"</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"आफ्नो फोनमा स्क्रिन लक सिर्जना गर्नुहोस्"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"तपाईंको फोनमा स्क्रिन लक सेट गरिएको छैन। फोन प्रयोग गरेर आफ्नो कारको प्रोफाइल अनलक गर्न सबैभन्दा पहिले फोनको सेटिङमा गएर स्क्रिन लक (जसलाई पासकोड पनि भनिन्छ) सिर्जना गर्नुहोस्।"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">कनेक्ट गरिएको यन्त्र</string>
+ <string name="add_device_title">कनेक्ट गरिएको यन्त्र हाल्नुहोस्</string>
+ <string name="add_associated_device_title">सहयोगी यन्त्र कनेक्ट गर्नुहोस्</string>
+ <string name="add_associated_device_instruction">तपाईं ड्राइभिङसम्बन्धी सुविधा व्यवस्थापन गर्न आफ्नो फोनलाई सहयोगी यन्त्रका रूपमा प्रयोग गर्न सक्नुहुन्छ</string>
+ <string name="associated_device_install_app">आफ्नो फोनमा <b>सहयोगी एप</b> इन्स्टल गरिएको कुरा सुनिश्चित गर्नुहोस्</string>
+ <string name="associated_device_pairing_code_title">फोनमा देखाइएको कोड पुष्टि गर्नुहोस्</string>
+ <string name="associated_device_pairing_message">यो कोड तपाईंको फोनमा देखाइएको कोडसँग मिल्छ भन्ने कुरा पुष्टि गर्नुहोस्</string>
+ <string name="associated_device_success">यन्त्र कनेक्ट गरिएको छ</string>
+ <string name="associated_device_select_device">यो एप खोल्नुहोस् र &lt;b&gt;%1$s&lt;/b&gt; मा कनेक्ट गर्नुहोस्</string>
+ <string name="associated_device_open_app">यो एप खोल्नुहोस् र त्यहाँ दिइएका निर्देशनको पालना गर्नुहोस्</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; हटाउने हो?</string>
+ <string name="remove_associated_device_message">अब उप्रान्त यो कार यस यन्त्रसँग कनेक्ट गरिने छैन। तपाईंले यो कार सहयोगी एपबाट पनि हटाउनु पर्ने हुन्छ।</string>
+ <string name="device_removed_success_toast_text">%1$s हटाइयो</string>
+ <string name="device_removed_failure_toast_text">%1$s हटाउन सकिएन</string>
+ <string name="continue_setup_toast_text">आफ्नो फोनमा सेटअप गर्ने कार्य जारी राख्नुहोस्</string>
+ <string name="error_screen_title">केही चिज गडबड भयो</string>
+ <string name="error_screen_message">दुर्भाग्यवश, यो स्क्रिनले राम्ररी देखाउन सकेन। कृपया फेरि प्रयास गर्नुहोस्।</string>
+ <string name="turn_on_bluetooth_title">ब्लुटुथ अन गर्नुहोस्</string>
+ <string name="turn_on_bluetooth_message">फोनलाई सहयोगी यन्त्रका रूपमा सेटअप गर्न तपाईंले आफ्नो कारको ब्लुटुथ अन गर्नु पर्ने हुन्छ।</string>
+ <string name="turn_on_bluetooth_dialog_title">ब्लुटुथ अन गर्ने हो?</string>
+ <string name="turn_on_bluetooth_dialog_message">सहयोगी यन्त्रसँग कनेक्ट गर्न तपाईंले आफ्नो कारको ब्लुटुथ अन गर्नु पर्ने हुन्छ।</string>
+ <string name="accept">स्वीकार गर्नुहोस्</string>
+ <string name="reject">अस्वीकार गर्नुहोस्</string>
+ <string name="confirm">पुष्टि गर्नुहोस्</string>
+ <string name="cancel">रद्द गर्नुहोस्</string>
+ <string name="remove">हटाउनुहोस्</string>
+ <string name="ok">ठिक छ</string>
+ <string name="connection">कनेक्सन</string>
+ <string name="forget_title">यो यन्त्र हटाउनुहोस्</string>
+ <string name="forget">हटाउनुहोस्</string>
+ <string name="disable">अफ गर्नुहोस्</string>
+ <string name="enable">अन गर्नुहोस्</string>
+ <string name="continue_button">जारी राख्नुहोस्</string>
+ <string name="retry">फेरि प्रयास गर्नुहोस्</string>
+ <string name="turn_on">अन गर्नुहोस्</string>
+ <string name="not_now">अहिले होइन</string>
+ <string name="connected">कनेक्ट गरियो</string>
+ <string name="notDetected">पत्ता लागेन</string>
+ <string name="disconnected">डिस्कनेक्ट भयो</string>
+ <string name="unknown">अज्ञात</string>
+ <string name="app_running_msg_channel_name">फोनबाट टेक्स्ट म्यासेज पठाउने सेवा चालू छ</string>
+ <string name="app_running_msg_notification_title">फोनबाट टेक्स्ट म्यासेज पठाउने सेवा अन छ</string>
+ <string name="app_running_msg_notification_content">सहयोगी यन्त्रमार्फत टेक्स्ट म्यासेजहरू आइरहेका छन्</string>
+ <string name="trusted_device_feature_title">फोन प्रयोग गरेर प्रोफाइल अनलक गर्नुहोस्</string>
+ <string name="trusted_device_feature_instruction">अनलक गर्ने विकल्पहरू सेट गर्न आफ्नो सहयोगी एपमा जानुहोस्</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; लाई मेरो प्रोफाइल अनलक गर्न दिइयोस्</string>
+ <string name="device_not_connected_dialog_title">तपाईंको फोन सक्रिय रूपमा कनेक्ट भएको हुनु पर्छ</string>
+ <string name="device_not_connected_dialog_message">यो सुविधा अन गर्नुअघि तपाईंको कार र फोनमा ब्लुटुथ अन गरिएको छ र ती एकअर्काका नजिक छन् भन्ने कुरा सुनिश्चित गर्नुहोस्</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; ले अब तपाईंको प्रोफाइल अनलक गर्न सक्छ</string>
+ <string name="create_profile_lock_dialog_title">प्राथमिक प्रोफाइल लक सिर्जना गर्नुहोस्</string>
+ <string name="create_profile_lock_dialog_message">फोन प्रयोग गरेर प्रोफाइल अनलक गर्न तपाईंले ब्याकअपका रूपमा प्राथमिक प्रोफाइल लक सिर्जना गर्नु पर्ने हुन्छ</string>
+ <string name="unlock_profile_to_finish_title">यो कार्य पूरा गर्न आफ्नो प्रोफाइल अनलक गर्नुहोस्</string>
+ <string name="unlock_profile_to_finish_message">तपाईंले नयाँ प्रोफाइल लक सिर्जना गर्नुभएको छ। अब, तपाईंको फोनले तपाईंको प्रोफाइल स्वतः अनलक गर्न सक्छ भन्ने कुरा पक्का गर्न प्रोफाइल लक फेरि हाल्नुहोस्</string>
+ <string name="disable_device_connection_text">यो यन्त्र डिस्कनेक्ट गर्नुहोस्</string>
+ <string name="enable_device_connection_text">यो यन्त्र रिकनेक्ट गर्नुहोस्</string>
+ <string name="trusted_device_notification_channel_name">फोन प्रयोग गरेर अनलक गर्नुहोस्</string>
+ <string name="trusted_device_notification_title">तपाईंको फोनलाई प्रोफाइल अनलक गर्ने अनुमति दिनुहोस्</string>
+ <string name="trusted_device_notification_content">यो सुविधा प्रयोग गर्ने अधिकार दिन यहाँ ट्याप गर्नुहोस्</string>
+ <string name="trusted_device_enrollment_error_dialog_title">केही चिज गडबड भयो</string>
+ <string name="trusted_device_enrollment_error_dialog_message">दुर्भाग्यवश, यस बखत यो सुविधा अन गर्न सकिएन। कृपया फेरि प्रयास गर्नुहोस्।</string>
+ <string name="create_phone_lock_dialog_title">आफ्नो फोनमा स्क्रिन लक सिर्जना गर्नुहोस्</string>
+ <string name="create_phone_lock_dialog_message">तपाईंको फोनमा स्क्रिन लक सेट गरिएको छैन। फोन प्रयोग गरेर आफ्नो कारको प्रोफाइल अनलक गर्न सबैभन्दा पहिले फोनका सेटिङमा गई स्क्रिन लक (जसलाई पासकोड पनि भनिन्छ) सिर्जना गर्नुहोस्।</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">नयाँ म्यासेज</item>
+ <item quantity="other">%d वटा नयाँ म्यासेज</item>
+ </plurals>
+ <string name="name_not_available">नाम उपलब्ध छैन</string>
</resources>
diff --git a/companiondevice/res/values-nl/strings.xml b/companiondevice/res/values-nl/strings.xml
index 6d84e43..60b7cba 100644
--- a/companiondevice/res/values-nl/strings.xml
+++ b/companiondevice/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Bijbehorend apparaat"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Gekoppeld apparaat toevoegen"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Een bijbehorend apparaat koppelen"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Je kunt je telefoon als bijbehorend apparaat gebruiken om de functionaliteit van je auto te beheren"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Zorg dat de "<b>"bijbehorende app"</b>" op je telefoon is geïnstalleerd"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Bevestig de code op je telefoon"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Bevestig dat deze overeenkomt met de code die op je telefoon wordt weergegeven"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Het apparaat is gekoppeld"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Open de app en maak verbinding met &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Open de app en volg de instructies in de app"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; vergeten?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Deze auto is niet meer gekoppeld aan dit apparaat. Je moet deze auto ook uit de bijbehorende app verwijderen."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> is vergeten"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Kan <xliff:g id="PHONE_NAME">%1$s</xliff:g> niet vergeten"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Ga verder met het instellen op je telefoon"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Er is iets misgegaan"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Dit scherm kan niet goed worden weergegeven. Probeer het opnieuw."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Bluetooth inschakelen"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Je auto heeft bluetooth nodig om je telefoon in te stellen als bijbehorend apparaat."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Bluetooth inschakelen?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Je auto heeft bluetooth nodig om de auto te koppelen aan je bijbehorende apparaat."</string>
- <string name="accept" msgid="1454710793329618813">"Accepteren"</string>
- <string name="reject" msgid="4315432282758892890">"Afwijzen"</string>
- <string name="confirm" msgid="3748997214719276945">"Bevestigen"</string>
- <string name="cancel" msgid="4306609731174629323">"Annuleren"</string>
- <string name="remove" msgid="5513398257088729188">"Verwijderen"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Koppeling"</string>
- <string name="forget_title" msgid="3027608547243824729">"Dit apparaat vergeten"</string>
- <string name="forget" msgid="2069897665699141222">"Vergeten"</string>
- <string name="disable" msgid="4619854429066283970">"Uitschakelen"</string>
- <string name="enable" msgid="7656386199154111316">"Inschakelen"</string>
- <string name="continue_button" msgid="2748318968566159950">"Doorgaan"</string>
- <string name="retry" msgid="3783419451480721367">"Opnieuw proberen"</string>
- <string name="turn_on" msgid="4288754850470994812">"Inschakelen"</string>
- <string name="not_now" msgid="8764692269093707622">"Niet nu"</string>
- <string name="connected" msgid="8051190714042020471">"Gekoppeld"</string>
- <string name="notDetected" msgid="4115229772085594506">"Niet gedetecteerd"</string>
- <string name="disconnected" msgid="8526513868622591894">"Losgekoppeld"</string>
- <string name="unknown" msgid="555736316465118024">"Onbekend"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Sms-service van telefoon wordt uitgevoerd"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Sms-service van telefoon is actief"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Sms\'jes ontvangen via bijbehorend apparaat"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Profiel ontgrendelen met telefoon"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Check je bijbehorende app om ontgrendelingsopties in te stellen"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Laat &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; mijn profiel ontgrendelen"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Je telefoon moet actief gekoppeld zijn"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Voor deze functie moet bluetooth zijn ingeschakeld op je telefoon en in je auto en moeten je telefoon en auto bij elkaar in de buurt zijn"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; kan nu je profiel ontgrendelen"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Een primaire profielvergrendeling maken"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Als je je telefoon wilt gebruiken om je profiel te ontgrendelen, heb je een primaire profielvergrendeling nodig als back-up"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Ontgrendel je profiel om dit proces te voltooien"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Je hebt een nieuwe profielvergrendeling ingesteld. Voer deze opnieuw in om te bevestigen dat je telefoon je profiel automatisch mag ontgrendelen"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Dit apparaat loskoppelen"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Dit apparaat opnieuw koppelen"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Ontgrendelen met telefoon"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Laat je telefoon je profiel ontgrendelen"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Tik hier om deze functie te autoriseren"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Er is iets misgegaan"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Deze functie kan op dit moment niet worden ingeschakeld. Probeer het opnieuw."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Een schermvergrendeling op je telefoon maken"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Er is nog geen schermvergrendeling ingesteld op je telefoon. Als je je auto wilt ontgrendelen met je telefoon, maak je eerst een schermvergrendeling (ook wel toegangscode genoemd) in de instellingen van je telefoon."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Bijbehorend apparaat</string>
+ <string name="add_device_title">Gekoppeld apparaat toevoegen</string>
+ <string name="add_associated_device_title">Een bijbehorend apparaat koppelen</string>
+ <string name="add_associated_device_instruction">Je kunt je telefoon als bijbehorend apparaat gebruiken om de functionaliteit van je auto te beheren</string>
+ <string name="associated_device_install_app">Zorg dat de <b>bijbehorende app</b> op je telefoon is geïnstalleerd</string>
+ <string name="associated_device_pairing_code_title">Bevestig de code op je telefoon</string>
+ <string name="associated_device_pairing_message">Bevestig dat deze overeenkomt met de code die op je telefoon wordt weergegeven</string>
+ <string name="associated_device_success">Het apparaat is gekoppeld</string>
+ <string name="associated_device_select_device">Open de app en koppel met &lt;b&gt;%1$s&lt;b&gt;</string>
+ <string name="associated_device_open_app">Open de app en volg de instructies in de app</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; vergeten?</string>
+ <string name="remove_associated_device_message">Deze auto is niet meer gekoppeld aan dit apparaat. Je moet deze auto ook uit de bijbehorende app verwijderen.</string>
+ <string name="device_removed_success_toast_text">%1$s is vergeten</string>
+ <string name="device_removed_failure_toast_text">Kan %1$s niet vergeten</string>
+ <string name="continue_setup_toast_text">Ga verder met het instellen op je telefoon</string>
+ <string name="error_screen_title">Er is iets misgegaan</string>
+ <string name="error_screen_message">Dit scherm kan niet goed worden weergegeven. Probeer het opnieuw.</string>
+ <string name="turn_on_bluetooth_title">Bluetooth inschakelen</string>
+ <string name="turn_on_bluetooth_message">Je auto heeft bluetooth nodig om je telefoon in te stellen als bijbehorend apparaat.</string>
+ <string name="turn_on_bluetooth_dialog_title">Bluetooth inschakelen?</string>
+ <string name="turn_on_bluetooth_dialog_message">Je auto heeft bluetooth nodig om de auto te koppelen aan je bijbehorende apparaat.</string>
+ <string name="accept">Accepteren</string>
+ <string name="reject">Afwijzen</string>
+ <string name="confirm">Bevestigen</string>
+ <string name="cancel">Annuleren</string>
+ <string name="remove">Verwijderen</string>
+ <string name="ok">OK</string>
+ <string name="connection">Verbinding</string>
+ <string name="forget_title">Dit apparaat vergeten</string>
+ <string name="forget">Vergeten</string>
+ <string name="disable">Uitschakelen</string>
+ <string name="enable">Inschakelen</string>
+ <string name="continue_button">Doorgaan</string>
+ <string name="retry">Opnieuw</string>
+ <string name="turn_on">Inschakelen</string>
+ <string name="not_now">Niet nu</string>
+ <string name="connected">Gekoppeld</string>
+ <string name="notDetected">Niet gedetecteerd</string>
+ <string name="disconnected">Ontkoppeld</string>
+ <string name="unknown">Onbekend</string>
+ <string name="app_running_msg_channel_name">Sms-service van telefoon wordt uitgevoerd</string>
+ <string name="app_running_msg_notification_title">Sms-service van telefoon is actief</string>
+ <string name="app_running_msg_notification_content">Sms\'jes krijgen via bijbehorend apparaat</string>
+ <string name="trusted_device_feature_title">Profiel ontgrendelen met telefoon</string>
+ <string name="trusted_device_feature_instruction">Check je bijbehorende app om ontgrendelingsopties in te stellen</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; mijn profiel laten ontgrendelen</string>
+ <string name="device_not_connected_dialog_title">Je telefoon moet actief gekoppeld zijn</string>
+ <string name="device_not_connected_dialog_message">Voor deze functie moet bluetooth zijn ingeschakeld op je telefoon en in je auto en moeten je telefoon en auto bij elkaar in de buurt zijn</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; kan je profiel nu ontgrendelen</string>
+ <string name="create_profile_lock_dialog_title">Maak een primaire profielvergrendeling</string>
+ <string name="create_profile_lock_dialog_message">Als je je telefoon wilt gebruiken om je profiel te ontgrendelen, heb je een primaire profielvergrendeling nodig als back-up</string>
+ <string name="unlock_profile_to_finish_title">Ontgrendel je profiel om dit proces te voltooien</string>
+ <string name="unlock_profile_to_finish_message">Je hebt een nieuwe profielvergrendeling ingesteld. Voer deze opnieuw in om te bevestigen dat je telefoon je profiel automatisch mag ontgrendelen.</string>
+ <string name="disable_device_connection_text">Dit apparaat loskoppelen</string>
+ <string name="enable_device_connection_text">Dit apparaat opnieuw koppelen</string>
+ <string name="trusted_device_notification_channel_name">Ontgrendelen met telefoon</string>
+ <string name="trusted_device_notification_title">Laat je telefoon je profiel ontgrendelen</string>
+ <string name="trusted_device_notification_content">Tik hier om deze functie te autoriseren</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Er is iets misgegaan</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Deze functie kan op dit moment niet worden ingeschakeld. Probeer het opnieuw.</string>
+ <string name="create_phone_lock_dialog_title">Maak een schermvergrendeling op je telefoon</string>
+ <string name="create_phone_lock_dialog_message">Er is nog geen schermvergrendeling ingesteld op je telefoon. Als je je auto wilt ontgrendelen met je telefoon, maak je eerst een schermvergrendeling (ook wel toegangscode genoemd) in de instellingen van je telefoon.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Nieuw bericht</item>
+ <item quantity="other">%d nieuwe berichten</item>
+ </plurals>
+ <string name="name_not_available">Naam niet beschikbaar</string>
</resources>
diff --git a/companiondevice/res/values-or/strings.xml b/companiondevice/res/values-or/strings.xml
index a496939..f92b62b 100644
--- a/companiondevice/res/values-or/strings.xml
+++ b/companiondevice/res/values-or/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"ସମ୍ବନ୍ଧିତ ଡିଭାଇସ୍"</string>
- <string name="add_device_title" msgid="6166003577845888151">"ସମ୍ବନ୍ଧିତ ଡିଭାଇସ୍ ଯୋଗ କରନ୍ତୁ"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"ଏକ ସହଯୋଗୀ ଡିଭାଇସ୍ ସଂଯୋଗ କରନ୍ତୁ"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"ଆପଣଙ୍କ ଡ୍ରାଇଭିଂ ଅନୁଭୂତି ପରିଚାଳନାରେ ସାହାଯ୍ୟ କରିବାକୁ ଆପଣ ଫୋନକୁ ସହଯୋଗୀ ଡିଭାଇସ୍ ଭାବେ ବ୍ୟବହାର କରିପାରିବେ"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"ଆପଣଙ୍କ ଫୋନରେ "<b>"ସହଯୋଗୀ ଆପ୍"</b>" ଇନଷ୍ଟଲ୍ କରାଯାଇଥିବା ନିଶ୍ଚିତ କରନ୍ତୁ"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"ଫୋନରେ କୋଡ୍ ସୁନିଶ୍ଚିତ କରନ୍ତୁ"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"ଆପଣଙ୍କ ଫୋନରେ ଦେଖାଯାଉଥିବା କୋଡ୍ ସହିତ ଏହା ମେଳ ହେଉଛି ବୋଲି ସୁନିଶ୍ଚିତ କରନ୍ତୁ"</string>
- <string name="associated_device_success" msgid="584760065696870256">"ଡିଭାଇସ୍ ସଫଳତାର ସହିତ ଯୋଡ଼ି ହୋଇଛି"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"ଆପ୍ ଖୋଲି &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;କୁ ସଂଯୋଗ କର"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"ଆପ୍ ଖୋଲି ନିର୍ଦ୍ଦେଶାବଳୀ ଅନୁସରଣ କରନ୍ତୁ"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;କୁ ବିଚ୍ଛିନ୍ନ କରିବେ?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"ଏହି କାର ଆଉ ଏଇ ଡିଭାଇସ୍ ସହିତ ପେୟାର୍ ହେବ ନାହିଁ। ଆପଣଙ୍କୁ ଅତିରିକ୍ତ ଭାବରେ ଏହି କାରକୁ ସହଯୋଗୀ ଆପରୁ କାଢ଼ିବା ଦରକାର ହେବ।"</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g>କୁ ବିଚ୍ଛିନ୍ନ କରି ଦିଆଯାଇଛି"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g>କୁ ବିଚ୍ଛିନ୍ନ କରିବା ବିଫଳ ହୋଇଛି"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"ଆପଣଙ୍କ ଫୋନରେ ସେଟଅପ୍ କରିବା ଜାରି ରଖନ୍ତୁ"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"କିଛି ତ୍ରୁଟି ହୋଇଗଲା"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"ଦୁର୍ଭାଗ୍ୟବଶତଃ, ଏହି ସ୍କ୍ରିନଟି ସଠିକ ଭାବରେ ଡିସପ୍ଲେ ହୋଇପାରିଲା ନାହିଁ। ଦୟାକରି ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"ବ୍ଲୁଟୁଥ୍ ଚାଲୁ କରନ୍ତୁ"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"ଆପଣଙ୍କ ଫୋନକୁ ଏକ ସହଯୋଗୀ ଡିଭାଇସ୍ ରୂପେ ସେଟ୍ ଅପ୍ କରିବାକୁ, ଆପଣଙ୍କ କାର ବ୍ଲୁଟୁଥ୍ ଆବଶ୍ୟକ କରେ।"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"ବ୍ଲୁଟୁଥ୍ ଚାଲୁ କରିବେ?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"ଆପଣଙ୍କ ସହଯୋଗୀ ଡିଭାଇସ୍ ସହିତ ସଂଯୋଗ କରିବାକୁ, ଆପଣଙ୍କ କାର ବ୍ଲୁଟୁଥ୍ ଆବଶ୍ୟକ କରେ।"</string>
- <string name="accept" msgid="1454710793329618813">"ଗ୍ରହଣ କରନ୍ତୁ"</string>
- <string name="reject" msgid="4315432282758892890">"ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ"</string>
- <string name="confirm" msgid="3748997214719276945">"ସୁନିଶ୍ଚିତ କରନ୍ତୁ"</string>
- <string name="cancel" msgid="4306609731174629323">"ବାତିଲ୍ କରନ୍ତୁ"</string>
- <string name="remove" msgid="5513398257088729188">"କାଢ଼ି ଦିଅନ୍ତୁ"</string>
- <string name="ok" msgid="2825038997730899083">"ଠିକ୍ ଅଛି"</string>
- <string name="connection" msgid="2798490936433656846">"ସଂଯୋଗ"</string>
- <string name="forget_title" msgid="3027608547243824729">"ଏହି ଡିଭାଇସ୍ ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ"</string>
- <string name="forget" msgid="2069897665699141222">"ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ"</string>
- <string name="disable" msgid="4619854429066283970">"ଅକ୍ଷମ କରନ୍ତୁ"</string>
- <string name="enable" msgid="7656386199154111316">"ସକ୍ଷମ କରନ୍ତୁ"</string>
- <string name="continue_button" msgid="2748318968566159950">"ଜାରି ରଖନ୍ତୁ"</string>
- <string name="retry" msgid="3783419451480721367">"ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string>
- <string name="turn_on" msgid="4288754850470994812">"ଚାଲୁ କରନ୍ତୁ"</string>
- <string name="not_now" msgid="8764692269093707622">"ବର୍ତ୍ତମାନ ନୁହେଁ"</string>
- <string name="connected" msgid="8051190714042020471">"ସଂଯୋଗ ହୋଇଛି"</string>
- <string name="notDetected" msgid="4115229772085594506">"ଚିହ୍ନଟ କରାଯାଇନାହିଁ"</string>
- <string name="disconnected" msgid="8526513868622591894">"ବିଚ୍ଛିନ୍ନ କରାଯାଇଛି"</string>
- <string name="unknown" msgid="555736316465118024">"ଅଜଣା"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"ଫୋନ୍ ଟେକ୍ସଟ୍ ମେସେଜ୍ ସେବା ଚାଲୁ ଅଛି"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"ଫୋନ୍ ଟେକ୍ସଟ୍ ମେସେଜିଂ ସେବା ସକ୍ରିୟ ଅଛି"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"ସହଯୋଗୀ ଡିଭାଇସ୍ ମାଧ୍ୟମରେ ଟେକ୍ସଟ୍ ମେସେଜଗୁଡ଼ିକ ପ୍ରାପ୍ତ କରାଯାଉଛି"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"ଫୋନ୍ ମାଧ୍ୟମରେ ପ୍ରୋଫାଇଲ୍ ଅନଲକ୍ କରନ୍ତୁ"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"ଅନଲକ୍ କରିବାର ବିକଳ୍ପଗୁଡ଼ିକ ସେଟ୍ କରିବାକୁ ଆପଣଙ୍କର ସହଯୋଗୀ ଆପ୍ ଯାଞ୍ଚ କରନ୍ତୁ"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;କୁ ମୋ ପ୍ରୋଫାଇଲ୍ ଅନଲକ୍ କରିବାକୁ ଦିଅନ୍ତୁ"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"ଆପଣଙ୍କ ଫୋନ୍ ସକ୍ରିୟ ଭାବେ ସଂଯୁକ୍ତ ହୋଇଥିବା ଦରକାର"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"ଏହି ଫିଚର୍ ଚାଲୁ କରିବାକୁ, ଆପଣଙ୍କ କାର ଏବଂ ଫୋନର ବ୍ଲୁଟୁଥ୍ ଚାଲୁ ଥିବା ଏବଂ ସେଗୁଡ଼ିକ ପରସ୍ପରର ନିକଟରେ ଥିବା ନିଶ୍ଚିତ କରନ୍ତୁ"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; ବର୍ତ୍ତମାନ ଆପଣଙ୍କ ପ୍ରୋଫାଇଲ୍ ଅନଲକ୍ କରିପାରିବ"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"ଏକ ପ୍ରାଥମିକ ପ୍ରୋଫାଇଲ୍ ଲକ୍ ତିଆରି କରନ୍ତୁ"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"ଆପଣଙ୍କ ପ୍ରୋଫାଇଲ୍ ଅନଲକ୍ କରିବାକୁ ଆପଣଙ୍କର ଫୋନ୍ ବ୍ୟବହାର କରିବା ପାଇଁ, ବ୍ୟାକଅପ୍ ଭାବେ ଆପଣ ଏକ ପ୍ରାଥମିକ ପ୍ରୋଫାଇଲ୍ ଲକ୍ ଦରକାର କରନ୍ତି"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"ଶେଷ କରିବାକୁ ଆପଣଙ୍କ ପ୍ରୋଫାଇଲ୍ ଅନଲକ୍ କରନ୍ତୁ"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"ଆପଣ ଏକ ନୂଆ ପ୍ରୋଫାଇଲ୍ ଲକ୍ ତିଆରି କରିଛନ୍ତି। ତାପରେ, ଆପଣଙ୍କ ଫୋନ୍ ଆପଣଙ୍କର ପ୍ରୋଫାଇଲକୁ ସ୍ୱଚାଳିତ ଭାବେ ଅନଲକ୍ କରିପାରିବ ବୋଲି ସୁନିଶ୍ଚିତ କରିବାକୁ ଏହା ପୁଣି ଲେଖନ୍ତୁ"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"ଏହି ଡିଭାଇସକୁ ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"ଏହି ଡିଭାଇସକୁ ପୁଣି ସଂଯୋଗ କରନ୍ତୁ"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"ଫୋନ୍ ମାଧ୍ୟମରେ ଅନଲକ୍ କରନ୍ତୁ"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"ଆପଣଙ୍କ ଫୋନକୁ ଆପଣଙ୍କର ପ୍ରୋଫାଇଲ୍ ଅନଲକ୍ କରିବାକୁ ଦିଅନ୍ତୁ"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"ଏହି ଫିଚରକୁ ଅଧିକାର ଦେବା ପାଇଁ ଏଠାରେ ଟାପ୍ କରନ୍ତୁ"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"କିଛି ତ୍ରୁଟି ହୋଇଗଲା"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"ଦୁର୍ଭାଗ୍ୟବଶତଃ, ଏହି ଫିଚର୍ ଏ ସମୟରେ ଚାଲୁ ହୋଇପାରିଲା ନାହିଁ। ଦୟାକରି ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"ଆପଣଙ୍କ ଫୋନରେ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ତିଆରି କରନ୍ତୁ"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"ଆପଣଙ୍କ ଫୋନରେ ସ୍କ୍ରିନ୍ ଲକ୍ ସେଟ୍ ହୋଇନାହିଁ। ଆପଣଙ୍କ ଫୋନ୍ ମାଧ୍ୟମରେ ଆପଣଙ୍କର କାର ପ୍ରୋଫାଇଲ୍ ଅନଲକ୍ କରିବାକୁ, ପ୍ରଥମେ ଆପଣଙ୍କ ଫୋନର ସେଟିଂସରେ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ (ପାସକୋଡ୍ ଭାବେ ମଧ୍ୟ ଜଣାଯାଏ) ତିଆରି କରନ୍ତୁ।"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">ସମ୍ବନ୍ଧିତ ଡିଭାଇସ୍</string>
+ <string name="add_device_title">ସମ୍ବନ୍ଧିତ ଡିଭାଇସ୍ ଯୋଗ କରନ୍ତୁ</string>
+ <string name="add_associated_device_title">ଏକ ସହଯୋଗୀ ଡିଭାଇସ୍ ସଂଯୋଗ କରନ୍ତୁ</string>
+ <string name="add_associated_device_instruction">ଡ୍ରାଇଭିଂର ଅନୁଭୂତିକୁ ପରିଚାଳନା କରିବାରେ ସାହାଯ୍ୟ କରିବାକୁ ଆପଣ ଫୋନକୁ ସହଯୋଗୀ ଡିଭାଇସ୍ ଭାବେ ବ୍ୟବହାର କରିପାରିବେ</string>
+ <string name="associated_device_install_app">ଆପଣଙ୍କ ଫୋନରେ <b>ସହଯୋଗୀ ଆପ୍</b> ଇନଷ୍ଟଲ୍ କରାଯାଇଛି ବୋଲି ନିଶ୍ଚିତ କରନ୍ତୁ</string>
+ <string name="associated_device_pairing_code_title">ଫୋନରେ କୋଡ୍ ସୁନିଶ୍ଚିତ କରନ୍ତୁ</string>
+ <string name="associated_device_pairing_message">ଆପଣଙ୍କ ଫୋନରେ ଦେଖାଯାଉଥିବା କୋଡ୍ ସହିତ ଏହା ମେଳ ହେଉଛି ବୋଲି ସୁନିଶ୍ଚିତ କରନ୍ତୁ</string>
+ <string name="associated_device_success">ଡିଭାଇସକୁ ସଫଳତାର ସହିତ ସମ୍ବନ୍ଧିତ କରାଯାଇଛି</string>
+ <string name="associated_device_select_device">ଆପ୍ ଖୋଲି &lt;b&gt;%1$s&lt;b&gt; ସହ ସଂଯୋଗ କରନ୍ତୁ</string>
+ <string name="associated_device_open_app">ଆପକୁ ଖୋଲି ସେଥିରେ ଥିବା ନିର୍ଦ୍ଦେଶାବଳୀର ଅନୁସରଣ କରନ୍ତୁ</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt;କୁ ବିଚ୍ଛିନ୍ନ କରିବେ?</string>
+ <string name="remove_associated_device_message">ଏହି କାର ଆଉ ଏହି ଡିଭାଇସ୍ ସହିତ ପେୟାର୍ ହେବ ନାହିଁ। ଆପଣଙ୍କୁ ଅତିରିକ୍ତ ଭାବରେ ଏହି କାରକୁ ସହଯୋଗୀ ଆପରୁ କାଢ଼ିବାର ଆବଶ୍ୟକତା ହେବ।</string>
+ <string name="device_removed_success_toast_text">%1$sକୁ ବିଚ୍ଛିନ୍ନ କରି ଦିଆଯାଇଛି</string>
+ <string name="device_removed_failure_toast_text">%1$sକୁ ବିଚ୍ଛିନ୍ନ କରିବା ବିଫଳ ହୋଇଛି</string>
+ <string name="continue_setup_toast_text">ଆପଣଙ୍କ ଫୋନରେ ସେଟଅପ୍ କରିବା ଜାରି ରଖନ୍ତୁ</string>
+ <string name="error_screen_title">କିଛି ତ୍ରୁଟି ହୋଇଯାଇଛି</string>
+ <string name="error_screen_message">ଦୁର୍ଭାଗ୍ୟବଶତଃ, ଏହି ସ୍କ୍ରିନକୁ ସଠିକ ଭାବରେ ଡିସପ୍ଲେ କରାଯାଇପାରିଲା ନାହିଁ। ଦୟାକରି ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।</string>
+ <string name="turn_on_bluetooth_title">ବ୍ଲୁଟୁଥ୍ ଚାଲୁ କରନ୍ତୁ</string>
+ <string name="turn_on_bluetooth_message">ଆପଣଙ୍କ ଫୋନକୁ ଏକ ସହଯୋଗୀ ଡିଭାଇସ୍ ରୂପେ ସେଟ୍ ଅପ୍ କରିବାକୁ, ଆପଣଙ୍କ କାର ବ୍ଲୁଟୁଥ୍ ଆବଶ୍ୟକ କରେ।</string>
+ <string name="turn_on_bluetooth_dialog_title">ବ୍ଲୁଟୁଥ୍ ଚାଲୁ କରିବେ?</string>
+ <string name="turn_on_bluetooth_dialog_message">ଆପଣଙ୍କ ସହଯୋଗୀ ଡିଭାଇସ୍ ସହିତ ସଂଯୋଗ କରିବାକୁ, ଆପଣଙ୍କ କାର ବ୍ଲୁଟୁଥ୍ ଆବଶ୍ୟକ କରେ।</string>
+ <string name="accept">ଗ୍ରହଣ କରନ୍ତୁ</string>
+ <string name="reject">ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ</string>
+ <string name="confirm">ସୁନିଶ୍ଚିତ କରନ୍ତୁ</string>
+ <string name="cancel">ବାତିଲ୍ କରନ୍ତୁ</string>
+ <string name="remove">କାଢ଼ି ଦିଅନ୍ତୁ</string>
+ <string name="ok">ଠିକ୍ ଅଛି</string>
+ <string name="connection">ସଂଯୋଗ</string>
+ <string name="forget_title">ଏହି ଡିଭାଇସକୁ ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ</string>
+ <string name="forget">ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ</string>
+ <string name="disable">ଅକ୍ଷମ କରନ୍ତୁ</string>
+ <string name="enable">ସକ୍ଷମ କରନ୍ତୁ</string>
+ <string name="continue_button">ଜାରି ରଖନ୍ତୁ</string>
+ <string name="retry">ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ</string>
+ <string name="turn_on">ଚାଲୁ କରନ୍ତୁ</string>
+ <string name="not_now">ବର୍ତ୍ତମାନ ନୁହେଁ</string>
+ <string name="connected">ସଂଯୋଗ କରାଯାଇଛି</string>
+ <string name="notDetected">ଚିହ୍ନଟ କରାଯାଇନାହିଁ</string>
+ <string name="disconnected">ବିଚ୍ଛିନ୍ନ କରାଯାଇଛି</string>
+ <string name="unknown">ଅଜଣା</string>
+ <string name="app_running_msg_channel_name">ଫୋନ୍ ଟେକ୍ସଟ୍ ମେସେଜ୍ ସେବା ଚାଲୁ ଅଛି</string>
+ <string name="app_running_msg_notification_title">ଫୋନ୍ ଟେକ୍ସଟ୍ ମେସେଜିଂ ସେବା ସକ୍ରିୟ ଅଛି</string>
+ <string name="app_running_msg_notification_content">ସହଯୋଗୀ ଡିଭାଇସ୍ ମାଧ୍ୟମରେ ଟେକ୍ସଟ୍ ମେସେଜଗୁଡ଼ିକ ପ୍ରାପ୍ତ କରାଯାଉଛି</string>
+ <string name="trusted_device_feature_title">ଫୋନ୍ ମାଧ୍ୟମରେ ପ୍ରୋଫାଇଲ୍ ଅନଲକ୍ କରନ୍ତୁ</string>
+ <string name="trusted_device_feature_instruction">ଅନଲକ୍ କରିବାର ବିକଳ୍ପଗୁଡ଼ିକ ସେଟ୍ କରିବାକୁ ଆପଣଙ୍କର ସହଯୋଗୀ ଆପ୍ ଯାଞ୍ଚ କରନ୍ତୁ</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt;କୁ ମୋ ପ୍ରୋଫାଇଲ୍ ଅନଲକ୍ କରିବାକୁ ଦିଅନ୍ତୁ</string>
+ <string name="device_not_connected_dialog_title">ଆପଣଙ୍କ ଫୋନ୍ ସକ୍ରିୟ ଭାବେ ସଂଯୁକ୍ତ ହୋଇଥିବା ଆବଶ୍ୟକ</string>
+ <string name="device_not_connected_dialog_message">ଏହି ଫିଚର୍ ଚାଲୁ କରିବାକୁ, ଆପଣଙ୍କ କାର ଏବଂ ଫୋନର ବ୍ଲୁଟୁଥ୍ ଚାଲୁ ଥିବା ଏବଂ ସେଗୁଡ଼ିକ ପରସ୍ପରର ନିକଟରେ ଥିବା ନିଶ୍ଚିତ କରନ୍ତୁ</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; ବର୍ତ୍ତମାନ ଆପଣଙ୍କ ପ୍ରୋଫାଇଲ୍ ଅନଲକ୍ କରିପାରିବ</string>
+ <string name="create_profile_lock_dialog_title">ଏକ ପ୍ରାଥମିକ ପ୍ରୋଫାଇଲ୍ ଲକ୍ ତିଆରି କରନ୍ତୁ</string>
+ <string name="create_profile_lock_dialog_message">ଆପଣଙ୍କ ପ୍ରୋଫାଇଲ୍ ଅନଲକ୍ କରିବାକୁ ଆପଣଙ୍କର ଫୋନ୍ ବ୍ୟବହାର କରିବା ପାଇଁ, ବ୍ୟାକଅପ୍ ଭାବେ ଆପଣ ଏକ ପ୍ରାଥମିକ ପ୍ରୋଫାଇଲ୍ ଲକ୍ ଆବଶ୍ୟକ କରନ୍ତି</string>
+ <string name="unlock_profile_to_finish_title">ସମ୍ପୂର୍ଣ୍ଣ କରିବାକୁ ଆପଣଙ୍କ ପ୍ରୋଫାଇଲ୍ ଅନଲକ୍ କରନ୍ତୁ</string>
+ <string name="unlock_profile_to_finish_message">ଆପଣ ଏକ ନୂଆ ପ୍ରୋଫାଇଲ୍ ଲକ୍ ତିଆରି କରିଛନ୍ତି। ତାପରେ, ଆପଣଙ୍କ ଫୋନ୍ ଆପଣଙ୍କର ପ୍ରୋଫାଇଲକୁ ସ୍ୱଚାଳିତ ଭାବେ ଅନଲକ୍ କରିପାରିବ ବୋଲି ସୁନିଶ୍ଚିତ କରିବାକୁ ଏହାକୁ ପୁଣି ଲେଖନ୍ତୁ</string>
+ <string name="disable_device_connection_text">ଏହି ଡିଭାଇସକୁ ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ</string>
+ <string name="enable_device_connection_text">ଏହି ଡିଭାଇସକୁ ପୁଣି ସଂଯୋଗ କରନ୍ତୁ</string>
+ <string name="trusted_device_notification_channel_name">ଫୋନ୍ ମାଧ୍ୟମରେ ଅନଲକ୍ କରନ୍ତୁ</string>
+ <string name="trusted_device_notification_title">ଆପଣଙ୍କ ଫୋନକୁ ଆପଣଙ୍କର ପ୍ରୋଫାଇଲ୍ ଅନଲକ୍ କରିବାକୁ ଦିଅନ୍ତୁ</string>
+ <string name="trusted_device_notification_content">ଏହି ଫିଚରକୁ ଅଧିକାର ଦେବା ପାଇଁ ଏଠାରେ ଟାପ୍ କରନ୍ତୁ</string>
+ <string name="trusted_device_enrollment_error_dialog_title">କିଛି ତ୍ରୁଟି ହୋଇଯାଇଛି</string>
+ <string name="trusted_device_enrollment_error_dialog_message">ଦୁର୍ଭାଗ୍ୟବଶତଃ, ଏହି ଫିଚର୍ ଏ ସମୟରେ ଚାଲୁ କରାଯାଇପାରିଲା ନାହିଁ। ଦୟାକରି ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।</string>
+ <string name="create_phone_lock_dialog_title">ଆପଣଙ୍କ ଫୋନରେ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ତିଆରି କରନ୍ତୁ</string>
+ <string name="create_phone_lock_dialog_message">ଆପଣଙ୍କ ଫୋନରେ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ସେଟ୍ କରାଯାଇନାହିଁ। ଆପଣଙ୍କ ଫୋନ୍ ମାଧ୍ୟମରେ ଆପଣଙ୍କର କାର ପ୍ରୋଫାଇଲ୍ ଅନଲକ୍ କରିବାକୁ, ପ୍ରଥମେ ଆପଣଙ୍କ ଫୋନର ସେଟିଂସରେ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ (ପାସକୋଡ୍ ଭାବେ ମଧ୍ୟ ଜଣାଯାଏ) ତିଆରି କରନ୍ତୁ।</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">ନୂଆ ମେସେଜ୍</item>
+ <item quantity="other">%dଟି ନୂଆ ମେସେଜ୍</item>
+ </plurals>
+ <string name="name_not_available">ନାମ ଉପଲବ୍ଧ ନାହିଁ</string>
</resources>
diff --git a/companiondevice/res/values-pa/strings.xml b/companiondevice/res/values-pa/strings.xml
index c1cd588..6f47c8d 100644
--- a/companiondevice/res/values-pa/strings.xml
+++ b/companiondevice/res/values-pa/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"ਸੰਬੰਧਿਤ ਡੀਵਾਈਸ"</string>
- <string name="add_device_title" msgid="6166003577845888151">"ਸੰਬੰਧਿਤ ਡੀਵਾਈਸ ਨੂੰ ਸ਼ਾਮਲ ਕਰੋ"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"ਸੰਬੰਧੀ ਡੀਵਾਈਸ ਨੂੰ ਕਨੈਕਟ ਕਰੋ"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"ਤੁਸੀਂ ਆਪਣੇ ਡਰਾਈਵਿੰਗ ਅਨੁਭਵ ਦੇ ਪ੍ਰਬੰਧਨ ਵਿੱਚ ਮਦਦ ਲਈ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਸੰਬੰਧੀ ਡੀਵਾਈਸ ਵਜੋਂ ਵਰਤ ਸਕਦੇ ਹੋ"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ "<b>"ਸੰਬੰਧੀ ਐਪ"</b>" ਸਥਾਪਤ ਹੈ"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"ਫ਼ੋਨ \'ਤੇ ਕੋਡ ਦੀ ਤਸਦੀਕ ਕਰੋ"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"ਤਸਦੀਕ ਕਰੋ ਕਿ ਇਹ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਦਿਖਾਏ ਜਾ ਰਹੇ ਕੋਡ ਨਾਲ ਮੇਲ ਖਾਂਦਾ ਹੈ"</string>
- <string name="associated_device_success" msgid="584760065696870256">"ਡੀਵਾਈਸ ਨੂੰ ਸਫਲਤਾਪੂਰਵਕ ਜੋੜਿਆ ਗਿਆ ਹੈ"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"ਐਪ ਖੋਲ੍ਹੋ ਅਤੇ &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"ਐਪ ਖੋਲ੍ਹ ਕੇ ਹਿਦਾਇਤਾਂ ਦਾ ਅਨੁਸਰਣ ਕਰੋ"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"ਕੀ &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; ਨੂੰ ਭੁੱਲਣਾ ਹੈ?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"ਇਹ ਕਾਰ ਹੁਣ ਇਸ ਡੀਵਾਈਸ ਨਾਲ ਜੋੜਾਬੱਧ ਨਹੀਂ ਰਹੇਗੀ। ਇਸ ਦੇ ਇਲਾਵਾ ਤੁਹਾਨੂੰ ਇਸ ਕਾਰ ਨੂੰ ਸੰਬੰਧੀ ਐਪ ਤੋਂ ਹਟਾਉਣ ਦੀ ਲੋੜ ਪਵੇਗੀ।"</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> ਨੂੰ ਭੁਲਾਇਆ ਗਿਆ"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> ਨੂੰ ਭੁੱਲਣਾ ਅਸਫਲ ਰਿਹਾ"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"ਆਪਣੇ ਫ਼ੋਨ \'ਤੇ ਸੈੱਟਅੱਪ ਜਾਰੀ ਰੱਖੋ"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"ਕੋਈ ਗੜਬੜ ਹੋਈ"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"ਅਫ਼ਸੋਸ, ਇਹ ਸਕ੍ਰੀਨ ਸਹੀ ਤਰ੍ਹਾਂ ਨਹੀਂ ਦਿਖਾਈ ਜਾ ਸਕੀ। ਕਿਰਪਾ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"ਬਲੂਟੁੱਥ ਚਾਲੂ ਕਰੋ"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਸੰਬੰਧੀ ਡੀਵਾਈਸ ਵਜੋਂ ਸੈੱਟ ਕਰਨ ਲਈ, ਤੁਹਾਡੀ ਕਾਰ ਨੂੰ ਬਲੂਟੁੱਥ ਦੀ ਲੋੜ ਹੈ।"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"ਕੀ ਬਲੂਟੁੱਥ ਚਾਲੂ ਕਰਨਾ ਹੈ?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"ਤੁਹਾਡਾ ਸੰਬੰਧੀ ਡੀਵਾਈਸ ਕਨੈਕਟ ਕਰਨ ਲਈ, ਤੁਹਾਡੀ ਕਾਰ ਨੂੰ ਬਲੂਟੁੱਥ ਦੀ ਲੋੜ ਹੈ।"</string>
- <string name="accept" msgid="1454710793329618813">"ਸਵੀਕਾਰ ਕਰੋ"</string>
- <string name="reject" msgid="4315432282758892890">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
- <string name="confirm" msgid="3748997214719276945">"ਤਸਦੀਕ ਕਰੋ"</string>
- <string name="cancel" msgid="4306609731174629323">"ਰੱਦ ਕਰੋ"</string>
- <string name="remove" msgid="5513398257088729188">"ਹਟਾਓ"</string>
- <string name="ok" msgid="2825038997730899083">"ਠੀਕ"</string>
- <string name="connection" msgid="2798490936433656846">"ਕਨੈਕਸ਼ਨ"</string>
- <string name="forget_title" msgid="3027608547243824729">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਭੁੱਲ ਜਾਓ"</string>
- <string name="forget" msgid="2069897665699141222">"ਭੁੱਲ ਜਾਓ"</string>
- <string name="disable" msgid="4619854429066283970">"ਬੰਦ ਕਰੋ"</string>
- <string name="enable" msgid="7656386199154111316">"ਚਾਲੂ ਕਰੋ"</string>
- <string name="continue_button" msgid="2748318968566159950">"ਜਾਰੀ ਰੱਖੋ"</string>
- <string name="retry" msgid="3783419451480721367">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
- <string name="turn_on" msgid="4288754850470994812">"ਚਾਲੂ ਕਰੋ"</string>
- <string name="not_now" msgid="8764692269093707622">"ਹਾਲੇ ਨਹੀਂ"</string>
- <string name="connected" msgid="8051190714042020471">"ਕਨੈਕਟ ਹੈ"</string>
- <string name="notDetected" msgid="4115229772085594506">"ਪਤਾ ਨਹੀਂ ਲੱਗਾ"</string>
- <string name="disconnected" msgid="8526513868622591894">"ਡਿਸਕਨੈਕਟ ਹੈ"</string>
- <string name="unknown" msgid="555736316465118024">"ਅਗਿਆਤ"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"ਫ਼ੋਨ ਦੀ ਲਿਖਤ ਸੁਨੇਹਿਆਂ ਵਾਲੀ ਸੇਵਾ ਚੱਲ ਰਹੀ ਹੈ"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"ਫ਼ੋਨ ਦੀ ਲਿਖਤ ਸੁਨੇਹਿਆਂ ਵਾਲੀ ਸੇਵਾ ਕਿਰਿਆਸ਼ੀਲ ਹੈ"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"ਸੰਬੰਧੀ ਡੀਵਾਈਸ ਰਾਹੀਂ ਲਿਖਤ ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਫ਼ੋਨ ਨਾਲ ਅਣਲਾਕ ਕਰੋ"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"ਅਣਲਾਕ ਕਰਨ ਦੇ ਵਿਕਲਪ ਸੈੱਟ ਕਰਨ ਲਈ ਆਪਣੀ ਸੰਬੰਧੀ ਐਪ ਦੀ ਜਾਂਚ ਕਰੋ"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; ਨੂੰ ਮੇਰਾ ਪ੍ਰੋਫਾਈਲ ਅਣਲਾਕ ਕਰਨ ਦਿਓ"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਕਿਰਿਆਸ਼ੀਲ ਤੌਰ \'ਤੇ ਕਨੈਕਟ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਹਾਡੇ ਫ਼ੋਨ ਅਤੇ ਕਾਰ ਵਿੱਚ ਬਲੂਟੁੱਥ ਚਾਲੂ ਹੈ ਅਤੇ ਉਹ ਇੱਕ ਦੂਜੇ ਦੇ ਨੇੜੇ ਹਨ"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; ਹੁਣ ਤੁਹਾਡਾ ਪ੍ਰੋਫਾਈਲ ਅਣਲਾਕ ਕਰ ਸਕਦਾ ਹੈ"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"ਮੁੱਖ ਪ੍ਰੋਫਾਈਲ ਲਾਕ ਬਣਾਓ"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਵਾਸਤੇ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਵਰਤਣ ਲਈ, ਤੁਹਾਨੂੰ ਬੈਕਅੱਪ ਦੇ ਤੌਰ \'ਤੇ ਇੱਕ ਮੁੱਖ ਪ੍ਰੋਫਾਈਲ ਲਾਕ ਦੀ ਲੋੜ ਹੈ"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"ਸਮਾਪਤ ਕਰਨ ਲਈ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰੋ"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"ਤੁਸੀਂ ਇੱਕ ਨਵਾਂ ਪ੍ਰੋਫਾਈਲ ਲਾਕ ਬਣਾਇਆ ਹੈ। ਅੱਗੇ, ਇਹ ਤਸਦੀਕ ਕਰਨ ਲਈ ਕਿ ਤੁਹਾਡਾ ਫ਼ੋਨ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਤੁਹਾਡੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰ ਸਕਦਾ ਹੈ, ਇਸਨੂੰ ਦੁਬਾਰਾ ਦਾਖਲ ਕਰੋ"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਕਨੈਕਟ ਕਰੋ"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"ਫ਼ੋਨ ਨਾਲ ਅਣਲਾਕ ਕਰੋ"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਤੁਹਾਡਾ ਪ੍ਰੋਫਾਈਲ ਅਣਲਾਕ ਕਰਨ ਦਿਓ"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਲਈ ਇੱਥੇ ਟੈਪ ਕਰੋ"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"ਕੋਈ ਗੜਬੜ ਹੋਈ"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"ਅਫ਼ਸੋਸ, ਇਸ ਸਮੇਂ ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ। ਕਿਰਪਾ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"ਆਪਣੇ ਫ਼ੋਨ \'ਤੇ ਸਕ੍ਰੀਨ ਲਾਕ ਬਣਾਓ"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਨਹੀਂ ਹੈ। ਆਪਣੇ ਫ਼ੋਨ ਨਾਲ ਆਪਣੇ ਕਾਰ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ, ਪਹਿਲਾਂ ਆਪਣੇ ਫ਼ੋਨ ਦੀਆਂ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਸਕ੍ਰੀਨ ਲਾਕ (ਜਿਸਨੂੰ ਪਾਸਕੋਡ ਵੀ ਕਿਹਾ ਜਾਂਦਾ ਹੈ) ਬਣਾਓ।"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">ਸੰਬੰਧਿਤ ਡੀਵਾਈਸ</string>
+ <string name="add_device_title">ਸੰਬੰਧਿਤ ਡੀਵਾਈਸ ਨੂੰ ਸ਼ਾਮਲ ਕਰੋ</string>
+ <string name="add_associated_device_title">ਸੰਬੰਧੀ ਡੀਵਾਈਸ ਨੂੰ ਕਨੈਕਟ ਕਰੋ</string>
+ <string name="add_associated_device_instruction">ਤੁਸੀਂ ਆਪਣੇ ਡਰਾਈਵਿੰਗ ਅਨੁਭਵ ਦੇ ਪ੍ਰਬੰਧਨ ਵਿੱਚ ਮਦਦ ਲਈ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਸੰਬੰਧੀ ਡੀਵਾਈਸ ਵਜੋਂ ਵਰਤ ਸਕਦੇ ਹੋ</string>
+ <string name="associated_device_install_app">ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ <b>ਸੰਬੰਧੀ ਐਪ</b> ਸਥਾਪਤ ਹੈ</string>
+ <string name="associated_device_pairing_code_title">ਫ਼ੋਨ \'ਤੇ ਕੋਡ ਦੀ ਤਸਦੀਕ ਕਰੋ</string>
+ <string name="associated_device_pairing_message">ਤਸਦੀਕ ਕਰੋ ਕਿ ਇਹ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਦਿਖਾਏ ਜਾ ਰਹੇ ਕੋਡ ਨਾਲ ਮੇਲ ਖਾਂਦਾ ਹੈ</string>
+ <string name="associated_device_success">ਡੀਵਾਈਸ ਨੂੰ ਸਫਲਤਾਪੂਰਵਕ ਜੋੜਿਆ ਗਿਆ ਹੈ</string>
+ <string name="associated_device_select_device">ਐਪ ਖੋਲ੍ਹੋ ਅਤੇ &lt;b&gt;%1$s&lt;/b&gt; ਨਾਲ ਕਨੈਕਟ ਕਰੋ</string>
+ <string name="associated_device_open_app">ਐਪ ਖੋਲ੍ਹ ਕੇ ਹਿਦਾਇਤਾਂ ਦਾ ਅਨੁਸਰਣ ਕਰੋ</string>
+ <string name="remove_associated_device_title">ਕੀ &lt;b&gt;%1$s&lt;/b&gt; ਨੂੰ ਭੁੱਲਣਾ ਹੈ?</string>
+ <string name="remove_associated_device_message">ਇਹ ਕਾਰ ਹੁਣ ਇਸ ਡੀਵਾਈਸ ਨਾਲ ਜੋੜਾਬੱਧ ਨਹੀਂ ਰਹੇਗੀ। ਇਸ ਦੇ ਇਲਾਵਾ ਤੁਹਾਨੂੰ ਇਸ ਕਾਰ ਨੂੰ ਸੰਬੰਧੀ ਐਪ ਤੋਂ ਹਟਾਉਣ ਦੀ ਲੋੜ ਪਵੇਗੀ।</string>
+ <string name="device_removed_success_toast_text">%1$s ਨੂੰ ਭੁਲਾਇਆ ਗਿਆ</string>
+ <string name="device_removed_failure_toast_text">%1$s ਨੂੰ ਭੁੱਲਣਾ ਅਸਫਲ ਰਿਹਾ</string>
+ <string name="continue_setup_toast_text">ਆਪਣੇ ਫ਼ੋਨ \'ਤੇ ਸੈੱਟਅੱਪ ਜਾਰੀ ਰੱਖੋ</string>
+ <string name="error_screen_title">ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ</string>
+ <string name="error_screen_message">ਅਫ਼ਸੋਸ, ਇਹ ਸਕ੍ਰੀਨ ਸਹੀ ਤਰ੍ਹਾਂ ਨਹੀਂ ਦਿਖਾਈ ਜਾ ਸਕੀ। ਕਿਰਪਾ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</string>
+ <string name="turn_on_bluetooth_title">ਬਲੂਟੁੱਥ ਚਾਲੂ ਕਰੋ</string>
+ <string name="turn_on_bluetooth_message">ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਸੰਬੰਧੀ ਡੀਵਾਈਸ ਵਜੋਂ ਸੈੱਟ ਕਰਨ ਲਈ, ਤੁਹਾਡੀ ਕਾਰ ਨੂੰ ਬਲੂਟੁੱਥ ਦੀ ਲੋੜ ਹੈ।</string>
+ <string name="turn_on_bluetooth_dialog_title">ਕੀ ਬਲੂਟੁੱਥ ਚਾਲੂ ਕਰਨਾ ਹੈ?</string>
+ <string name="turn_on_bluetooth_dialog_message">ਆਪਣੇ ਸੰਬੰਧੀ ਡੀਵਾਈਸ ਦੇ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ, ਤੁਹਾਡੀ ਕਾਰ ਨੂੰ ਬਲੂਟੁੱਥ ਦੀ ਲੋੜ ਹੈ।</string>
+ <string name="accept">ਸਵੀਕਾਰ ਕਰੋ</string>
+ <string name="reject">ਅਸਵੀਕਾਰ ਕਰੋ</string>
+ <string name="confirm">ਤਸਦੀਕ ਕਰੋ</string>
+ <string name="cancel">ਰੱਦ ਕਰੋ</string>
+ <string name="remove">ਹਟਾਓ</string>
+ <string name="ok">ਠੀਕ ਹੈ</string>
+ <string name="connection">ਕਨੈਕਸ਼ਨ</string>
+ <string name="forget_title">ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਭੁੱਲ ਜਾਓ</string>
+ <string name="forget">ਭੁੱਲ ਜਾਓ</string>
+ <string name="disable">ਬੰਦ ਕਰੋ</string>
+ <string name="enable">ਚਾਲੂ ਕਰੋ</string>
+ <string name="continue_button">ਜਾਰੀ ਰੱਖੋ</string>
+ <string name="retry">ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ</string>
+ <string name="turn_on">ਚਾਲੂ ਕਰੋ</string>
+ <string name="not_now">ਹੁਣੇ ਨਹੀਂ</string>
+ <string name="connected">ਕਨੈਕਟ ਹੈ</string>
+ <string name="notDetected">ਪਤਾ ਨਹੀਂ ਲੱਗਾ</string>
+ <string name="disconnected">ਡਿਸਕਨੈਕਟ ਹੋਇਆ</string>
+ <string name="unknown">ਅਗਿਆਤ</string>
+ <string name="app_running_msg_channel_name">ਫ਼ੋਨ ਦੀ ਲਿਖਤ ਸੁਨੇਹਿਆਂ ਵਾਲੀ ਸੇਵਾ ਚੱਲ ਰਹੀ ਹੈ</string>
+ <string name="app_running_msg_notification_title">ਫ਼ੋਨ ਦੀ ਲਿਖਤ ਸੁਨੇਹਿਆਂ ਵਾਲੀ ਸੇਵਾ ਕਿਰਿਆਸ਼ੀਲ ਹੈ</string>
+ <string name="app_running_msg_notification_content">ਸੰਬੰਧੀ ਡੀਵਾਈਸ ਰਾਹੀਂ ਲਿਖਤ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ</string>
+ <string name="trusted_device_feature_title">ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਫ਼ੋਨ ਨਾਲ ਅਣਲਾਕ ਕਰੋ</string>
+ <string name="trusted_device_feature_instruction">ਅਣਲਾਕ ਕਰਨ ਦੇ ਵਿਕਲਪ ਸੈੱਟ ਕਰਨ ਲਈ ਆਪਣੀ ਸੰਬੰਧੀ ਐਪ ਦੀ ਜਾਂਚ ਕਰੋ</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; ਨੂੰ ਮੇਰਾ ਪ੍ਰੋਫਾਈਲ ਅਣਲਾਕ ਕਰਨ ਦਿਓ</string>
+ <string name="device_not_connected_dialog_title">ਤੁਹਾਡਾ ਫ਼ੋਨ ਕਿਰਿਆਸ਼ੀਲ ਤੌਰ \'ਤੇ ਕਨੈਕਟ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ</string>
+ <string name="device_not_connected_dialog_message">ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਹਾਡੇ ਫ਼ੋਨ ਅਤੇ ਕਾਰ ਵਿੱਚ ਬਲੂਟੁੱਥ ਚਾਲੂ ਹੈ ਅਤੇ ਉਹ ਇੱਕ ਦੂਜੇ ਦੇ ਨੇੜੇ ਹਨ</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; ਹੁਣ ਤੁਹਾਡੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰ ਸਕਦਾ ਹੈ</string>
+ <string name="create_profile_lock_dialog_title">ਮੁੱਖ ਪ੍ਰੋਫਾਈਲ ਲਾਕ ਬਣਾਓ</string>
+ <string name="create_profile_lock_dialog_message">ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਵਾਸਤੇ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਵਰਤਣ ਲਈ, ਤੁਹਾਨੂੰ ਬੈਕਅੱਪ ਦੇ ਤੌਰ \'ਤੇ ਇੱਕ ਮੁੱਖ ਪ੍ਰੋਫਾਈਲ ਲਾਕ ਦੀ ਲੋੜ ਹੈ</string>
+ <string name="unlock_profile_to_finish_title">ਸਮਾਪਤ ਕਰਨ ਲਈ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰੋ</string>
+ <string name="unlock_profile_to_finish_message">ਤੁਸੀਂ ਇੱਕ ਨਵਾਂ ਪ੍ਰੋਫਾਈਲ ਲਾਕ ਬਣਾਇਆ ਹੈ। ਅੱਗੇ, ਇਹ ਤਸਦੀਕ ਕਰਨ ਲਈ ਕਿ ਤੁਹਾਡਾ ਫ਼ੋਨ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਤੁਹਾਡੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰ ਸਕਦਾ ਹੈ, ਇਸਨੂੰ ਦੁਬਾਰਾ ਦਾਖਲ ਕਰੋ</string>
+ <string name="disable_device_connection_text">ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਡਿਸਕਨੈਕਟ ਕਰੋ</string>
+ <string name="enable_device_connection_text">ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਕਨੈਕਟ ਕਰੋ</string>
+ <string name="trusted_device_notification_channel_name">ਫ਼ੋਨ ਨਾਲ ਅਣਲਾਕ ਕਰੋ</string>
+ <string name="trusted_device_notification_title">ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਤੁਹਾਡਾ ਪ੍ਰੋਫਾਈਲ ਅਣਲਾਕ ਕਰਨ ਦਿਓ</string>
+ <string name="trusted_device_notification_content">ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਲਈ ਇੱਥੇ ਟੈਪ ਕਰੋ</string>
+ <string name="trusted_device_enrollment_error_dialog_title">ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ</string>
+ <string name="trusted_device_enrollment_error_dialog_message">ਅਫ਼ਸੋਸ, ਇਸ ਸਮੇਂ ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਚਾਲੂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ। ਕਿਰਪਾ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</string>
+ <string name="create_phone_lock_dialog_title">ਆਪਣੇ ਫ਼ੋਨ \'ਤੇ ਸਕ੍ਰੀਨ ਲਾਕ ਬਣਾਓ</string>
+ <string name="create_phone_lock_dialog_message">ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਨਹੀਂ ਹੈ। ਆਪਣੇ ਫ਼ੋਨ ਨਾਲ ਆਪਣੇ ਕਾਰ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ, ਪਹਿਲਾਂ ਆਪਣੇ ਫ਼ੋਨ ਦੀਆਂ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਸਕ੍ਰੀਨ ਲਾਕ (ਜਿਸਨੂੰ ਪਾਸਕੋਡ ਵੀ ਕਿਹਾ ਜਾਂਦਾ ਹੈ) ਬਣਾਓ।</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d ਨਵਾਂ ਸੁਨੇਹਾ</item>
+ <item quantity="other">%d ਨਵੇਂ ਸੁਨੇਹੇ</item>
+ </plurals>
+ <string name="name_not_available">ਨਾਮ ਉਪਲਬਧ ਨਹੀਂ ਹੈ</string>
</resources>
diff --git a/companiondevice/res/values-pl/strings.xml b/companiondevice/res/values-pl/strings.xml
index 441f766..7b2f76f 100644
--- a/companiondevice/res/values-pl/strings.xml
+++ b/companiondevice/res/values-pl/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,76 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Urządzenie powiązane"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Dodaj powiązane urządzenie"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Połącz urządzenie towarzyszące"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Telefon może służyć Ci jako urządzenie towarzyszące i ułatwiać prowadzenie samochodu"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Na telefonie musi być zainstalowana "<b>"aplikacja towarzysząca"</b></string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Potwierdź kod na telefonie"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Potwierdź zgodność z kodem wyświetlanym na telefonie"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Urządzenie zostało powiązane"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Otwórz aplikację i połącz z samochodem <xliff:g id="CAR_NAME">%1$s</xliff:g>"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Otwórz aplikację i postępuj zgodnie z instrukcjami"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Zapomnieć samochód <xliff:g id="CAR_NAME">%1$s</xliff:g>?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Ten samochód nie będzie już sparowany z tym urządzeniem. Musisz jeszcze usunąć samochód z aplikacji towarzyszącej."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Telefon <xliff:g id="PHONE_NAME">%1$s</xliff:g> został zapomniany"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Nie udało się zapomnieć telefonu <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Kontynuuj konfigurację na telefonie"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Coś poszło nie tak"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Nie udało się poprawnie wyświetlić tego ekranu. Spróbuj ponownie."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Włącz Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Aby skonfigurować telefon jako urządzenie towarzyszące, samochód musi mieć połączenie Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Włączyć Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Aby połączyć się z urządzeniem towarzyszącym, samochód musi mieć połączenie Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Akceptuj"</string>
- <string name="reject" msgid="4315432282758892890">"Odrzuć"</string>
- <string name="confirm" msgid="3748997214719276945">"Potwierdź"</string>
- <string name="cancel" msgid="4306609731174629323">"Anuluj"</string>
- <string name="remove" msgid="5513398257088729188">"Usuń"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Połączenie"</string>
- <string name="forget_title" msgid="3027608547243824729">"Zapomnij to urządzenie"</string>
- <string name="forget" msgid="2069897665699141222">"Zapomnij"</string>
- <string name="disable" msgid="4619854429066283970">"Wyłącz"</string>
- <string name="enable" msgid="7656386199154111316">"Włącz"</string>
- <string name="continue_button" msgid="2748318968566159950">"Dalej"</string>
- <string name="retry" msgid="3783419451480721367">"Spróbuj ponownie"</string>
- <string name="turn_on" msgid="4288754850470994812">"Włącz"</string>
- <string name="not_now" msgid="8764692269093707622">"Nie teraz"</string>
- <string name="connected" msgid="8051190714042020471">"Połączono"</string>
- <string name="notDetected" msgid="4115229772085594506">"Nie wykryto"</string>
- <string name="disconnected" msgid="8526513868622591894">"Odłączono"</string>
- <string name="unknown" msgid="555736316465118024">"Inny"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Usługa SMS-ów z telefonu jest uruchomiona"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Usługa SMS-ów z telefonu jest aktywna"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Odbieranie SMS-ów przez urządzenie towarzyszące"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Odblokowuj profil za pomocą telefonu"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Ustaw opcje odblokowywania w aplikacji towarzyszącej"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Zezwól telefonowi <xliff:g id="PHONE_NAME">%1$s</xliff:g> na odblokowywanie profilu"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefon musi być połączony"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Aby włączyć tę funkcję, upewnij się, że samochód i telefon mają włączony Bluetooth i znajdują się blisko siebie"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"Telefon <xliff:g id="PHONE_NAME">%1$s</xliff:g> może teraz odblokowywać Twój profil"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Utwórz główną blokadę profilu"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Aby odblokowywać profil za pomocą telefonu, główna blokada profilu musi służyć jako blokada zapasowa"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Odblokuj profil, by zakończyć"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Utworzono nową blokadę profilu. Teraz ponownie wprowadź hasło, by potwierdzić, że ten telefon może automatycznie odblokowywać Twój profil."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Odłącz to urządzenie"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Połącz ponownie to urządzenie"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Odblokowuj za pomocą telefonu"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Zezwól telefonowi na odblokowywanie Twojego profilu"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Kliknij tutaj, by autoryzować tę funkcję"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Coś poszło nie tak"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Nie udało się teraz włączyć tej funkcji. Spróbuj ponownie."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Utwórz blokadę ekranu na telefonie"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Twój telefon nie ma ustawionej blokady ekranu. Aby odblokowywać profil samochodu za pomocą telefonu, najpierw w ustawieniach telefonu utwórz blokadę ekranu (czyli hasło)."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Urządzenie powiązane</string>
+ <string name="add_device_title">Dodaj urządzenie powiązane</string>
+ <string name="add_associated_device_title">Połącz urządzenie towarzyszące</string>
+ <string name="add_associated_device_instruction">Telefon może służyć Ci jako urządzenie towarzyszące i ułatwiać prowadzenie samochodu</string>
+ <string name="associated_device_install_app">Na telefonie musi być zainstalowana <b>aplikacja towarzysząca</b></string>
+ <string name="associated_device_pairing_code_title">Potwierdź kod na telefonie</string>
+ <string name="associated_device_pairing_message">Potwierdź zgodność z kodem wyświetlanym na telefonie</string>
+ <string name="associated_device_success">Urządzenie zostało powiązane</string>
+ <string name="associated_device_select_device">Otwórz aplikację i połącz się z: &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Otwórz aplikację i postępuj zgodnie z instrukcjami</string>
+ <string name="remove_associated_device_title">Zapomnieć samochód &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Ten samochód nie będzie już sparowany z tym urządzeniem. Musisz jeszcze usunąć samochód z aplikacji towarzyszącej.</string>
+ <string name="device_removed_success_toast_text">Telefon %1$s został zapomniany</string>
+ <string name="device_removed_failure_toast_text">Nie udało się zapomnieć telefonu %1$s</string>
+ <string name="continue_setup_toast_text">Kontynuuj konfigurację na telefonie</string>
+ <string name="error_screen_title">Coś poszło nie tak</string>
+ <string name="error_screen_message">Nie udało się poprawnie wyświetlić tego ekranu. Spróbuj jeszcze raz.</string>
+ <string name="turn_on_bluetooth_title">Włącz Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Aby skonfigurować telefon jako urządzenie towarzyszące, samochód musi mieć połączenie Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Włączyć Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Aby połączyć się z urządzeniem towarzyszącym, samochód musi mieć połączenie Bluetooth.</string>
+ <string name="accept">Akceptuj</string>
+ <string name="reject">Odrzuć</string>
+ <string name="confirm">Potwierdź</string>
+ <string name="cancel">Anuluj</string>
+ <string name="remove">Usuń</string>
+ <string name="ok">OK</string>
+ <string name="connection">Połączenie</string>
+ <string name="forget_title">Zapomnij to urządzenie</string>
+ <string name="forget">Zapomnij</string>
+ <string name="disable">Wyłącz</string>
+ <string name="enable">Włącz</string>
+ <string name="continue_button">Dalej</string>
+ <string name="retry">Spróbuj ponownie</string>
+ <string name="turn_on">Włącz</string>
+ <string name="not_now">Nie teraz</string>
+ <string name="connected">Połączono</string>
+ <string name="notDetected">Nie wykryto</string>
+ <string name="disconnected">Rozłączono</string>
+ <string name="unknown">Brak danych</string>
+ <string name="app_running_msg_channel_name">Usługa SMS-ów z telefonu jest uruchomiona</string>
+ <string name="app_running_msg_notification_title">Usługa SMS-ów z telefonu jest aktywna</string>
+ <string name="app_running_msg_notification_content">Odbieranie SMS-ów przez urządzenie towarzyszące</string>
+ <string name="trusted_device_feature_title">Odblokowuj profil za pomocą telefonu</string>
+ <string name="trusted_device_feature_instruction">Ustaw opcje odblokowywania w aplikacji towarzyszącej</string>
+ <string name="trusted_device_item_title">Zezwalaj telefonowi &lt;b&gt;%1$s&lt;/b&gt; na odblokowywanie profilu</string>
+ <string name="device_not_connected_dialog_title">Telefon musi być połączony</string>
+ <string name="device_not_connected_dialog_message">Aby można było włączyć tę funkcję, samochód i telefon muszą mieć włączony Bluetooth i znajdować się blisko siebie</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; może teraz odblokowywać Twój profil</string>
+ <string name="create_profile_lock_dialog_title">Utwórz główną blokadę profilu</string>
+ <string name="create_profile_lock_dialog_message">Aby odblokowywać profil za pomocą telefonu, główna blokada profilu musi służyć jako blokada zapasowa</string>
+ <string name="unlock_profile_to_finish_title">Aby zakończyć, odblokuj profil</string>
+ <string name="unlock_profile_to_finish_message">Utworzono nową blokadę profilu. Teraz ponownie wprowadź hasło, by potwierdzić, że ten telefon może automatycznie odblokowywać Twój profil.</string>
+ <string name="disable_device_connection_text">Odłącz to urządzenie</string>
+ <string name="enable_device_connection_text">Połącz ponownie to urządzenie</string>
+ <string name="trusted_device_notification_channel_name">Odblokowuj za pomocą telefonu</string>
+ <string name="trusted_device_notification_title">Zezwalaj telefonowi na odblokowywanie profilu</string>
+ <string name="trusted_device_notification_content">Kliknij tutaj, by autoryzować tę funkcję</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Coś poszło nie tak</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Nie udało się teraz włączyć tej funkcji. Spróbuj jeszcze raz.</string>
+ <string name="create_phone_lock_dialog_title">Utwórz blokadę ekranu na telefonie</string>
+ <string name="create_phone_lock_dialog_message">Twój telefon nie ma ustawionej blokady ekranu. Aby odblokowywać profil w samochodzie za pomocą telefonu, najpierw w ustawieniach telefonu utwórz blokadę ekranu (czyli kod dostępu).</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Nowa wiadomość</item>
+ <item quantity="few">%d nowe wiadomości</item>
+ <item quantity="many">%d nowych wiadomości</item>
+ <item quantity="other">%d nowej wiadomości</item>
+ </plurals>
+ <string name="name_not_available">Brak danych o nadawcy</string>
</resources>
diff --git a/companiondevice/res/values-pt-rPT/strings.xml b/companiondevice/res/values-pt-rPT/strings.xml
index 5349cd4..404be98 100644
--- a/companiondevice/res/values-pt-rPT/strings.xml
+++ b/companiondevice/res/values-pt-rPT/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Dispos. associado"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Adicionar dispositivo associado"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Ligue um dispositivo associado"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Pode utilizar o telemóvel como dispositivo associado para ajudar a gerir a experiência de condução."</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Garanta que tem a "<b>"app associada"</b>" instalada no telemóvel."</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Confirme o código no telemóvel"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Confirme se este código corresponde ao código apresentado no seu telemóvel."</string>
- <string name="associated_device_success" msgid="584760065696870256">"O dispositivo foi associado com êxito."</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Abra a app e ligue a &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Abra a app e siga as instruções na app."</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Pretende esquecer &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Este carro deixará de estar sincronizado com este dispositivo. Terá ainda de remover este carro da app associada."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> esquecido."</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Falha ao esquecer <xliff:g id="PHONE_NAME">%1$s</xliff:g>."</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Continue a configuração no telemóvel."</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Ocorreu um erro"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Infelizmente, não foi possível apresentar este ecrã corretamente. Tente novamente."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Ative o Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Para configurar o telemóvel como dispositivo associado, o seu carro precisa do Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Pretende ativar o Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Para ligar ao dispositivo associado, o seu carro precisa do Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Aceitar"</string>
- <string name="reject" msgid="4315432282758892890">"Rejeitar"</string>
- <string name="confirm" msgid="3748997214719276945">"Confirmar"</string>
- <string name="cancel" msgid="4306609731174629323">"Cancelar"</string>
- <string name="remove" msgid="5513398257088729188">"Remover"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Ligação"</string>
- <string name="forget_title" msgid="3027608547243824729">"Esquecer este dispositivo"</string>
- <string name="forget" msgid="2069897665699141222">"Esquecer"</string>
- <string name="disable" msgid="4619854429066283970">"Desativar"</string>
- <string name="enable" msgid="7656386199154111316">"Ativar"</string>
- <string name="continue_button" msgid="2748318968566159950">"Continuar"</string>
- <string name="retry" msgid="3783419451480721367">"Tentar novamente"</string>
- <string name="turn_on" msgid="4288754850470994812">"Ativar"</string>
- <string name="not_now" msgid="8764692269093707622">"Agora não"</string>
- <string name="connected" msgid="8051190714042020471">"Ligado"</string>
- <string name="notDetected" msgid="4115229772085594506">"Não detetado"</string>
- <string name="disconnected" msgid="8526513868622591894">"Desligado"</string>
- <string name="unknown" msgid="555736316465118024">"Desconhecido"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Serviço de mensagens de texto do telemóvel em execução"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Serviço de mensagens de texto do telemóvel ativo."</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"A receber mensagens de texto através do dispositivo associado."</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Desbloqueie o perfil com o telemóvel"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Verifique a sua app associada para definir opções de desbloqueio."</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Permitir que o telemóvel &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; desbloqueie o meu perfil"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"O seu telemóvel tem de estar ativamente ligado"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Para ativar esta funcionalidade, certifique-se de que o carro e o telemóvel têm o Bluetooth ativado e estão próximos um do outro."</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"O telemóvel &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; já pode desbloquear o seu perfil."</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Crie um bloqueio do perfil principal"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Para utilizar o telemóvel para desbloquear o seu perfil, precisa de um bloqueio do perfil principal como alternativa."</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Desbloqueie o seu perfil para terminar"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Criou um novo bloqueio do perfil. Em seguida, introduza-o outra vez para confirmar que o telemóvel pode desbloquear o seu perfil automaticamente."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Desligue este dispositivo"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Volte a ligar este dispositivo"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Desbloquear com o telemóvel"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Permita que o telemóvel desbloqueie o seu perfil"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Toque aqui para autorizar esta funcionalidade."</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Ocorreu um erro"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Infelizmente, não foi possível ativar esta funcionalidade neste momento. Tente novamente."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Crie um bloqueio de ecrã no telemóvel"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"O seu telemóvel não tem um bloqueio de ecrã definido. Para desbloquear o perfil do seu carro com o telemóvel, crie primeiro um bloqueio de ecrã (também conhecido como código secreto) nas definições do telemóvel."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Disposit. associado</string>
+ <string name="add_device_title">Adicionar dispositivo associado</string>
+ <string name="add_associated_device_title">Ligue um dispositivo associado</string>
+ <string name="add_associated_device_instruction">Pode utilizar o telemóvel como dispositivo associado para ajudar a gerir a experiência de condução.</string>
+ <string name="associated_device_install_app">Garanta que tem a <b>app associada</b> instalada no telemóvel.</string>
+ <string name="associated_device_pairing_code_title">Confirme o código no telemóvel</string>
+ <string name="associated_device_pairing_message">Confirme se este código corresponde ao código apresentado no seu telemóvel.</string>
+ <string name="associated_device_success">O dispositivo foi associado com êxito.</string>
+ <string name="associated_device_select_device">Abra a app e associe a &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Abra a app e siga as instruções na app.</string>
+ <string name="remove_associated_device_title">Pretende esquecer &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Este carro deixará de estar sincronizado com este dispositivo. Terá ainda de remover este carro da app associada.</string>
+ <string name="device_removed_success_toast_text">%1$s esquecido.</string>
+ <string name="device_removed_failure_toast_text">Falha ao esquecer %1$s.</string>
+ <string name="continue_setup_toast_text">Continue a configuração no telemóvel</string>
+ <string name="error_screen_title">Ocorreu um erro</string>
+ <string name="error_screen_message">Infelizmente, não foi possível apresentar este ecrã corretamente. Tente novamente.</string>
+ <string name="turn_on_bluetooth_title">Ative o Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Para configurar o telemóvel como dispositivo associado, o seu carro precisa do Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Pretende ativar o Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Para ligar ao dispositivo associado, o seu carro precisa do Bluetooth.</string>
+ <string name="accept">Aceitar</string>
+ <string name="reject">Rejeitar</string>
+ <string name="confirm">Confirmar</string>
+ <string name="cancel">Cancelar</string>
+ <string name="remove">Remover</string>
+ <string name="ok">OK</string>
+ <string name="connection">Ligação</string>
+ <string name="forget_title">Esquecer este dispositivo</string>
+ <string name="forget">Esquecer</string>
+ <string name="disable">Desativar</string>
+ <string name="enable">Ativar</string>
+ <string name="continue_button">Continuar</string>
+ <string name="retry">Tentar novamente</string>
+ <string name="turn_on">Ativar</string>
+ <string name="not_now">Agora não</string>
+ <string name="connected">Ligado</string>
+ <string name="notDetected">Não detetado</string>
+ <string name="disconnected">Desligado</string>
+ <string name="unknown">Desconhecido</string>
+ <string name="app_running_msg_channel_name">Serviço de mensagens de texto do telemóvel em execução</string>
+ <string name="app_running_msg_notification_title">Serviço de mensagens de texto do telemóvel ativo</string>
+ <string name="app_running_msg_notification_content">A receber mensagens de texto através do dispositivo associado</string>
+ <string name="trusted_device_feature_title">Desbloqueie o perfil com o telemóvel</string>
+ <string name="trusted_device_feature_instruction">Verifique a sua app associada para definir opções de desbloqueio.</string>
+ <string name="trusted_device_item_title">Permitir que &lt;b&gt;%1$s&lt;/b&gt; desbloqueie o meu perfil</string>
+ <string name="device_not_connected_dialog_title">O seu telemóvel tem de estar ativamente ligado</string>
+ <string name="device_not_connected_dialog_message">Para ativar esta funcionalidade, certifique-se de que o carro e o telemóvel têm o Bluetooth ativado e estão próximos um do outro.</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; já pode desbloquear o seu perfil.</string>
+ <string name="create_profile_lock_dialog_title">Crie um bloqueio do perfil principal</string>
+ <string name="create_profile_lock_dialog_message">Para utilizar o telemóvel para desbloquear o seu perfil, precisa de um bloqueio do perfil principal como alternativa.</string>
+ <string name="unlock_profile_to_finish_title">Desbloqueie o seu perfil para terminar</string>
+ <string name="unlock_profile_to_finish_message">Criou um novo bloqueio do perfil. Em seguida, introduza-o outra vez para confirmar que o telemóvel pode desbloquear o seu perfil automaticamente.</string>
+ <string name="disable_device_connection_text">Desligue este dispositivo</string>
+ <string name="enable_device_connection_text">Volte a ligar este dispositivo</string>
+ <string name="trusted_device_notification_channel_name">Desbloquear com o telemóvel</string>
+ <string name="trusted_device_notification_title">Permita que o telemóvel desbloqueie o seu perfil</string>
+ <string name="trusted_device_notification_content">Toque aqui para autorizar esta funcionalidade.</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Ocorreu um erro</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Infelizmente, não foi possível ativar esta funcionalidade neste momento. Tente novamente.</string>
+ <string name="create_phone_lock_dialog_title">Crie um bloqueio de ecrã no telemóvel</string>
+ <string name="create_phone_lock_dialog_message">O seu telemóvel não tem um bloqueio de ecrã definido. Para desbloquear o perfil do seu carro com o telemóvel, crie primeiro um bloqueio de ecrã (também conhecido como código secreto) nas definições do telemóvel.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Nova mensagem</item>
+ <item quantity="other">%d novas mensagens</item>
+ </plurals>
+ <string name="name_not_available">Nome não disponível</string>
</resources>
diff --git a/companiondevice/res/values-pt/strings.xml b/companiondevice/res/values-pt/strings.xml
index dc7daff..8be418d 100644
--- a/companiondevice/res/values-pt/strings.xml
+++ b/companiondevice/res/values-pt/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Disposit. associado"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Adicionar dispositivo associado"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Conectar um dispositivo complementar"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Use o smartphone como dispositivo complementar para ajudar a gerenciar sua experiência na direção"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Veja se o "<b>"aplicativo Companion"</b>" está instalado no smartphone"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Confirmar o código no smartphone"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Confirme se este valor corresponde ao código exibido no smartphone"</string>
- <string name="associated_device_success" msgid="584760065696870256">"A associação do dispositivo foi concluída"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Abra e conecte o app: &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Abra o app e siga as instruções dele"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Esquecer o carro &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Este carro não será mais pareado com o dispositivo. Além disso, você precisará remover o carro do aplicativo Companion."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"O smartphone <xliff:g id="PHONE_NAME">%1$s</xliff:g> foi esquecido"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Falha ao esquecer o smartphone <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Continue a configuração no seu smartphone"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Algo deu errado"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Não foi possível exibir a tela da maneira correta. Tente novamente."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Ativar Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Para configurar o smartphone como dispositivo complementar, o carro precisa usar o recurso de Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Ativar o Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Para fazer a conexão com o dispositivo complementar, o carro precisa usar o recurso de Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Aceitar"</string>
- <string name="reject" msgid="4315432282758892890">"Recusar"</string>
- <string name="confirm" msgid="3748997214719276945">"Confirmar"</string>
- <string name="cancel" msgid="4306609731174629323">"Cancelar"</string>
- <string name="remove" msgid="5513398257088729188">"Remover"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Conexão"</string>
- <string name="forget_title" msgid="3027608547243824729">"Esquecer este dispositivo"</string>
- <string name="forget" msgid="2069897665699141222">"Esquecer"</string>
- <string name="disable" msgid="4619854429066283970">"Desativar"</string>
- <string name="enable" msgid="7656386199154111316">"Ativar"</string>
- <string name="continue_button" msgid="2748318968566159950">"Continuar"</string>
- <string name="retry" msgid="3783419451480721367">"Tentar novamente"</string>
- <string name="turn_on" msgid="4288754850470994812">"Ativar"</string>
- <string name="not_now" msgid="8764692269093707622">"Agora não"</string>
- <string name="connected" msgid="8051190714042020471">"Conectado"</string>
- <string name="notDetected" msgid="4115229772085594506">"Não detectado"</string>
- <string name="disconnected" msgid="8526513868622591894">"Desconectado"</string>
- <string name="unknown" msgid="555736316465118024">"Desconhecido"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Serviço de mensagens de texto em funcionamento no smartphone"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Serviço de mensagens de texto ativo no smartphone"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Recebendo mensagens de texto via dispositivo complementar"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Desbloquear perfil usando o smartphone"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Verifique seu aplicativo Companion para definir opções de desbloqueio"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Permitir que o smartphone &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; desbloqueie meu perfil"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Seu telefone precisa estar conectado"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Para usar esse recurso, verifique se o Bluetooth está ativado no carro e no smartphone e se o veículo e o dispositivo estão próximos um do outro"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"O smartphone &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; já pode desbloquear seu perfil"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Criar um bloqueio de perfil principal"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Ao usar o smartphone para desbloquear seu perfil, você precisará de um bloqueio de perfil principal como backup"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Desbloquear seu perfil para finalizar"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Você criou um novo bloqueio de perfil. Digite a senha outra vez para confirmar que o smartphone pode desbloquear o perfil automaticamente"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Desconectar este dispositivo"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Reconectar este dispositivo"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Desbloquear usando o smartphone"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Permitir que o smartphone desbloqueie seu perfil"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Toque aqui para autorizar este recurso"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Algo deu errado"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"No momento, não é possível ativar este recurso. Tente novamente."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Criar um bloqueio de tela no smartphone"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Não há um bloqueio de tela definido no smartphone. Para desbloquear o perfil do carro, crie primeiro um bloqueio de tela (também conhecido como senha) nas configurações do smartphone."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Disposit. associado</string>
+ <string name="add_device_title">Adicionar dispositivo associado</string>
+ <string name="add_associated_device_title">Conectar um dispositivo complementar</string>
+ <string name="add_associated_device_instruction">Use o smartphone como dispositivo complementar para ajudar a gerenciar sua experiência na direção</string>
+ <string name="associated_device_install_app">Veja se o <b>aplicativo Companion</b> está instalado no smartphone</string>
+ <string name="associated_device_pairing_code_title">Confirmar o código no smartphone</string>
+ <string name="associated_device_pairing_message">Confirme se este valor corresponde ao código exibido no smartphone</string>
+ <string name="associated_device_success">A associação do dispositivo foi concluída</string>
+ <string name="associated_device_select_device">Abra e conecte o app a: &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Abra o app e siga as instruções dele</string>
+ <string name="remove_associated_device_title">Esquecer &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Este carro não será mais pareado com o dispositivo. Além disso, você precisará remover o carro do aplicativo Companion.</string>
+ <string name="device_removed_success_toast_text">O smartphone %1$s foi esquecido</string>
+ <string name="device_removed_failure_toast_text">Falha ao esquecer o smartphone %1$s</string>
+ <string name="continue_setup_toast_text">Continue a configuração no seu smartphone</string>
+ <string name="error_screen_title">Algo deu errado</string>
+ <string name="error_screen_message">Não foi possível exibir a tela da maneira correta. Tente novamente.</string>
+ <string name="turn_on_bluetooth_title">Ativar Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Para configurar o smartphone como dispositivo complementar, o carro precisa usar o recurso de Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Ativar o Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Para fazer a conexão com o dispositivo complementar, o carro precisa usar o recurso de Bluetooth.</string>
+ <string name="accept">Aceitar</string>
+ <string name="reject">Recusar</string>
+ <string name="confirm">Confirmar</string>
+ <string name="cancel">Cancelar</string>
+ <string name="remove">Remover</string>
+ <string name="ok">Ok</string>
+ <string name="connection">Conexão</string>
+ <string name="forget_title">Esquecer este dispositivo</string>
+ <string name="forget">Esquecer</string>
+ <string name="disable">Desativar</string>
+ <string name="enable">Ativar</string>
+ <string name="continue_button">Continuar</string>
+ <string name="retry">Tentar novamente</string>
+ <string name="turn_on">Ativar</string>
+ <string name="not_now">Agora não</string>
+ <string name="connected">Conectado</string>
+ <string name="notDetected">Não detectado</string>
+ <string name="disconnected">Desconectado</string>
+ <string name="unknown">Desconhecido</string>
+ <string name="app_running_msg_channel_name">Serviço de mensagens de texto em funcionamento no smartphone</string>
+ <string name="app_running_msg_notification_title">Serviço de mensagens de texto ativo no smartphone</string>
+ <string name="app_running_msg_notification_content">Recebendo mensagens de texto via dispositivo complementar</string>
+ <string name="trusted_device_feature_title">Desbloquear perfil usando o smartphone</string>
+ <string name="trusted_device_feature_instruction">Verifique seu aplicativo Companion para definir opções de desbloqueio</string>
+ <string name="trusted_device_item_title">Permitir que o smartphone &lt;b&gt;%1$s&lt;/b&gt; desbloqueie meu perfil</string>
+ <string name="device_not_connected_dialog_title">Seu telefone precisa estar conectado</string>
+ <string name="device_not_connected_dialog_message">Para usar esse recurso, verifique se o Bluetooth está ativado no carro e no smartphone e se o veículo e o dispositivo estão próximos um do outro</string>
+ <string name="trusted_device_enrollment_success_message">Agora o smartphone &lt;b&gt;%1$s&lt;/b&gt; pode desbloquear seu perfil</string>
+ <string name="create_profile_lock_dialog_title">Criar um bloqueio de perfil principal</string>
+ <string name="create_profile_lock_dialog_message">Ao usar o smartphone para desbloquear seu perfil, você precisará de um bloqueio de perfil principal como backup</string>
+ <string name="unlock_profile_to_finish_title">Desbloquear seu perfil para finalizar</string>
+ <string name="unlock_profile_to_finish_message">Você criou um novo bloqueio de perfil. Digite a senha outra vez para confirmar que o smartphone pode desbloquear o perfil automaticamente</string>
+ <string name="disable_device_connection_text">Desconectar este dispositivo</string>
+ <string name="enable_device_connection_text">Reconectar este dispositivo</string>
+ <string name="trusted_device_notification_channel_name">Desbloquear usando o smartphone</string>
+ <string name="trusted_device_notification_title">Permitir que o smartphone desbloqueie seu perfil</string>
+ <string name="trusted_device_notification_content">Toque aqui para autorizar este recurso</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Algo deu errado</string>
+ <string name="trusted_device_enrollment_error_dialog_message">No momento, não é possível ativar este recurso. Tente novamente.</string>
+ <string name="create_phone_lock_dialog_title">Criar um bloqueio de tela no smartphone</string>
+ <string name="create_phone_lock_dialog_message">Não há um bloqueio de tela definido no smartphone. Para desbloquear o perfil do carro, crie primeiro um bloqueio de tela (também conhecido como senha) nas configurações do smartphone.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d nova mensagem</item>
+ <item quantity="other">%d novas mensagens</item>
+ </plurals>
+ <string name="name_not_available">Nome indisponível</string>
</resources>
diff --git a/companiondevice/res/values-ro/strings.xml b/companiondevice/res/values-ro/strings.xml
index efcdda5..bbb64b1 100644
--- a/companiondevice/res/values-ro/strings.xml
+++ b/companiondevice/res/values-ro/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,75 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Dispozitiv asociat"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Adăugați un dispozitiv asociat"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Conectați un dispozitiv însoțitor"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Puteți folosi telefonul ca dispozitiv însoțitor cu care să gestionați experiența de condus"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Asigurați-vă că ați instalat "<b>"aplicația Companion"</b>" pe telefon"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Confirmați codul pe telefon"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Confirmați potrivirea cu codul afișat pe telefon"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Dispozitivul a fost asociat"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Deschideți aplicația și conectați-vă la &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Deschideți aplicația și urmați instrucțiunile"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Ștergeți &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Mașina nu va mai fi asociată cu acest dispozitiv. Va trebui să ștergeți mașina din aplicația Companion."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> a fost șters"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Nu s-a putut șterge <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Continuați configurarea pe telefon"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"A apărut o eroare"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Ecranul nu a putut fi afișat corect. Încercați din nou."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Activați Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Mașina are nevoie de Bluetooth pentru a configura telefonul ca dispozitiv însoțitor."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Activați Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Mașina are nevoie de Bluetooth pentru a se conecta la dispozitivul însoțitor."</string>
- <string name="accept" msgid="1454710793329618813">"Accept"</string>
- <string name="reject" msgid="4315432282758892890">"Respingeți"</string>
- <string name="confirm" msgid="3748997214719276945">"Confirmați"</string>
- <string name="cancel" msgid="4306609731174629323">"Anulați"</string>
- <string name="remove" msgid="5513398257088729188">"Eliminați"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Conexiune"</string>
- <string name="forget_title" msgid="3027608547243824729">"Ștergeți dispozitivul"</string>
- <string name="forget" msgid="2069897665699141222">"Ștergeți"</string>
- <string name="disable" msgid="4619854429066283970">"Dezactivați"</string>
- <string name="enable" msgid="7656386199154111316">"Activați"</string>
- <string name="continue_button" msgid="2748318968566159950">"Continuați"</string>
- <string name="retry" msgid="3783419451480721367">"Încercați din nou"</string>
- <string name="turn_on" msgid="4288754850470994812">"Activați"</string>
- <string name="not_now" msgid="8764692269093707622">"Nu acum"</string>
- <string name="connected" msgid="8051190714042020471">"Conectat"</string>
- <string name="notDetected" msgid="4115229772085594506">"Nu s-a detectat"</string>
- <string name="disconnected" msgid="8526513868622591894">"Deconectat"</string>
- <string name="unknown" msgid="555736316465118024">"Necunoscut"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Serviciul de mesaje text de pe telefon rulează"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Serviciul de mesaje text de pe telefon este activ"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Se primesc mesaje text prin intermediul dispozitivului însoțitor"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Deblocați profilul folosind telefonul"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Verificați aplicația Companion pentru a seta opțiunile de deblocare"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Permite ca &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; să-mi deblocheze profilul"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefonul trebuie să fie conectat în mod activ"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Pentru a activa funcția, asigurați-vă că Bluetooth este activat pe mașină și pe telefon și că mașina și telefonul sunt aproape unul de celălalt."</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; vă poate debloca acum profilul"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Creați o blocare pentru profilul principal"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Pentru a folosi telefonul ca să deblocați profilul, aveți nevoie de o blocare pentru profilul principal ca rezervă"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Deblocați profilul pentru a termina"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Ați creat o nouă blocare pentru profil. Introduceți-o din nou la pasul următor pentru a confirma că telefonul vă poate debloca automat profilul"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Deconectați dispozitivul"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Reconectați dispozitivul"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Deblocați folosind telefonul"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Permiteți telefonului să vă deblocheze profilul"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Atingeți aici pentru a permite această funcție"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"A apărut o eroare"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Momentan, funcția nu poate fi activată. Încercați din nou."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Creați o blocare a ecranului pe telefon"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Telefonul nu are activată blocarea ecranului. Pentru a debloca profilul mașinii folosind telefonul, mai întâi creați o blocare a ecranului (numită și parolă) în setările telefonului."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Dispozitiv asociat</string>
+ <string name="add_device_title">Adăugați un dispozitiv asociat</string>
+ <string name="add_associated_device_title">Conectați un dispozitiv însoțitor</string>
+ <string name="add_associated_device_instruction">Puteți folosi telefonul ca dispozitiv însoțitor cu care să gestionați experiența de condus</string>
+ <string name="associated_device_install_app">Verificați dacă ați instalat <b>aplicația parteneră</b> pe telefon</string>
+ <string name="associated_device_pairing_code_title">Confirmați codul pe telefon</string>
+ <string name="associated_device_pairing_message">Confirmați potrivirea cu codul afișat pe telefon</string>
+ <string name="associated_device_success">Dispozitivul a fost asociat</string>
+ <string name="associated_device_select_device">Deschideți aplicația și conectați-vă la &lt;b&gt;%1$s&lt;b&gt;</string>
+ <string name="associated_device_open_app">Deschideți aplicația și urmați instrucțiunile</string>
+ <string name="remove_associated_device_title">Ștergeți &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Mașina nu va mai fi asociată cu acest dispozitiv. Va trebui să ștergeți mașina din aplicația parteneră.</string>
+ <string name="device_removed_success_toast_text">%1$s a fost șters</string>
+ <string name="device_removed_failure_toast_text">Nu s-a putut șterge %1$s</string>
+ <string name="continue_setup_toast_text">Continuați configurarea pe telefon</string>
+ <string name="error_screen_title">A apărut o eroare</string>
+ <string name="error_screen_message">Ecranul nu a putut fi afișat corect. Încercați din nou.</string>
+ <string name="turn_on_bluetooth_title">Activați Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Mașina are nevoie de Bluetooth pentru a configura telefonul ca dispozitiv însoțitor.</string>
+ <string name="turn_on_bluetooth_dialog_title">Activați Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Mașina are nevoie de Bluetooth pentru a se conecta la dispozitivul însoțitor.</string>
+ <string name="accept">Acceptați</string>
+ <string name="reject">Respingeți</string>
+ <string name="confirm">Confirmați</string>
+ <string name="cancel">Anulați</string>
+ <string name="remove">Excludeți</string>
+ <string name="ok">OK</string>
+ <string name="connection">Conexiune</string>
+ <string name="forget_title">Ștergeți dispozitivul</string>
+ <string name="forget">Ștergeți</string>
+ <string name="disable">Dezactivați</string>
+ <string name="enable">Activați</string>
+ <string name="continue_button">Continuați</string>
+ <string name="retry">Reîncercați</string>
+ <string name="turn_on">Activați</string>
+ <string name="not_now">Nu acum</string>
+ <string name="connected">Conectat</string>
+ <string name="notDetected">Nu s-a detectat</string>
+ <string name="disconnected">Deconectat</string>
+ <string name="unknown">Necunoscut</string>
+ <string name="app_running_msg_channel_name">Serviciul de mesaje text de pe telefon rulează</string>
+ <string name="app_running_msg_notification_title">Serviciul de mesaje text de pe telefon este activ</string>
+ <string name="app_running_msg_notification_content">Se primesc mesaje text prin intermediul dispozitivului însoțitor</string>
+ <string name="trusted_device_feature_title">Deblocați profilul folosind telefonul</string>
+ <string name="trusted_device_feature_instruction">Verificați aplicația parteneră pentru a seta opțiunile de deblocare</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; îmi poate debloca profilul</string>
+ <string name="device_not_connected_dialog_title">Telefonul trebuie să fie conectat în mod activ</string>
+ <string name="device_not_connected_dialog_message">Pentru a activa funcția, asigurați-vă că mașina și telefonul au Bluetooth activat și că sunt apropiate.</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; vă poate debloca profilul</string>
+ <string name="create_profile_lock_dialog_title">Creați o blocare principală pentru profil</string>
+ <string name="create_profile_lock_dialog_message">Pentru a folosi telefonul ca să deblocați profilul, aveți nevoie de o blocare principală pentru profil ca opțiune de rezervă</string>
+ <string name="unlock_profile_to_finish_title">Deblocați profilul pentru a termina</string>
+ <string name="unlock_profile_to_finish_message">Ați creat o nouă blocare pentru profil. Introduceți-o din nou la pasul următor pentru a confirma că telefonul vă poate debloca automat profilul</string>
+ <string name="disable_device_connection_text">Deconectați dispozitivul</string>
+ <string name="enable_device_connection_text">Reconectați dispozitivul</string>
+ <string name="trusted_device_notification_channel_name">Deblocați folosind telefonul</string>
+ <string name="trusted_device_notification_title">Permiteți telefonului să vă deblocheze profilul</string>
+ <string name="trusted_device_notification_content">Atingeți aici pentru a permite această funcție</string>
+ <string name="trusted_device_enrollment_error_dialog_title">A apărut o eroare</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Momentan, funcția nu poate fi activată. Încercați din nou.</string>
+ <string name="create_phone_lock_dialog_title">Creați o blocare a ecranului pe telefon</string>
+ <string name="create_phone_lock_dialog_message">Telefonul nu are activată blocarea ecranului. Pentru a debloca profilul mașinii folosind telefonul, mai întâi creați o blocare a ecranului (numită și parolă) în setările telefonului.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Mesaj nou</item>
+ <item quantity="few">%d mesaje noi</item>
+ <item quantity="other">%d de mesaje noi</item>
+ </plurals>
+ <string name="name_not_available">Numele nu este disponibil</string>
</resources>
diff --git a/companiondevice/res/values-ru/strings.xml b/companiondevice/res/values-ru/strings.xml
index 1995fb0..602ee98 100644
--- a/companiondevice/res/values-ru/strings.xml
+++ b/companiondevice/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,76 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Связанное устройство"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Добавить связанное устройство"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Подключение вспомогательного устройства"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Для удобства вождения можно подключить телефон в качестве вспомогательного устройства."</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Установите на телефон "<b>"сопутствующее приложение"</b>"."</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Подтверждение кода на телефоне"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Убедитесь, что коды на экранах автомобиля и телефона совпадают."</string>
- <string name="associated_device_success" msgid="584760065696870256">"Связь с устройством установлена."</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"В приложении подключитесь к автомобилю <xliff:g id="CAR_NAME">%1$s</xliff:g>."</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Откройте приложение и следуйте инструкциям в нем."</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Удалить автомобиль &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Автомобиль больше не будет связан с этим устройством. Вам также нужно будет удалить автомобиль из сопутствующего приложения."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Устройство \"<xliff:g id="PHONE_NAME">%1$s</xliff:g>\" удалено."</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Не удалось удалить устройство \"<xliff:g id="PHONE_NAME">%1$s</xliff:g>\"."</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Продолжите настройку на телефоне."</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Ошибка"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Не удалось корректно отобразить экран. Повторите попытку."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Включите Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Чтобы вы могли настроить телефон в качестве вспомогательного устройства, автомобилю требуется Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Включить Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Для подключения к вспомогательному устройству автомобилю требуется Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Принять"</string>
- <string name="reject" msgid="4315432282758892890">"Отклонить"</string>
- <string name="confirm" msgid="3748997214719276945">"ОК"</string>
- <string name="cancel" msgid="4306609731174629323">"Отмена"</string>
- <string name="remove" msgid="5513398257088729188">"Удалить"</string>
- <string name="ok" msgid="2825038997730899083">"ОК"</string>
- <string name="connection" msgid="2798490936433656846">"Подключение"</string>
- <string name="forget_title" msgid="3027608547243824729">"Удалить устройство"</string>
- <string name="forget" msgid="2069897665699141222">"Удалить"</string>
- <string name="disable" msgid="4619854429066283970">"Отключить"</string>
- <string name="enable" msgid="7656386199154111316">"Включить"</string>
- <string name="continue_button" msgid="2748318968566159950">"Продолжить"</string>
- <string name="retry" msgid="3783419451480721367">"Повторить"</string>
- <string name="turn_on" msgid="4288754850470994812">"Включить"</string>
- <string name="not_now" msgid="8764692269093707622">"Не сейчас"</string>
- <string name="connected" msgid="8051190714042020471">"Подключено"</string>
- <string name="notDetected" msgid="4115229772085594506">"Не обнаружено"</string>
- <string name="disconnected" msgid="8526513868622591894">"Не подключено"</string>
- <string name="unknown" msgid="555736316465118024">"Неизвестно"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Сообщения с телефона синхронизированы"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Сообщения с телефона синхронизированы"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Получение сообщений через вспомогательное устройство…"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Разблокировка с помощью телефона"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Настроить параметры снятия блокировки можно в сопутствующем приложении."</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Разрешить разблокировку профиля с помощью телефона &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Телефон должен быть подключен"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Для работы функции телефон должен находиться в автомобиле, при этом на обоих необходимо включить Bluetooth."</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"Теперь вы можете разблокировать профиль с помощью телефона &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&amp;gt."</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Настройка основного способа блокировки профиля"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Чтобы вы могли разблокировать профиль с помощью телефона, на автомобиле должен быть настроен основной способ блокировки профиля."</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Чтобы завершить настройку, разблокируйте профиль"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Вы настроили новый способ блокировки профиля. Введите код снова, чтобы разрешить телефону автоматически разблокировать профиль."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Отключить устройство"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Подключиться к устройству"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Разблокировка с помощью телефона"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Разрешить разблокировку профиля с помощью телефона?"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Нажмите, чтобы разрешить."</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Ошибка"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Не удалось включить эту функцию. Повторите попытку."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Блокировка экрана телефона"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"На телефоне не настроена блокировка экрана. Чтобы разблокировать профиль автомобиля с помощью телефона, сначала включите в настройках телефона блокировку экрана (задайте код доступа)."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Связанное устройство</string>
+ <string name="add_device_title">Добавить связанное устройство</string>
+ <string name="add_associated_device_title">Подключение вспомогательного устройства</string>
+ <string name="add_associated_device_instruction">В качестве вспомогательного устройства для удобства вождения можно использовать телефон.</string>
+ <string name="associated_device_install_app">Установите <b>сопутствующее приложение</b> на телефон.</string>
+ <string name="associated_device_pairing_code_title">Подтверждение кода на телефоне</string>
+ <string name="associated_device_pairing_message">Убедитесь, что коды на экранах автомобиля и телефона совпадают.</string>
+ <string name="associated_device_success">Связь с устройством установлена.</string>
+ <string name="associated_device_select_device">Подключитесь к автомобилю &lt;b&gt;%1$s&lt;/b&gt; в приложении.</string>
+ <string name="associated_device_open_app">Откройте приложение и следуйте инструкциям.</string>
+ <string name="remove_associated_device_title">Удалить автомобиль &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Автомобиль больше не будет связан с этим устройством. Вам также потребуется удалить автомобиль из сопутствующего приложения.</string>
+ <string name="device_removed_success_toast_text">Устройство \"%1$s\" удалено.</string>
+ <string name="device_removed_failure_toast_text">Не удалось удалить устройство \"%1$s\".</string>
+ <string name="continue_setup_toast_text">Продолжите настройку на телефоне.</string>
+ <string name="error_screen_title">Ошибка</string>
+ <string name="error_screen_message">Не удалось корректно отобразить экран. Повторите попытку.</string>
+ <string name="turn_on_bluetooth_title">Включите Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Чтобы настроить телефон в качестве вспомогательного устройства, нужно включить Bluetooth автомобиля.</string>
+ <string name="turn_on_bluetooth_dialog_title">Включить Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Чтобы установить связь со вспомогательным устройством, нужно включить Bluetooth автомобиля.</string>
+ <string name="accept">Принять</string>
+ <string name="reject">Отклонить</string>
+ <string name="confirm">Подтвердить</string>
+ <string name="cancel">Отмена</string>
+ <string name="remove">Удалить</string>
+ <string name="ok">ОК</string>
+ <string name="connection">Подключение</string>
+ <string name="forget_title">Удалить устройство</string>
+ <string name="forget">Удалить</string>
+ <string name="disable">Отключить</string>
+ <string name="enable">Включить</string>
+ <string name="continue_button">Продолжить</string>
+ <string name="retry">Повторить</string>
+ <string name="turn_on">Включить</string>
+ <string name="not_now">Не сейчас</string>
+ <string name="connected">Подключено</string>
+ <string name="notDetected">Не обнаружено</string>
+ <string name="disconnected">Отключено</string>
+ <string name="unknown">Неизвестно</string>
+ <string name="app_running_msg_channel_name">Служба уведомлений о входящих SMS активна</string>
+ <string name="app_running_msg_notification_title">Служба уведомлений о входящих SMS активна.</string>
+ <string name="app_running_msg_notification_content">SMS можно получать через вспомогательное устройство.</string>
+ <string name="trusted_device_feature_title">Разблокировка профиля с помощью телефона</string>
+ <string name="trusted_device_feature_instruction">Настроить параметры разблокировки можно в сопутствующем приложении.</string>
+ <string name="trusted_device_item_title">Разрешите разблокировку профиля с помощью телефона &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="device_not_connected_dialog_title">Нет подключения к телефону</string>
+ <string name="device_not_connected_dialog_message">Убедитесь, что на телефоне и в автомобиле включен Bluetooth и они находятся рядом друг с другом.</string>
+ <string name="trusted_device_enrollment_success_message">Теперь блокировку профиля можно снимать с помощью телефона &lt;b&gt;%1$s&lt;/b&gt;.</string>
+ <string name="create_profile_lock_dialog_title">Настройка основного способа блокировки профиля</string>
+ <string name="create_profile_lock_dialog_message">Чтобы снимать блокировку с помощью телефона, нужно настроить основной способ блокировки профиля.</string>
+ <string name="unlock_profile_to_finish_title">Чтобы завершить настройку, разблокируйте профиль</string>
+ <string name="unlock_profile_to_finish_message">Вы настроили новый способ блокировки профиля. Введите код ещё раз, чтобы разрешить телефону автоматически снимать блокировку профиля.</string>
+ <string name="disable_device_connection_text">Отключить устройство</string>
+ <string name="enable_device_connection_text">Подключить устройство</string>
+ <string name="trusted_device_notification_channel_name">Разблокировка с помощью телефона</string>
+ <string name="trusted_device_notification_title">Разрешить разблокировку профиля с помощью телефона?</string>
+ <string name="trusted_device_notification_content">Нажмите здесь, чтобы включить эту функцию.</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Ошибка</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Не удалось включить эту функцию. Повторите попытку.</string>
+ <string name="create_phone_lock_dialog_title">Настройка блокировки экрана на телефоне</string>
+ <string name="create_phone_lock_dialog_message">На телефоне не настроена блокировка экрана. Чтобы снимать блокировку профиля автомобиля с помощью телефона, сначала включите блокировку экрана, задав код доступа в настройках телефона.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d новое сообщение</item>
+ <item quantity="few">%d новых сообщения</item>
+ <item quantity="many">%d новых сообщений</item>
+ <item quantity="other">%d нового сообщения</item>
+ </plurals>
+ <string name="name_not_available">Имя недоступно</string>
</resources>
diff --git a/companiondevice/res/values-si/strings.xml b/companiondevice/res/values-si/strings.xml
index 39000da..0ff55d3 100644
--- a/companiondevice/res/values-si/strings.xml
+++ b/companiondevice/res/values-si/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"ආශ්‍රිත උපාංගය"</string>
- <string name="add_device_title" msgid="6166003577845888151">"ආශ්‍රිත උපාංගය එක් කරන්න"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"මිත්‍ර උපාංගයක් සම්බන්ධ කරන්න"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"ඔබට ඔබේ ධාවන අත්දැකීම කළමනා කිරීමට උදවු කිරීමට ඔබේ දුරකථනය මිත්‍ර උපාංගයක් ලෙස භාවිත කළ හැක"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"ඔබ ඔබේ දුරකථනයේ "<b>"මිත්‍ර යෙදුම"</b>" ස්ථාපන කර ඇති බව තහවුරු කර ගන්න"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"දුරකථනය මත කේතය තහවුරු කරන්න"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"මෙය ඔබේ දුරකථනයේ පෙන්වනු ලබන කේතයට ගැළපීම තහවුරු කරන්න"</string>
- <string name="associated_device_success" msgid="584760065696870256">"උපාංගය සාර්ථකව ආශ්‍රිත කර ඇත"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"යෙදුම විවෘත කර &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; වෙත සම්බන්ධ කරන්න"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"යෙදුම විවෘත කර එහි උපදෙස් අනුගමනය කරන්න"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; අමතක කරන්නද?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"මෙම මෝටර් රථය තවදුරටත් මෙම උපාංගය සමඟ යුගල නොකෙරේ. ඔබට මෙම මෝටර් රථය මිත්‍ර යෙදුමෙන් ඉවත් කිරීම අමතරව අවශ්‍ය වෙයි."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> අමතක විය"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> අමතක කිරීමට අසමත් විය"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"ඔබේ දුරකථනයේ සැකසීම කරගෙන යන්න"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"යමක් වැරදිණි"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"අවාසනාවකට මෙන්, මෙම තිරය නිසි පරිදි සංදර්ශන කළ නොහැකි විය. නැවත උත්සාහ කරන්න."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"බ්ලූටූත් සක්‍රීය කරන්න"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"ඔබේ දුරකථනය මිත්‍ර උපාංගයක් ලෙස සැකසීමට, ඔබේ මෝටර් රථයට බ්ලූටූත් අවශ්‍යයි."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"බ්ලූටූත් සක්‍රීය කරන්නද?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"ඔබේ මිත්‍ර උපාංගයට සම්බන්ධ කිරීමට, ඔබේ මෝටර් රථයට බ්ලූටූත් අවශ්‍යයි."</string>
- <string name="accept" msgid="1454710793329618813">"පිළිගන්න"</string>
- <string name="reject" msgid="4315432282758892890">"ප්‍රතික්ෂේප කරන්න"</string>
- <string name="confirm" msgid="3748997214719276945">"තහවුරු කරන්න"</string>
- <string name="cancel" msgid="4306609731174629323">"අවලංගු කරන්න"</string>
- <string name="remove" msgid="5513398257088729188">"ඉවත් කරන්න"</string>
- <string name="ok" msgid="2825038997730899083">"හරි"</string>
- <string name="connection" msgid="2798490936433656846">"සම්බන්ධතාව"</string>
- <string name="forget_title" msgid="3027608547243824729">"මෙම උපාංගය අමතක කරන්න"</string>
- <string name="forget" msgid="2069897665699141222">"අමතක කරන්න"</string>
- <string name="disable" msgid="4619854429066283970">"අබල කරන්න"</string>
- <string name="enable" msgid="7656386199154111316">"සබල කරන්න"</string>
- <string name="continue_button" msgid="2748318968566159950">"ඉදිරියට යන්න"</string>
- <string name="retry" msgid="3783419451480721367">"නැවත උත්සාහ කරන්න"</string>
- <string name="turn_on" msgid="4288754850470994812">"සක්‍රීය කරන්න"</string>
- <string name="not_now" msgid="8764692269093707622">"දැන් නොවේ"</string>
- <string name="connected" msgid="8051190714042020471">"සම්බන්ධයි"</string>
- <string name="notDetected" msgid="4115229772085594506">"අනාවරණ නොවිය"</string>
- <string name="disconnected" msgid="8526513868622591894">"විසන්ධි විය"</string>
- <string name="unknown" msgid="555736316465118024">"නොදනී"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"දුරකථන පෙළ පණිවිඩ සේවය ධාවනය වේ"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"දුරකථන පෙළ පණිවිඩ යැවීමේ සේවය සක්‍රියයි"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"සහායක උපාංගය හරහා පෙළ පණිවිඩ ලැබීම"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"දුරකථනය මඟින් පැතිකඩ අගුලු අරින්න"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"අගුලු ඇරීමේ විකල්ප සැකසීමට ඔබේ මිත්‍ර යෙදුම පරීක්‍ෂා කරන්න"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; හට මගේ පැතිකඩ අගුලු ඇරීමට ඉඩ දෙන්න"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"ඔබේ දුරකථනය ක්‍රියාකාරීව සම්බන්ධ කර තිබිය යුතුම ය"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"මෙම විශේෂාංගය සක්‍රීය කිරීමට, ඔබේ මෝටර් රථයේ සහ දුරකථනයේ බ්ලූටූත් සක්‍රීය කර ඇති අතර ඒවා එකිනෙකට ළඟ තිබීම තහවුරු කර ගන්න"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; හට දැන් ඔබේ පැතිකඩ අගුලු ඇරිය හැක"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"මූලික පැතිකඩ අගුලක් සාදන්න"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"ඔබේ පැතිකඩ අගුලු ඇරීමට ඔබේ දුරකථනය භාවිත කිරීමට, ඔබට උපස්ථයක් වශයෙන් මූලික පැතිකඩ අගුලක් අවශ්‍යයි"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"අවසන් කිරීමට ඔබේ පැතිකඩ අගුලු අරින්න"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"ඔබ නව පැතිකඩ අගුලක් සාදා ඇත. ඊළඟට, ඔබේ දුරකථනයට ඔබේ පැතිකඩ ස්වයංක්‍රීයව අගුලු ඇරිය හැකි බව තහවුරු කිරීමට එය නැවත ඇතුළත් කරන්න"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"මෙම උපාංගය විසන්ධි කරන්න"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"මෙම උපාංගය යළි සම්බන්ධ කරන්න"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"දුරකථනය මඟින් අගුලු අරින්න"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"ඔබේ දුරකථනයට ඔබේ පැතිකඩ අගුලු ඇරීමට ඉඩ දෙන්න"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"මෙම විශේෂාංගය අනුමත කිරීමට මෙහි තට්ටු කරන්න"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"යමක් වැරදිණි"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"අවාසනාවකට මෙන්, මේ අවස්ථාවේදී මෙම විශේෂාංගය සක්‍රීය කළ නොහැකි විය. නැවත උත්සාහ කරන්න."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"ඔබේ දුරකථනයේ තිර අගුලක් සාදන්න"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"ඔබේ දුරකථනයට තිර අගුලක් සකසා නැත. ඔබේ දුරකථනය මඟින් ඔබේ මෝටර් රථය අගුලු ඇරීමට, පළමුව ඔබේ දුරකථන සැකසීම් තුළ තිර අගුලක් (මුර කේතය ලෙස ද හැඳින්වේ) සාදන්න."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">ආශ්‍රිත උපාංගය</string>
+ <string name="add_device_title">ආශ්‍රිත උපාංගය එක් කරන්න</string>
+ <string name="add_associated_device_title">මිත්‍ර උපාංගයක් සම්බන්ධ කරන්න</string>
+ <string name="add_associated_device_instruction">ඔබට ඔබේ ධාවන අත්දැකීම කළමනාකරණය කිරීමට උදවු කිරීමට ඔබේ දුරකථනය මිත්‍ර උපාංගයක් ලෙස භාවිත කළ හැකිය</string>
+ <string name="associated_device_install_app">ඔබ ඔබේ දුරකථනයේ <b>මිත්‍ර යෙදුම</b> ස්ථාපනය කර ඇති බව සහතික කර ගන්න</string>
+ <string name="associated_device_pairing_code_title">දුරකථනයේ කේතය තහවුරු කරන්න</string>
+ <string name="associated_device_pairing_message">මෙය ඔබේ දුරකථනයේ පෙන්වනු ලබන කේතයට ගැළපෙන බව තහවුරු කරන්න</string>
+ <string name="associated_device_success">උපාංගය සාර්ථකව ආශ්‍රිත කර ඇත</string>
+ <string name="associated_device_select_device">යෙදුම විවෘත කර &lt;b&gt;%1$s&lt;b&gt; වෙත සබඳින්න</string>
+ <string name="associated_device_open_app">යෙදුම විවෘත කර එහි උපදෙස් අනුගමනය කරන්න</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; අමතක කරන්නද?</string>
+ <string name="remove_associated_device_message">මෙම මෝටර් රථය තවදුරටත් මෙම උපාංගය සමඟ යුගල නොකරනු ඇත. ඔබට මෙම මෝටර් රථය මිත්‍ර යෙදුමෙන් ඉවත් කිරීම අමතරව අවශ්‍ය වනු ඇත.</string>
+ <string name="device_removed_success_toast_text">%1$s අමතක වී ඇත</string>
+ <string name="device_removed_failure_toast_text">%1$s අමතක කිරීමට අසමත් විය</string>
+ <string name="continue_setup_toast_text">ඔබේ දුරකථනයේ පිහිටුවීම දිගටම කරගෙන යන්න</string>
+ <string name="error_screen_title">යම් දෙයක් වැරදිණි</string>
+ <string name="error_screen_message">අවාසනාවකට මෙන්, මෙම තිරය නිසි පරිදි සංදර්ශනය කළ නොහැකි විය. කරුණාකර නැවත උත්සාහ කරන්න.</string>
+ <string name="turn_on_bluetooth_title">බ්ලූටූත් ක්‍රියාත්මක කරන්න</string>
+ <string name="turn_on_bluetooth_message">ඔබේ දුරකථනය මිත්‍ර උපාංගයක් ලෙස සැකසීමට, ඔබේ මෝටර් රථයට බ්ලූටූත් අවශ්‍යයි.</string>
+ <string name="turn_on_bluetooth_dialog_title">බ්ලූටූත් ක්‍රියාත්මක කරන්නද?</string>
+ <string name="turn_on_bluetooth_dialog_message">ඔබේ මිත්‍ර උපාංගයට සම්බන්ධ කිරීමට, ඔබේ මෝටර් රථයට බ්ලූටූත් අවශ්‍යයි.</string>
+ <string name="accept">පිළිගන්න</string>
+ <string name="reject">ප්‍රතික්ෂේප කරන්න</string>
+ <string name="confirm">තහවුරු කරන්න</string>
+ <string name="cancel">අවලංගු කරන්න</string>
+ <string name="remove">ඉවත් කරන්න</string>
+ <string name="ok">හරි</string>
+ <string name="connection">සබැඳුම</string>
+ <string name="forget_title">මෙම උපාංගය අමතක කරන්න</string>
+ <string name="forget">අමතක කරන්න</string>
+ <string name="disable">අබල කරන්න</string>
+ <string name="enable">සබල කරන්න</string>
+ <string name="continue_button">ඉදිරියට යන්න</string>
+ <string name="retry">නැවත උත්සාහ කරන්න</string>
+ <string name="turn_on">ක්‍රියාත්මක කරන්න</string>
+ <string name="not_now">දැන් නොවේ</string>
+ <string name="connected">සම්බන්ධයි</string>
+ <string name="notDetected">අනාවරණය නොවීය</string>
+ <string name="disconnected">විසන්ධි විය</string>
+ <string name="unknown">නොදනී</string>
+ <string name="app_running_msg_channel_name">දුරකථන පෙළ පණිවිඩ සේවය ධාවනය වේ</string>
+ <string name="app_running_msg_notification_title">දුරකථන පෙළ පණිවිඩ යැවීමේ සේවය සක්‍රියයි</string>
+ <string name="app_running_msg_notification_content">මිත්‍ර උපාංගය හරහා පෙළ පණිවිඩ ලැබීම</string>
+ <string name="trusted_device_feature_title">දුරකථනය සමඟින් පැතිකඩ අගුලු අරින්න</string>
+ <string name="trusted_device_feature_instruction">අගුලු හැරීමේ විකල්ප සැකසීමට ඔබේ මිත්‍ර යෙදුම පරීක්‍ෂා කරන්න</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt;ට මගේ පැතිකඩ අගුලු හැරීමට ඉඩ දෙන්න</string>
+ <string name="device_not_connected_dialog_title">ඔබේ දුරකථනය ක්‍රියාකාරීව සම්බන්ධ කර තිබිය යුතුය</string>
+ <string name="device_not_connected_dialog_message">මෙම විශේෂාංගය ක්‍රියාත්මක කිරීමට, ඔබේ මෝටර් රථයේ සහ දුරකථනයේ බ්ලූටූත් ක්‍රියාත්මක කර ඇති අතර ඒවා එකිනෙකට ළඟ තිබීම සහතික කර ගන්න</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt;ට දැන් ඔබගේ පැතිකඩ අගුලු හැරිය හැකිය</string>
+ <string name="create_profile_lock_dialog_title">මූලික පැතිකඩ අගුලක් තනන්න</string>
+ <string name="create_profile_lock_dialog_message">ඔබේ පැතිකඩ අගුලු හැරීමට ඔබේ දුරකථනය භාවිත කිරීමට, ඔබට උපස්ථයක් වශයෙන් මූලික පැතිකඩ අගුලක් අවශ්‍යයි</string>
+ <string name="unlock_profile_to_finish_title">අවසන් කිරීමට ඔබේ පැතිකඩ අගුලු හරින්න</string>
+ <string name="unlock_profile_to_finish_message">ඔබ නව පැතිකඩ අගුලක් තනා ඇත. ඊළඟට, ඔබේ දුරකථනයට ඔබේ පැතිකඩ ස්වයංක්‍රීයව අගුලු හැරිය හැකි බව තහවුරු කිරීමට එය නැවත ඇතුළත් කරන්න</string>
+ <string name="disable_device_connection_text">මෙම උපාංගය විසන්ධි කරන්න</string>
+ <string name="enable_device_connection_text">මෙම උපාංගය යළි සම්බන්ධ කරන්න</string>
+ <string name="trusted_device_notification_channel_name">දුරකථනය සමඟින් අගුලු හරින්න</string>
+ <string name="trusted_device_notification_title">ඔබේ දුරකථනයට ඔබේ පැතිකඩ අගුලු හැරීමට ඉඩ දෙන්න</string>
+ <string name="trusted_device_notification_content">මෙම විශේෂාංගය අනුමත කිරීමට මෙහි තට්ටු කරන්න</string>
+ <string name="trusted_device_enrollment_error_dialog_title">යම් දෙයක් වැරදිණි</string>
+ <string name="trusted_device_enrollment_error_dialog_message">අවාසනාවකට මෙන්, මේ අවස්ථාවේදී මෙම විශේෂාංගය ක්‍රියාත්මක කළ නොහැකි විය. කරුණාකර නැවත උත්සාහ කරන්න.</string>
+ <string name="create_phone_lock_dialog_title">ඔබේ දුරකථනයේ තිර අගුලක් තනන්න</string>
+ <string name="create_phone_lock_dialog_message">ඔබේ දුරකථනයට තිර අගුලක් සකසා නැත. ඔබේ දුරකථනය සමඟින් ඔබේ මෝටර් රථය අගුලු හැරීමට, පළමුව ඔබේ දුරකථන සැකසීම් තුළ තිර අගුලක් (මුර කේතය ලෙසද හැඳින්වේ) තනන්න.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">නව පණිවිඩ %d</item>
+ <item quantity="other">නව පණිවිඩ %d</item>
+ </plurals>
+ <string name="name_not_available">නම ලබා ගත නොහැකිය</string>
</resources>
diff --git a/companiondevice/res/values-sk/strings.xml b/companiondevice/res/values-sk/strings.xml
index c765810..75ac9ef 100644
--- a/companiondevice/res/values-sk/strings.xml
+++ b/companiondevice/res/values-sk/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,76 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Spojené zariadenie"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Pridať spojené zariadenie"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Pripojenie sprievodného zariadenia"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Svoj telefón môžete používať ako sprievodné zariadenie, ktoré vám bude asistovať pri jazde"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Skontrolujte, či máte v telefóne "<b>"sprievodnú aplikáciu"</b></string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Potvrďte kód v telefóne"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Potvrďte, že sa tento kód zhoduje s kódom v telefóne"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Zariadenie bolo úspešne spojené"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Otvorte aplikáciu a pripojte sa k autu <xliff:g id="CAR_NAME">%1$s</xliff:g>"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Otvorte aplikáciu a postupujte podľa pokynov"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Chcete odstrániť auto <xliff:g id="CAR_NAME">%1$s</xliff:g>?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Toto auto už viac nebude spárované s týmto zariadením. Auto tiež bude potrebné odstrániť zo sprievodnej aplikácie."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Telefón <xliff:g id="PHONE_NAME">%1$s</xliff:g> bol odstránený"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Nepodarilo sa odstrániť telefón <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Pokračujte v nastavení v telefóne"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Vyskytol sa problém"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Túto obrazovku sa nepodarilo zobraziť správne. Skúste to znova."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Zapnúť Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Na nastavenie telefónu ako sprievodného zariadenia je vo vašom aute potrebné rozhranie Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Chcete zapnúť rozhranie Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Na pripojenie sprievodného zariadenia je vo vašom aute potrebné rozhranie Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Prijať"</string>
- <string name="reject" msgid="4315432282758892890">"Odmietnuť"</string>
- <string name="confirm" msgid="3748997214719276945">"Potvrdiť"</string>
- <string name="cancel" msgid="4306609731174629323">"Zrušiť"</string>
- <string name="remove" msgid="5513398257088729188">"Odstrániť"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Pripojenie"</string>
- <string name="forget_title" msgid="3027608547243824729">"Odstrániť toto zariadenie"</string>
- <string name="forget" msgid="2069897665699141222">"Odstrániť"</string>
- <string name="disable" msgid="4619854429066283970">"Vypnúť"</string>
- <string name="enable" msgid="7656386199154111316">"Zapnúť"</string>
- <string name="continue_button" msgid="2748318968566159950">"Pokračovať"</string>
- <string name="retry" msgid="3783419451480721367">"Skúsiť znova"</string>
- <string name="turn_on" msgid="4288754850470994812">"Zapnúť"</string>
- <string name="not_now" msgid="8764692269093707622">"Teraz nie"</string>
- <string name="connected" msgid="8051190714042020471">"Pripojené"</string>
- <string name="notDetected" msgid="4115229772085594506">"Nerozpoznané"</string>
- <string name="disconnected" msgid="8526513868622591894">"Odpojené"</string>
- <string name="unknown" msgid="555736316465118024">"Neznáme"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Služba textových správ telefónu je spustená"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Služba textových správ telefónu je aktívna"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Príjem textových správ prostredníctvom sprievodného zariadenia"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Odomykanie profilu telefónom"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Možnosti odomykania môžete nastaviť v sprievodnej aplikácii"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Povoliť telefónu <xliff:g id="PHONE_NAME">%1$s</xliff:g> odomykať môj profil"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefón musí byť aktívne pripojený"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Ak chcete zapnúť túto funkciu, skontrolujte, či je v aute a telefóne zapnuté rozhranie Bluetooth a či sú blízko pri sebe"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> môže odomykať váš profil"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Vytvorenie zámky primárneho profilu"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Ak chcete odomykať profil telefónom, musíte si ako zálohu nastaviť zámku primárneho profilu"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Dokončite nastavenie odomknutím profilu"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Vytvorili ste novú zámku profilu. Pokračujte jej opätovným zadaním a potvrďte tak, že telefón dokáže odomknúť váš profil automaticky."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Odpojiť toto zariadenie"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Znova pripojiť toto zariadenie"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Odomykanie telefónom"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Umožnite telefónu odomykať váš profil"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Ak chcete povoliť túto funkciu, klepnite tu"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Vyskytol sa problém"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Túto funkciu sa momentálne nepodarilo zapnúť. Skúste to znova."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Vytvorte v telefóne zámku obrazovky"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"V telefóne nie je nastavená zámka obrazovky. Ak chcete odomykať profil auta telefónom, najprv si v nastaveniach telefónu vytvorte zámku obrazovky (známa tiež ako vstupný kód)."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Spojené zariadenie</string>
+ <string name="add_device_title">Pridať spojené zariadenie</string>
+ <string name="add_associated_device_title">Pripojenie sprievodného zariadenia</string>
+ <string name="add_associated_device_instruction">Svoj telefón môžete používať ako sprievodné zariadenie, ktoré vám bude asistovať pri jazde</string>
+ <string name="associated_device_install_app">Skontrolujte, či máte v telefóne <b>sprievodnú aplikáciu</b></string>
+ <string name="associated_device_pairing_code_title">Potvrďte kód v telefóne</string>
+ <string name="associated_device_pairing_message">Potvrďte, že sa tento kód zhoduje s kódom v telefóne</string>
+ <string name="associated_device_success">Zariadenie bolo úspešne spojené</string>
+ <string name="associated_device_select_device">Otvorte aplikáciu a pripojte sa k autu &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Otvorte aplikáciu a postupujte podľa pokynov</string>
+ <string name="remove_associated_device_title">Chcete auto &lt;b&gt;%1$s&lt;/b&gt; odstrániť?</string>
+ <string name="remove_associated_device_message">Toto auto už viac nebude spárované s týmto zariadením. Auto tiež bude potrebné odstrániť zo sprievodnej aplikácie.</string>
+ <string name="device_removed_success_toast_text">Telefón %1$s bol odstránený</string>
+ <string name="device_removed_failure_toast_text">Nepodarilo sa odstrániť telefón %1$s</string>
+ <string name="continue_setup_toast_text">Pokračujte v nastavovaní v telefóne</string>
+ <string name="error_screen_title">Vyskytol sa problém</string>
+ <string name="error_screen_message">Túto obrazovku sa nepodarilo zobraziť správne. Skúste to znova.</string>
+ <string name="turn_on_bluetooth_title">Zapnite Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Na nastavenie telefónu ako sprievodného zariadenia je vo vašom aute potrebné rozhranie Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Chcete zapnúť Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Na pripojenie sprievodného zariadenia je vo vašom aute potrebné rozhranie Bluetooth.</string>
+ <string name="accept">Prijať</string>
+ <string name="reject">Odmietnuť</string>
+ <string name="confirm">Potvrdiť</string>
+ <string name="cancel">Zrušiť</string>
+ <string name="remove">Odstrániť</string>
+ <string name="ok">OK</string>
+ <string name="connection">Pripojenie</string>
+ <string name="forget_title">Odstrániť toto zariadenie</string>
+ <string name="forget">Odstrániť</string>
+ <string name="disable">Zakázať</string>
+ <string name="enable">Povoliť</string>
+ <string name="continue_button">Pokračovať</string>
+ <string name="retry">Skúsiť znova</string>
+ <string name="turn_on">Zapnúť</string>
+ <string name="not_now">Teraz nie</string>
+ <string name="connected">Pripojené</string>
+ <string name="notDetected">Nerozpoznané</string>
+ <string name="disconnected">Odpojené</string>
+ <string name="unknown">Neznáme</string>
+ <string name="app_running_msg_channel_name">Služba textových správ telefónu je spustená</string>
+ <string name="app_running_msg_notification_title">Služba textových správ telefónu je aktívna</string>
+ <string name="app_running_msg_notification_content">Príjem textových správ prostredníctvom sprievodného zariadenia</string>
+ <string name="trusted_device_feature_title">Odomykanie profilu telefónom</string>
+ <string name="trusted_device_feature_instruction">Možnosti odomykania môžete nastaviť v sprievodnej aplikácii</string>
+ <string name="trusted_device_item_title">Povoliť telefónu &lt;b&gt;%1$s&lt;/b&gt; odomknúť môj profil</string>
+ <string name="device_not_connected_dialog_title">Telefón musí byť aktívne pripojený</string>
+ <string name="device_not_connected_dialog_message">Ak chcete zapnúť túto funkciu, skontrolujte, či je v aute a telefóne zapnuté rozhranie Bluetooth a či sú blízko pri sebe</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; teraz môže odomknúť váš profil</string>
+ <string name="create_profile_lock_dialog_title">Vytvorenie zámky primárneho profilu</string>
+ <string name="create_profile_lock_dialog_message">Ak chcete odomykať profil telefónom, musíte si ako zálohu nastaviť zámku primárneho profilu</string>
+ <string name="unlock_profile_to_finish_title">Dokončite nastavenie odomknutím profilu</string>
+ <string name="unlock_profile_to_finish_message">Vytvorili ste novú zámku profilu. Pokračujte jej opätovným zadaním a potvrďte tak, že telefón dokáže odomknúť váš profil automaticky.</string>
+ <string name="disable_device_connection_text">Odpojiť toto zariadenie</string>
+ <string name="enable_device_connection_text">Znova pripojiť toto zariadenie</string>
+ <string name="trusted_device_notification_channel_name">Odomykanie telefónom</string>
+ <string name="trusted_device_notification_title">Umožnite telefónu odomykať váš profil</string>
+ <string name="trusted_device_notification_content">Ak chcete povoliť túto funkciu, klepnite tu</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Vyskytol sa problém</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Túto funkciu sa momentálne nepodarilo zapnúť. Skúste to znova.</string>
+ <string name="create_phone_lock_dialog_title">Vytvorte v telefóne zámku obrazovky</string>
+ <string name="create_phone_lock_dialog_message">V telefóne nie je nastavená zámka obrazovky. Ak chcete odomykať profil auta telefónom, najprv si v nastaveniach telefónu vytvorte zámku obrazovky (známa tiež ako vstupný kód).</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Nová správa</item>
+ <item quantity="few">%d nové správy</item>
+ <item quantity="many">%d new messages</item>
+ <item quantity="other">%d nových správ</item>
+ </plurals>
+ <string name="name_not_available">Meno nie je k dispozícii</string>
</resources>
diff --git a/companiondevice/res/values-sl/strings.xml b/companiondevice/res/values-sl/strings.xml
index 4219e55..7c99a76 100644
--- a/companiondevice/res/values-sl/strings.xml
+++ b/companiondevice/res/values-sl/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,76 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Povezana naprava"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Dodaj povezano napravo"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Povezava spremljevalne naprave"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Telefon lahko uporabljate kot spremljevalno napravo za pomoč pri upravljanju vozne izkušnje"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"V telefonu morate imeti nameščeno "<b>"spremljevalno aplikacijo"</b></string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Potrditev kode v telefonu"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Potrdite, da se ujema s kodo, prikazano v telefonu"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Naprava je uspešno povezana"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Odprite aplikacijo in se povežite z avtomobilom &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Odprite aplikacijo in upoštevajte navodila v njej"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Želite odstraniti avtomobil &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Ta avtomobil ne bo več seznanjen s to napravo. Ta avtomobil boste morali tudi odstraniti iz spremljevalne aplikacije."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Telefon <xliff:g id="PHONE_NAME">%1$s</xliff:g> je bil odstranjen"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Telefona <xliff:g id="PHONE_NAME">%1$s</xliff:g> ni bilo mogoče odstraniti"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Nastavitev nadaljujte v telefonu"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Prišlo je do težave"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Tega zaslona ža ni bilo mogoče pravilno prikazati. Poskusite znova."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Vklopi Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Če želite nastaviti telefon kot spremljevalno napravo, avtomobil potrebuje Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Želite vklopiti Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Če želite povezati spremljevalno napravo, avtomobil potrebuje Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Sprejmem"</string>
- <string name="reject" msgid="4315432282758892890">"Zavrni"</string>
- <string name="confirm" msgid="3748997214719276945">"Potrdi"</string>
- <string name="cancel" msgid="4306609731174629323">"Prekliči"</string>
- <string name="remove" msgid="5513398257088729188">"Odstrani"</string>
- <string name="ok" msgid="2825038997730899083">"V redu"</string>
- <string name="connection" msgid="2798490936433656846">"Povezava"</string>
- <string name="forget_title" msgid="3027608547243824729">"Odstrani to napravo"</string>
- <string name="forget" msgid="2069897665699141222">"Odstrani"</string>
- <string name="disable" msgid="4619854429066283970">"Onemogoči"</string>
- <string name="enable" msgid="7656386199154111316">"Omogoči"</string>
- <string name="continue_button" msgid="2748318968566159950">"Naprej"</string>
- <string name="retry" msgid="3783419451480721367">"Poskusi znova"</string>
- <string name="turn_on" msgid="4288754850470994812">"Vklopi"</string>
- <string name="not_now" msgid="8764692269093707622">"Ne zdaj"</string>
- <string name="connected" msgid="8051190714042020471">"Povezano"</string>
- <string name="notDetected" msgid="4115229772085594506">"Ni zaznano"</string>
- <string name="disconnected" msgid="8526513868622591894">"Ni povezave"</string>
- <string name="unknown" msgid="555736316465118024">"Neznano"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Storitev za sporočila SMS prek telefona se izvaja"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Storitev za sporočila SMS prek telefona je aktivna"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Prejemanje sporočil SMS prek spremljevalne naprave"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Odklepanje profila s telefonom"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"V spremljevalni aplikaciji nastavite možnosti odklepanja"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Omogočanje, da telefon &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; odklene moj profil"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefon mora imeti aktivno povezavo"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Če želite vklopiti to funkcijo, poskrbite, da je Bluetooth omogočen v avtomobilu in telefonu ter da sta si blizu"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"S telefonom &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; je zdaj mogoče odkleniti vaš profil"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Ustvarjanje glavnega zaklepanja profila"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Če želite uporabljati telefon za odklepanje profila, morate imeti kot rezervno možnost nastavljeno glavno zaklepanje profila"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Za konec odklenite profil"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Ustvarili ste novo zaklepanje profila. Znova ga vnesite zaradi potrditve, da lahko telefon samodejno odklene vaš profil."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Prekini povezavo s to napravo"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Znova povežite to napravo"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Odklepanje s telefonom"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Omogočite, da telefon odklene vaš profil"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Dotaknite se tukaj, če želite pooblastiti to funkcijo"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Prišlo je do težave"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Te funkcije trenutno žal ni bilo mogoče vklopiti. Poskusite znova."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Ustvarjanje zaklepanja zaslona v telefonu"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"V telefonu še ni nastavljeno zaklepanje zaslona. Če želite odkleniti profil avtomobila s telefonom, v nastavitvah telefona najprej ustvarite zaklepanje zaslona (znano kot geslo)."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Povezana naprava</string>
+ <string name="add_device_title">Dodaj povezano napravo</string>
+ <string name="add_associated_device_title">Povezava spremljevalne naprave</string>
+ <string name="add_associated_device_instruction">Telefon lahko uporabljate kot spremljevalno napravo za pomoč pri upravljanju vozne izkušnje.</string>
+ <string name="associated_device_install_app">V telefonu morate imeti nameščeno <b>spremljevalno aplikacijo</b>.</string>
+ <string name="associated_device_pairing_code_title">Potrditev kode v telefonu</string>
+ <string name="associated_device_pairing_message">Potrdite, da se ujema s kodo, prikazano v telefonu.</string>
+ <string name="associated_device_success">Naprava je uspešno povezana.</string>
+ <string name="associated_device_select_device">Odprite aplikacijo in se povežite z avtomobilom &lt;b&gt;%1$s&lt;b&gt;.</string>
+ <string name="associated_device_open_app">Odprite aplikacijo in upoštevajte navodila v njej.</string>
+ <string name="remove_associated_device_title">Želite pozabiti avtomobil &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Ta avtomobil ne bo več seznanjen s to napravo. Ta avtomobil boste morali tudi odstraniti iz spremljevalne aplikacije.</string>
+ <string name="device_removed_success_toast_text">Telefon %1$s je bil odstranjen.</string>
+ <string name="device_removed_failure_toast_text">Telefona %1$s ni bilo mogoče odstraniti.</string>
+ <string name="continue_setup_toast_text">Nastavitev nadaljujte v telefonu.</string>
+ <string name="error_screen_title">Prišlo je do težave</string>
+ <string name="error_screen_message">Tega zaslona ža ni bilo mogoče pravilno prikazati. Poskusite znova.</string>
+ <string name="turn_on_bluetooth_title">Vklopite Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Če želite nastaviti telefon kot spremljevalno napravo, avtomobil potrebuje Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Želite vklopiti Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Če želite povezati spremljevalno napravo, avtomobil potrebuje Bluetooth.</string>
+ <string name="accept">Sprejmi</string>
+ <string name="reject">Zavrni</string>
+ <string name="confirm">Potrdi</string>
+ <string name="cancel">Prekliči</string>
+ <string name="remove">Odstrani</string>
+ <string name="ok">V redu</string>
+ <string name="connection">Povezava</string>
+ <string name="forget_title">Odstrani to napravo</string>
+ <string name="forget">Pozabi</string>
+ <string name="disable">Onemogoči</string>
+ <string name="enable">Omogoči</string>
+ <string name="continue_button">Naprej</string>
+ <string name="retry">Poskusi znova</string>
+ <string name="turn_on">Vklopi</string>
+ <string name="not_now">Ne zdaj</string>
+ <string name="connected">Povezano</string>
+ <string name="notDetected">Ni zaznano</string>
+ <string name="disconnected">Prekinjeno</string>
+ <string name="unknown">Neznano</string>
+ <string name="app_running_msg_channel_name">Storitev za SMS-je prek telefona se izvaja</string>
+ <string name="app_running_msg_notification_title">Storitev za SMS-je prek telefona je aktivna.</string>
+ <string name="app_running_msg_notification_content">Prejemanje SMS-jev prek spremljevalne naprave.</string>
+ <string name="trusted_device_feature_title">Odklepanje profila s telefonom</string>
+ <string name="trusted_device_feature_instruction">V spremljevalni aplikaciji nastavite možnosti odklepanja.</string>
+ <string name="trusted_device_item_title">Naj &lt;b&gt;%1$s&lt;/b&gt; odklepa moj profil</string>
+ <string name="device_not_connected_dialog_title">Telefon mora imeti aktivno povezavo</string>
+ <string name="device_not_connected_dialog_message">Če želite vklopiti to funkcijo, poskrbite, da je Bluetooth omogočen v avtomobilu in telefonu ter da sta si blizu.</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; lahko odklepa vaš profil.</string>
+ <string name="create_profile_lock_dialog_title">Ustvarjanje glavnega zaklepanja profila</string>
+ <string name="create_profile_lock_dialog_message">Če želite uporabljati telefon za odklepanje profila, morate imeti kot rezervno možnost nastavljeno glavno zaklepanje profila.</string>
+ <string name="unlock_profile_to_finish_title">Za konec odklenite profil</string>
+ <string name="unlock_profile_to_finish_message">Ustvarili ste novo zaklepanje profila. Znova ga vnesite zaradi potrditve, da lahko telefon samodejno odklene vaš profil.</string>
+ <string name="disable_device_connection_text">Prekini povezavo s to napravo</string>
+ <string name="enable_device_connection_text">Znova poveži to napravo</string>
+ <string name="trusted_device_notification_channel_name">Odklepanje s telefonom</string>
+ <string name="trusted_device_notification_title">Omogočanje, da telefon odklene vaš profil</string>
+ <string name="trusted_device_notification_content">Dotaknite se tukaj, če želite pooblastiti to funkcijo.</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Prišlo je do težave</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Te funkcije trenutno žal ni bilo mogoče vklopiti. Poskusite znova.</string>
+ <string name="create_phone_lock_dialog_title">Ustvarjanje zaklepanja zaslona v telefonu</string>
+ <string name="create_phone_lock_dialog_message">V telefonu še ni nastavljeno zaklepanje zaslona. Če želite odkleniti profil avtomobila s telefonom, v nastavitvah telefona najprej ustvarite zaklepanje zaslona (znano kot geslo).</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d novo sporočilo</item>
+ <item quantity="two">%d novi sporočili</item>
+ <item quantity="few">%d nova sporočila</item>
+ <item quantity="other">%d novih sporočil</item>
+ </plurals>
+ <string name="name_not_available">Ime ni na voljo</string>
</resources>
diff --git a/companiondevice/res/values-sq/strings.xml b/companiondevice/res/values-sq/strings.xml
index 4149265..8476392 100644
--- a/companiondevice/res/values-sq/strings.xml
+++ b/companiondevice/res/values-sq/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Pajisja shoqëruese"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Shto një pajisje shoqëruese"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Lidh një pajisje shoqëruese"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Mund ta përdorësh telefonin si pajisje shoqëruese për të të ndihmuar gjatë drejtimit të makinës"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Sigurohu që të kesh të instaluar "<b>"aplikacionin shoqërues"</b>" në telefon"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Konfirmo kodin në telefonin tënd"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Konfirmo që ky përputhet me kodin e shfaqur në telefonin tënd"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Pajisja është lidhur me sukses"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Hap aplikacionin dhe lidhe me &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Hap aplikacionin dhe ndiq udhëzimet në aplikacion"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Do ta harrosh &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Kjo makinë nuk do të jetë më e çiftuar me këtë pajisje. Përveç kësaj, do të duhet ta heqësh këtë makinë nga aplikacioni shoqërues."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> është harruar"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> nuk mund të harrohej"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Vazhdo konfigurimin në telefon"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Ndodhi një gabim"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Fatkeqësisht, ky ekran nuk mund të shfaqej si duhet. Provo përsëri."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Aktivizo Bluetooth-in"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Për ta konfiguruar telefonin si pajisje shoqëruese, makina jote ka nevojë për Bluetooth-in."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Do ta aktivizosh Bluetooth-in?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Për t\'u lidhur me pajisjen shoqëruese, makina jote ka nevojë për Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Prano"</string>
- <string name="reject" msgid="4315432282758892890">"Refuzo"</string>
- <string name="confirm" msgid="3748997214719276945">"Konfirmo"</string>
- <string name="cancel" msgid="4306609731174629323">"Anulo"</string>
- <string name="remove" msgid="5513398257088729188">"Hiq"</string>
- <string name="ok" msgid="2825038997730899083">"Në rregull"</string>
- <string name="connection" msgid="2798490936433656846">"Lidhja"</string>
- <string name="forget_title" msgid="3027608547243824729">"Harroje këtë pajisje"</string>
- <string name="forget" msgid="2069897665699141222">"Harroje"</string>
- <string name="disable" msgid="4619854429066283970">"Çaktivizo"</string>
- <string name="enable" msgid="7656386199154111316">"Aktivizo"</string>
- <string name="continue_button" msgid="2748318968566159950">"Vazhdo"</string>
- <string name="retry" msgid="3783419451480721367">"Provo përsëri"</string>
- <string name="turn_on" msgid="4288754850470994812">"Aktivizo"</string>
- <string name="not_now" msgid="8764692269093707622">"Jo tani"</string>
- <string name="connected" msgid="8051190714042020471">"Lidhur"</string>
- <string name="notDetected" msgid="4115229772085594506">"Nuk u zbulua"</string>
- <string name="disconnected" msgid="8526513868622591894">"Shkëputur"</string>
- <string name="unknown" msgid="555736316465118024">"I panjohur"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Shërbimi i mesazheve me tekst i telefonit është në ekzekutim"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Shërbimi i mesazheve me tekst është aktiv"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Mesazhet me tekst po merren përmes pajisjes shoqëruese"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Shkyçe profilin me telefonin tënd"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Kontrollo aplikacionin shoqërues për të caktuar opsionet e shkyçjes"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Lejo që &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; ta shkyçë profilin tim"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefoni yt duhet të jetë i lidhur dhe aktiv"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Për ta aktivizuar këtë veçori, sigurohu që makina dhe telefoni të kenë Bluetooth-in të aktivizuar dhe të jenë afër njëri-tjetrit"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; mund ta shkyçë profilin tënd tani"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Krijo një kyçje kryesore të profilit"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Për të përdorur telefonin për shkyçjen e profilit tënd, të duhet një kyçje kryesore profili si rezervë"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Shkyçe profilin tënd për ta përfunduar"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Ke krijuar një kyçje të re të profilit. Më pas fute përsëri atë për të konfirmuar që telefoni mund ta shkyçë automatikisht profilin tënd"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Shkëpute këtë pajisje"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Rilidhe këtë pajisje"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Shkyçe me telefon"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Lejo që telefoni ta shkyçë profilin tënd"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Trokit këtu për ta autorizuar këtë veçori"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Ndodhi një gabim"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Fatkeqësisht, kjo veçori nuk mund të aktivizohej në këtë moment. Provo përsëri."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Krijo një kyçje ekrani në telefonin tënd"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Telefoni yt nuk ka një kyçje ekrani të caktuar. Për ta shkyçur profilin e makinës me telefonin tënd, në fillim krijo një kyçje ekrani (të njohur edhe si kodi i kalimit) te cilësimet e telefonit."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Pajisja shoqëruese</string>
+ <string name="add_device_title">Shto një pajisje shoqëruese</string>
+ <string name="add_associated_device_title">Lidh një pajisje shoqëruese</string>
+ <string name="add_associated_device_instruction">Mund ta përdorësh telefonin si pajisje shoqëruese për të të ndihmuar gjatë drejtimit të makinës</string>
+ <string name="associated_device_install_app">Sigurohu që të kesh të instaluar <b>aplikacionin Companion</b> në telefon</string>
+ <string name="associated_device_pairing_code_title">Konfirmo kodin në telefonin tënd</string>
+ <string name="associated_device_pairing_message">Konfirmo që ky përputhet me kodin e shfaqur në telefonin tënd</string>
+ <string name="associated_device_success">Pajisja është lidhur me sukses</string>
+ <string name="associated_device_select_device">Hap aplikacionin dhe lidhe me &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Hap aplikacionin dhe ndiq udhëzimet në aplikacion</string>
+ <string name="remove_associated_device_title">Të harrohet &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Kjo makinë nuk do të jetë më e çiftuar me këtë pajisje. Përveç kësaj, do të duhet ta heqësh këtë makinë nga aplikacioni Companion.</string>
+ <string name="device_removed_success_toast_text">%1$s është harruar</string>
+ <string name="device_removed_failure_toast_text">%1$s nuk mund të harrohej</string>
+ <string name="continue_setup_toast_text">Vazhdo konfigurimin në telefon</string>
+ <string name="error_screen_title">Ndodhi një gabim</string>
+ <string name="error_screen_message">Fatkeqësisht, ky ekran nuk mund të shfaqej si duhet. Provo përsëri.</string>
+ <string name="turn_on_bluetooth_title">Aktivizo Bluetooth-in</string>
+ <string name="turn_on_bluetooth_message">Për ta konfiguruar telefonin si pajisje shoqëruese, makina jote ka nevojë për Bluetooth-in.</string>
+ <string name="turn_on_bluetooth_dialog_title">Të aktivizohet Bluetooth-i?</string>
+ <string name="turn_on_bluetooth_dialog_message">Për t\'u lidhur me pajisjen shoqëruese, makina jote ka nevojë për Bluetooth.</string>
+ <string name="accept">Prano</string>
+ <string name="reject">Refuzo</string>
+ <string name="confirm">Konfirmo</string>
+ <string name="cancel">Anulo</string>
+ <string name="remove">Hiq</string>
+ <string name="ok">Në rregull</string>
+ <string name="connection">Lidhja</string>
+ <string name="forget_title">Harroje këtë pajisje</string>
+ <string name="forget">Harro</string>
+ <string name="disable">Çaktivizo</string>
+ <string name="enable">Aktivizo</string>
+ <string name="continue_button">Vazhdo</string>
+ <string name="retry">Provo përsëri</string>
+ <string name="turn_on">Aktivizo</string>
+ <string name="not_now">Jo tani</string>
+ <string name="connected">Lidhur</string>
+ <string name="notDetected">Nuk u zbulua</string>
+ <string name="disconnected">Shkëputur</string>
+ <string name="unknown">E panjohur</string>
+ <string name="app_running_msg_channel_name">Shërbimi i mesazheve me tekst i telefonit është në ekzekutim</string>
+ <string name="app_running_msg_notification_title">Shërbimi i mesazheve me tekst është aktiv</string>
+ <string name="app_running_msg_notification_content">Mesazhet me tekst po merren përmes pajisjes shoqëruese</string>
+ <string name="trusted_device_feature_title">Shkyçe profilin me telefonin tënd</string>
+ <string name="trusted_device_feature_instruction">Kontrollo aplikacionin Companion për të caktuar opsionet e shkyçjes</string>
+ <string name="trusted_device_item_title">Lejo që &lt;b&gt;%1$s&lt;/b&gt; të shkyçë profilin tim</string>
+ <string name="device_not_connected_dialog_title">Telefoni yt duhet të jetë i lidhur dhe aktiv</string>
+ <string name="device_not_connected_dialog_message">Për ta aktivizuar këtë veçori, sigurohu që makina dhe telefoni të kenë Bluetooth-in të aktivizuar dhe të jenë afër njëri-tjetrit</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; tani mund ta shkyçë profilin tënd</string>
+ <string name="create_profile_lock_dialog_title">Krijo një kyçje kryesore të profilit</string>
+ <string name="create_profile_lock_dialog_message">Për të përdorur telefonin për shkyçjen e profilit tënd, të duhet një kyçje kryesore profili si rezervë</string>
+ <string name="unlock_profile_to_finish_title">Shkyçe profilin tënd për ta përfunduar</string>
+ <string name="unlock_profile_to_finish_message">Ke krijuar një kyçje të re të profilit. Më pas fute përsëri atë për të konfirmuar që telefoni mund ta shkyçë automatikisht profilin tënd</string>
+ <string name="disable_device_connection_text">Shkëpute këtë pajisje</string>
+ <string name="enable_device_connection_text">Rilidhe këtë pajisje</string>
+ <string name="trusted_device_notification_channel_name">Shkyçe me telefon</string>
+ <string name="trusted_device_notification_title">Lejo që telefoni ta shkyçë profilin tënd</string>
+ <string name="trusted_device_notification_content">Trokit këtu për ta autorizuar këtë veçori</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Ndodhi një gabim</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Fatkeqësisht, kjo veçori nuk mund të aktivizohej në këtë moment. Provo përsëri.</string>
+ <string name="create_phone_lock_dialog_title">Krijo një kyçje ekrani në telefonin tënd</string>
+ <string name="create_phone_lock_dialog_message">Telefoni yt nuk ka një kyçje ekrani të caktuar. Për ta shkyçur profilin e makinës me telefonin tënd, në fillim krijo një kyçje ekrani (të njohur edhe si kodi i kalimit) te cilësimet e telefonit.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Mesazh i ri</item>
+ <item quantity="other">%d mesazhe të reja</item>
+ </plurals>
+ <string name="name_not_available">Emri nuk ofrohet</string>
</resources>
diff --git a/companiondevice/res/values-sr/strings.xml b/companiondevice/res/values-sr/strings.xml
index 1ece5d1..fb40da7 100644
--- a/companiondevice/res/values-sr/strings.xml
+++ b/companiondevice/res/values-sr/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,75 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Повезани уређај"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Додај повезани уређај"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Повежите придружени уређај"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Можете да користите телефон као придружени уређај да бисте управљали доживљајем вожње"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Уверите се да сте инсталирали "<b>"пратећу апликацију"</b>" на телефону"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Потврдите кôд на телефону"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Потврдите да се ово подудара са кодом који се приказује на телефону"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Повезивање уређаја је успело"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Отворите апликацију и повежите је са: &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Отворите апликацију и пратите упутства"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Желите да уклоните аутомобил &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Овај аутомобил више неће бити упарен са овим уређајем. Мораћете и да уклоните овај аутомобил из пратеће апликације."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Телефон <xliff:g id="PHONE_NAME">%1$s</xliff:g> је заборављен"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Заборављање телефона <xliff:g id="PHONE_NAME">%1$s</xliff:g> није успело"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Наставите са подешавањем на телефону"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Дошло је до грешке"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Нажалост, правилно приказивање екрана није успело. Пробајте поново."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Укључи Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Аутомобилу је потребан Bluetooth за подешавање телефона као придруженог уређаја."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Желите ли да укључите Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Аутомобилу је потребан Bluetooth за откључавање придруженог уређаја."</string>
- <string name="accept" msgid="1454710793329618813">"Прихвати"</string>
- <string name="reject" msgid="4315432282758892890">"Одбиј"</string>
- <string name="confirm" msgid="3748997214719276945">"Потврди"</string>
- <string name="cancel" msgid="4306609731174629323">"Откажи"</string>
- <string name="remove" msgid="5513398257088729188">"Уклони"</string>
- <string name="ok" msgid="2825038997730899083">"Потврди"</string>
- <string name="connection" msgid="2798490936433656846">"Веза"</string>
- <string name="forget_title" msgid="3027608547243824729">"Заборави овај уређај"</string>
- <string name="forget" msgid="2069897665699141222">"Заборави"</string>
- <string name="disable" msgid="4619854429066283970">"Онемогући"</string>
- <string name="enable" msgid="7656386199154111316">"Омогући"</string>
- <string name="continue_button" msgid="2748318968566159950">"Настави"</string>
- <string name="retry" msgid="3783419451480721367">"Пробај поново"</string>
- <string name="turn_on" msgid="4288754850470994812">"Укључи"</string>
- <string name="not_now" msgid="8764692269093707622">"Не сада"</string>
- <string name="connected" msgid="8051190714042020471">"Повезано је"</string>
- <string name="notDetected" msgid="4115229772085594506">"Није откривено"</string>
- <string name="disconnected" msgid="8526513868622591894">"Веза је прекинута"</string>
- <string name="unknown" msgid="555736316465118024">"Непознато"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"SMS услуга на телефону је покренута"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"SMS услуга на телефону је активна"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Пријем SMS-ова преко придруженог уређаја"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Откључајте профил помоћу телефона"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Проверите пратећу апликацију да бисте подесили опције за откључавање"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Омогући телефону &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; да откључа мој профил"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Телефон мора да буде активно повезан"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Да бисте укључили ову функцију, уверите се да су аутомобил и Bluetooth укључени и у близини"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; сада може да откључа профил"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Подесите примарно закључавање профила"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Да бисте откључали профил помоћу телефона, морате да подесите примарно закључавање профила као резерву"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Откључајте профил да бисте завршили"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Подесили сте ново закључавање профила. Сада га унесите поново да бисте потврдили да телефон може да откључа профил аутоматски"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Прекините везу са овим уређајем"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Поново повежите овај уређај"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Откључајте помоћу телефона"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Омогућите телефону да откључа профил"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Додирните овде да бисте овластили ову функцију"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Дошло је до грешке"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Нажалост, укључивање ове функције тренутно није успело. Пробајте поново."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Подесите закључавање екрана на телефону"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"На телефону није подешено закључавање екрана. Да бисте откључали профил аутомобила помоћу телефона, прво подесите закључавање екрана (познато и као шифра) у подешавањима телефона."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Повезани уређај</string>
+ <string name="add_device_title">Додај повезани уређај</string>
+ <string name="add_associated_device_title">Повежите придружени уређај</string>
+ <string name="add_associated_device_instruction">Можете да користите телефон као придружени уређај да бисте управљали доживљајем вожње</string>
+ <string name="associated_device_install_app">Уверите се да сте инсталирали <b>пратећу апликацију</b> на телефону</string>
+ <string name="associated_device_pairing_code_title">Потврдите кôд на телефону</string>
+ <string name="associated_device_pairing_message">Потврдите да се ово подудара са кодом који се приказује на телефону</string>
+ <string name="associated_device_success">Повезивање уређаја је успело</string>
+ <string name="associated_device_select_device">Отворите апликацију и повежите је са аутомобилом &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Отворите апликацију и пратите упутства у њој</string>
+ <string name="remove_associated_device_title">Желите да заборавите: &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Овај аутомобил више неће бити упарен са овим уређајем. Мораћете и да уклоните овај аутомобил из пратеће апликације.</string>
+ <string name="device_removed_success_toast_text">Телефон %1$s је заборављен</string>
+ <string name="device_removed_failure_toast_text">Заборављање телефона %1$s није успело</string>
+ <string name="continue_setup_toast_text">Наставите са подешавањем на телефону</string>
+ <string name="error_screen_title">Дошло је до грешке</string>
+ <string name="error_screen_message">Нажалост, правилно приказивање екрана није успело. Пробајте поново.</string>
+ <string name="turn_on_bluetooth_title">Укључи Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Аутомобилу је потребан Bluetooth за подешавање телефона као придруженог уређаја.</string>
+ <string name="turn_on_bluetooth_dialog_title">Желите ли да укључите Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Аутомобилу је потребан Bluetooth за откључавање придруженог уређаја.</string>
+ <string name="accept">Прихватам</string>
+ <string name="reject">Одбиј</string>
+ <string name="confirm">Потврди</string>
+ <string name="cancel">Откажи</string>
+ <string name="remove">Уклони</string>
+ <string name="ok">Важи</string>
+ <string name="connection">Веза</string>
+ <string name="forget_title">Заборави овај уређај</string>
+ <string name="forget">Заборави</string>
+ <string name="disable">Онемогући</string>
+ <string name="enable">Омогући</string>
+ <string name="continue_button">Настави</string>
+ <string name="retry">Пробај поново</string>
+ <string name="turn_on">Укључи</string>
+ <string name="not_now">Не сада</string>
+ <string name="connected">Повезано</string>
+ <string name="notDetected">Није откривено</string>
+ <string name="disconnected">Прекинута веза</string>
+ <string name="unknown">Непознато</string>
+ <string name="app_running_msg_channel_name">Услуга за текстуалне поруке на телефону је покренута</string>
+ <string name="app_running_msg_notification_title">Услуга за текстуалне поруке на телефону је активна</string>
+ <string name="app_running_msg_notification_content">Пријем текстуалних порука преко придруженог уређаја</string>
+ <string name="trusted_device_feature_title">Откључајте профил помоћу телефона</string>
+ <string name="trusted_device_feature_instruction">Проверите пратећу апликацију да бисте подесили опције за откључавање</string>
+ <string name="trusted_device_item_title">Дозволите да &lt;b&gt;%1$s&lt;/b&gt; откључа мој профил</string>
+ <string name="device_not_connected_dialog_title">Телефон мора да буде активно повезан</string>
+ <string name="device_not_connected_dialog_message">Да бисте укључили ову функцију, уверите се да су аутомобил и Bluetooth укључени и у близини</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; сада може да вам откључа профил</string>
+ <string name="create_profile_lock_dialog_title">Подесите примарно закључавање профила</string>
+ <string name="create_profile_lock_dialog_message">Да бисте откључали профил помоћу телефона, морате да подесите примарно закључавање профила као резерву</string>
+ <string name="unlock_profile_to_finish_title">Откључајте профил да бисте завршили</string>
+ <string name="unlock_profile_to_finish_message">Подесили сте ново закључавање профила. Сада га унесите поново да бисте потврдили да телефон може да откључа профил аутоматски</string>
+ <string name="disable_device_connection_text">Прекините везу са овим уређајем</string>
+ <string name="enable_device_connection_text">Поново повежите овај уређај</string>
+ <string name="trusted_device_notification_channel_name">Откључајте помоћу телефона</string>
+ <string name="trusted_device_notification_title">Омогућите телефону да откључа профил</string>
+ <string name="trusted_device_notification_content">Додирните овде да бисте одобрили ову функцију</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Дошло је до грешке</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Нажалост, укључивање ове функције засад није успело. Пробајте поново.</string>
+ <string name="create_phone_lock_dialog_title">Подесите закључавање екрана на телефону</string>
+ <string name="create_phone_lock_dialog_message">На телефону није подешено закључавање екрана. Да бисте откључали профил аутомобила помоћу телефона, прво подесите закључавање екрана (познато и као шифра) у подешавањима телефона.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d нова порука</item>
+ <item quantity="few">%d нове поруке</item>
+ <item quantity="other">%d нових порука</item>
+ </plurals>
+ <string name="name_not_available">Име није доступно</string>
</resources>
diff --git a/companiondevice/res/values-sv/strings.xml b/companiondevice/res/values-sv/strings.xml
index bf3820d..ed00284 100644
--- a/companiondevice/res/values-sv/strings.xml
+++ b/companiondevice/res/values-sv/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Kopplad enhet"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Lägg till kopplad enhet"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Anslut en hjälpenhet"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Du kan koppla in telefonen som hjälpenhet och använda den när du kör"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Kolla att den "<b>"tillhörande appen"</b>" är installerad på telefonen"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Kolla koden på telefonen"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Kontrollera att detta är samma kod som visas på telefonen"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Enheten har kopplats"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Öppna appen och anslut till <xliff:g id="CAR_NAME">%1$s</xliff:g>"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Öppna appen och följ anvisningarna"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Ska &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; glömmas?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Bilen är inte längre parkopplad med denna enhet. Du behöver dessutom ta bort bilen från den tillhörande appen."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> har glömts bort"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Det gick inte att glömma bort <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Fortsätt med konfigureringen på telefonen"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Något gick fel"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Skärmen kan inte visas korrekt. Försök igen."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Aktivera Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Bilen måste ha Bluetooth om det ska gå att konfigurera telefonen som hjälpenhet."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Vill du aktivera Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Bilen måste ha Bluetooth om det ska gå att ansluta till hjälpenheten."</string>
- <string name="accept" msgid="1454710793329618813">"Godkänn"</string>
- <string name="reject" msgid="4315432282758892890">"Avvisa"</string>
- <string name="confirm" msgid="3748997214719276945">"Bekräfta"</string>
- <string name="cancel" msgid="4306609731174629323">"Avbryt"</string>
- <string name="remove" msgid="5513398257088729188">"Ta bort"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Anslutning"</string>
- <string name="forget_title" msgid="3027608547243824729">"Glöm den här enheten"</string>
- <string name="forget" msgid="2069897665699141222">"Glöm"</string>
- <string name="disable" msgid="4619854429066283970">"Inaktivera"</string>
- <string name="enable" msgid="7656386199154111316">"Aktivera"</string>
- <string name="continue_button" msgid="2748318968566159950">"Fortsätt"</string>
- <string name="retry" msgid="3783419451480721367">"Försök igen"</string>
- <string name="turn_on" msgid="4288754850470994812">"Aktivera"</string>
- <string name="not_now" msgid="8764692269093707622">"Inte nu"</string>
- <string name="connected" msgid="8051190714042020471">"Ansluten"</string>
- <string name="notDetected" msgid="4115229772085594506">"Ingen hittades"</string>
- <string name="disconnected" msgid="8526513868622591894">"Frånkopplad"</string>
- <string name="unknown" msgid="555736316465118024">"Okänd"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Telefonens sms-tjänst körs"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Telefonens sms-tjänst är aktiv"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Tar emot sms via hjälpenheten"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Lås upp profilen med telefonen"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Upplåsningsalternativ finns i den tillhörande appen"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Låt &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; låsa upp min telefon"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefonen måste vara ansluten"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Kontrollera att Bluetooth är aktiverat i bilen och på telefonen och att de är i närheten av varandra om du vill aktivera den här funktionen"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; kan nu låsa upp din profil"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Skapa ett primärt profillås"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Innan du kan låsa upp profilen med telefonen måste du ha ett primärt profillås som reservalternativ"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Slutför genom att låsa upp profilen"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Ett nytt profillås har skapats. Ange det igen och kontrollera att telefonen kan låsa upp profilen automatiskt."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Koppla från den här enheten"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Anslut den här enheten igen"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Låsa upp med telefonen"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Låt telefonen låsa upp din profil"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Tryck här om du vill auktorisera funktionen"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Något gick fel"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Det gick inte att aktivera den här funktionen just nu. Försök igen."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Ställ in ett skärmlås på telefonen"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Inget skärmlås har ställts in på telefonen. Innan du kan låsa upp bilens profil med telefonen måste du ställa in ett skärmlås (kallas även lösenord) i telefonens inställningar."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Kopplad enhet</string>
+ <string name="add_device_title">Lägg till kopplad enhet</string>
+ <string name="add_associated_device_title">Anslut en hjälpenhet</string>
+ <string name="add_associated_device_instruction">Du kan koppla in telefonen som hjälpenhet och använda den när du kör</string>
+ <string name="associated_device_install_app">Kolla att den <b>tillhörande appen</b> är installerad på telefonen</string>
+ <string name="associated_device_pairing_code_title">Kolla koden på telefonen</string>
+ <string name="associated_device_pairing_message">Kontrollera att detta är samma kod som visas på telefonen</string>
+ <string name="associated_device_success">Enheten har kopplats</string>
+ <string name="associated_device_select_device">Öppna appen och anslut till &lt;b&gt;%1$s&lt;b&gt;</string>
+ <string name="associated_device_open_app">Öppna appen och följ anvisningarna</string>
+ <string name="remove_associated_device_title">Vill du glömma &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Bilen kopplas bort från denna enhet. Du behöver dessutom ta bort bilen från den tillhörande appen.</string>
+ <string name="device_removed_success_toast_text">%1$s har glömts bort</string>
+ <string name="device_removed_failure_toast_text">Det gick inte att glömma bort %1$s</string>
+ <string name="continue_setup_toast_text">Fortsätt med konfigureringen på telefonen</string>
+ <string name="error_screen_title">Något gick fel</string>
+ <string name="error_screen_message">Skärmen kan inte visas korrekt. Försök igen.</string>
+ <string name="turn_on_bluetooth_title">Aktivera Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Bilen måste ha Bluetooth om det ska gå att konfigurera telefonen som hjälpenhet.</string>
+ <string name="turn_on_bluetooth_dialog_title">Vill du aktivera Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Bilen måste ha Bluetooth om det ska gå att ansluta till hjälpenheten.</string>
+ <string name="accept">Godkänn</string>
+ <string name="reject">Godkänn inte</string>
+ <string name="confirm">Bekräfta</string>
+ <string name="cancel">Avbryt</string>
+ <string name="remove">Ta bort</string>
+ <string name="ok">OK</string>
+ <string name="connection">Anslutning</string>
+ <string name="forget_title">Glöm den här enheten</string>
+ <string name="forget">Glöm</string>
+ <string name="disable">Inaktivera</string>
+ <string name="enable">Aktivera</string>
+ <string name="continue_button">Fortsätt</string>
+ <string name="retry">Försök igen</string>
+ <string name="turn_on">Aktivera</string>
+ <string name="not_now">Inte nu</string>
+ <string name="connected">Ansluten</string>
+ <string name="notDetected">Ingen hittades</string>
+ <string name="disconnected">Frånkopplad</string>
+ <string name="unknown">Okänd</string>
+ <string name="app_running_msg_channel_name">Telefonens sms-tjänst körs</string>
+ <string name="app_running_msg_notification_title">Telefonens sms-tjänst är aktiv</string>
+ <string name="app_running_msg_notification_content">Tar emot sms via hjälpenheten</string>
+ <string name="trusted_device_feature_title">Lås upp profilen med telefonen</string>
+ <string name="trusted_device_feature_instruction">Upplåsningsalternativ finns i den tillhörande appen</string>
+ <string name="trusted_device_item_title">Låt &lt;b&gt;%1$s&lt;/b&gt; låsa upp min profil</string>
+ <string name="device_not_connected_dialog_title">Telefonen måste vara ansluten</string>
+ <string name="device_not_connected_dialog_message">Kontrollera att Bluetooth är aktiverat i bilen och på telefonen och att de är i närheten av varandra om du vill aktivera den här funktionen</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; kan nu låsa upp din profil</string>
+ <string name="create_profile_lock_dialog_title">Skapa ett primärt profillås</string>
+ <string name="create_profile_lock_dialog_message">Innan du kan låsa upp profilen med telefonen måste du ha ett primärt profillås som reservalternativ</string>
+ <string name="unlock_profile_to_finish_title">Slutför genom att låsa upp profilen</string>
+ <string name="unlock_profile_to_finish_message">Ett nytt profillås har skapats. Ange det igen och kontrollera att telefonen kan låsa upp profilen automatiskt.</string>
+ <string name="disable_device_connection_text">Koppla från den här enheten</string>
+ <string name="enable_device_connection_text">Anslut den här enheten igen</string>
+ <string name="trusted_device_notification_channel_name">Låsa upp med telefonen</string>
+ <string name="trusted_device_notification_title">Låt telefonen låsa upp din profil</string>
+ <string name="trusted_device_notification_content">Tryck här om du vill auktorisera funktionen</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Något gick fel</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Det gick inte att aktivera den här funktionen just nu. Försök igen.</string>
+ <string name="create_phone_lock_dialog_title">Ställ in ett skärmlås på telefonen</string>
+ <string name="create_phone_lock_dialog_message">Inget skärmlås har ställts in på telefonen. Innan du kan låsa upp bilens profil med telefonen måste du ställa in ett skärmlås (kallas även lösenord) i telefonens inställningar.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Nytt meddelande</item>
+ <item quantity="other">%d nya meddelanden</item>
+ </plurals>
+ <string name="name_not_available">Namnet är inte tillgängligt</string>
</resources>
diff --git a/companiondevice/res/values-sw/strings.xml b/companiondevice/res/values-sw/strings.xml
index 90e7b21..02526fc 100644
--- a/companiondevice/res/values-sw/strings.xml
+++ b/companiondevice/res/values-sw/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Kifaa Kilichounganishwa"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Weka Kifaa Kinachounganishwa"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Unganisha kifaa kisaidizi"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Unaweza kutumia simu yako kama kifaa kisaidizi ili kukusaidia kudhibiti hali yako ya kuendesha gari"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Hakikisha kuwa umesakinisha "<b>"Programu Saidizi"</b>" kwenye simu"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Thibitisha msimbo kwenye simu"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Thibitisha kuwa msimbo huu unalingana na msimbo unaoonyeshwa kwenye simu yako"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Kifaa kimeunganishwa"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Fungua programu uunganishe na &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Fungua programu na ufuate maagizo"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Ondoa &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Gari hili halitaunganishwa tena na kifaa hiki. Bado utahitaji kuondoa gari hili kwenye Progamu saidizi."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> imeondolewa"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Imeshindwa kuondoa <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Endelea kuweka mipangilio kwenye simu yako"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Hitilafu fulani imetokea"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Samahani, skrini hii imeshindwa kuonyesha vizuri. Tafadhali jaribu tena."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Washa Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Ili uweke simu yako kama kifaa kisaidizi, linahitaji Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Ungependa kuwasha Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Ili uunganishe kifaa chako kisaidizi, gari lako linahitaji Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Kubali"</string>
- <string name="reject" msgid="4315432282758892890">"Kataa"</string>
- <string name="confirm" msgid="3748997214719276945">"Thibitisha"</string>
- <string name="cancel" msgid="4306609731174629323">"Ghairi"</string>
- <string name="remove" msgid="5513398257088729188">"Ondoa"</string>
- <string name="ok" msgid="2825038997730899083">"Sawa"</string>
- <string name="connection" msgid="2798490936433656846">"Muunganisho"</string>
- <string name="forget_title" msgid="3027608547243824729">"Ondoa kifaa hiki"</string>
- <string name="forget" msgid="2069897665699141222">"Ondoa"</string>
- <string name="disable" msgid="4619854429066283970">"Zima"</string>
- <string name="enable" msgid="7656386199154111316">"Washa"</string>
- <string name="continue_button" msgid="2748318968566159950">"Endelea"</string>
- <string name="retry" msgid="3783419451480721367">"Jaribu tena"</string>
- <string name="turn_on" msgid="4288754850470994812">"Washa"</string>
- <string name="not_now" msgid="8764692269093707622">"Si sasa"</string>
- <string name="connected" msgid="8051190714042020471">"Kimeunganishwa"</string>
- <string name="notDetected" msgid="4115229772085594506">"Haijagunduliwa"</string>
- <string name="disconnected" msgid="8526513868622591894">"Kimetenganishwa"</string>
- <string name="unknown" msgid="555736316465118024">"Haijulikani"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Huduma ya SMS za simu inafanya kazi"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Huduma ya SMS za simu inatumika"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Inapokea SMS kupitia kifaa kisaidizi"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Fungua wasifu ukitumia simu"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Angalia Programu Saidizi ili uweke mipangilio ya chaguo za kufungua"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Ruhusu &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; ifungue wasifu wangu"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Ni lazima simu yako iwe imeunganishwa"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Ili uwashe kipengele hiki, hakikisha kuwa Bluetooth imewashwa kwenye gari na simu yako na zimekaribiana"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; sasa inaweza kufungua wasifu wako"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Weka mbinu ya msingi ya kufunga wasifu"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Ili utumie simu yako kufungua wasifu, unahitaji mbinu ya msingi ya kufunga wasifu kama njia mbadala"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Fungua wasifu wako ili ukamilishe"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Umeweka mbinu mpya ya kufunga wasifu. Kisha, iweke tena ili uthibitishe kuwa simu yako inaweza kufungua wasifu kiotomatiki"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Tenganisha kifaa hiki"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Unganisha tena kifaa hiki"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Fungua ukitumia simu"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Ruhusu simu yako ifungue wasifu wako"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Gusa hapa ili uidhinishe kipengele hiki"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Hitilafu fulani imetokea"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Samahani, imeshindwa kuwasha kipengele hiki wakati huu. Tafadhali jaribu tena."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Weka mbinu ya kufunga skrini kwenye simu yako"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Hujaweka mipangilio ya kufunga skrini kwenye simu yako. Ili ufungue wasifu wa gari ukitumia simu yako, weka kwanza mbinu ya kufunga skrini (inajulikana pia kama nambari ya siri) katika mipangilio ya simu yako."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Kifaa Kinachounganishwa</string>
+ <string name="add_device_title">Weka Kifaa Kinachounganishwa</string>
+ <string name="add_associated_device_title">Unganisha kifaa kisaidizi</string>
+ <string name="add_associated_device_instruction">Unaweza kutumia simu yako kama kifaa kisaidizi ili kukusaidia kudhibiti hali yako ya kuendesha gari</string>
+ <string name="associated_device_install_app">Hakikisha kuwa umesakinisha <b>Programu Saidizi</b> kwenye simu</string>
+ <string name="associated_device_pairing_code_title">Thibitisha msimbo kwenye simu</string>
+ <string name="associated_device_pairing_message">Thibitisha kuwa msimbo huu unalingana na msimbo unaoonyeshwa kwenye simu yako</string>
+ <string name="associated_device_success">Kifaa kimeunganishwa</string>
+ <string name="associated_device_select_device">Fungua programu na uunganishe kwenye &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Fungua programu na ufuate maagizo</string>
+ <string name="remove_associated_device_title">Ondoa &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Gari hili halitaunganishwa tena na kifaa hiki. Bado utahitaji kuondoa gari hili kwenye Progamu saidizi.</string>
+ <string name="device_removed_success_toast_text">%1$s imeondolewa</string>
+ <string name="device_removed_failure_toast_text">Imeshindwa kuondoa %1$s</string>
+ <string name="continue_setup_toast_text">Endelea kuweka mipangilio kwenye simu yako</string>
+ <string name="error_screen_title">Hitilafu fulani imetokea</string>
+ <string name="error_screen_message">Samahani, skrini hii imeshindwa kuonyesha vizuri. Tafadhali jaribu tena.</string>
+ <string name="turn_on_bluetooth_title">Washa Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Ili uweke simu yako kama kifaa kisaidizi, linahitaji Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Je, ungependa kuwasha Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Ili uunganishe kifaa chako kisaidizi, gari lako linahitaji Bluetooth.</string>
+ <string name="accept">Kubali</string>
+ <string name="reject">Kataa</string>
+ <string name="confirm">Thibitisha</string>
+ <string name="cancel">Ghairi</string>
+ <string name="remove">Ondoa</string>
+ <string name="ok">Sawa</string>
+ <string name="connection">Muunganisho</string>
+ <string name="forget_title">Ondoa kifaa hiki</string>
+ <string name="forget">Sahau</string>
+ <string name="disable">Zima</string>
+ <string name="enable">Washa</string>
+ <string name="continue_button">Endelea</string>
+ <string name="retry">Jaribu tena</string>
+ <string name="turn_on">Washa</string>
+ <string name="not_now">Si sasa</string>
+ <string name="connected">Imeunganishwa</string>
+ <string name="notDetected">Haijagunduliwa</string>
+ <string name="disconnected">Imetenganishwa</string>
+ <string name="unknown">Haijulikani</string>
+ <string name="app_running_msg_channel_name">Huduma ya SMS za simu inafanya kazi</string>
+ <string name="app_running_msg_notification_title">Huduma ya SMS za simu inatumika</string>
+ <string name="app_running_msg_notification_content">Inapokea SMS kupitia kifaa kisaidizi</string>
+ <string name="trusted_device_feature_title">Fungua wasifu ukitumia simu</string>
+ <string name="trusted_device_feature_instruction">Angalia Programu Saidizi ili uweke mipangilio ya chaguo za kufungua</string>
+ <string name="trusted_device_item_title">Ruhusu &lt;b&gt;%1$s&lt;/b&gt; ifungue wasifu wangu</string>
+ <string name="device_not_connected_dialog_title">Ni lazima simu yako iwe imeunganishwa</string>
+ <string name="device_not_connected_dialog_message">Ili uwashe kipengele hiki, hakikisha kuwa Bluetooth imewashwa kwenye gari na simu yako na zimekaribiana</string>
+ <string name="trusted_device_enrollment_success_message">Sasa &lt;b&gt;%1$s&lt;/b&gt; inaweza kufungua wasifu wako</string>
+ <string name="create_profile_lock_dialog_title">Weka mbinu ya msingi ya kufunga wasifu</string>
+ <string name="create_profile_lock_dialog_message">Ili utumie simu yako kufungua wasifu, unahitaji mbinu ya msingi ya kufunga wasifu kama njia mbadala</string>
+ <string name="unlock_profile_to_finish_title">Fungua wasifu wako ili ukamilishe</string>
+ <string name="unlock_profile_to_finish_message">Umeweka mbinu mpya ya kufunga wasifu. Kisha, iweke tena ili uthibitishe kuwa simu yako inaweza kufungua wasifu kiotomatiki</string>
+ <string name="disable_device_connection_text">Tenganisha kifaa hiki</string>
+ <string name="enable_device_connection_text">Unganisha tena kifaa hiki</string>
+ <string name="trusted_device_notification_channel_name">Fungua ukitumia simu</string>
+ <string name="trusted_device_notification_title">Ruhusu simu yako ifungue wasifu wako</string>
+ <string name="trusted_device_notification_content">Gusa hapa ili uidhinishe kipengele hiki</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Hitilafu fulani imetokea</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Samahani, imeshindwa kuwasha kipengele hiki wakati huu. Tafadhali jaribu tena.</string>
+ <string name="create_phone_lock_dialog_title">Weka mbinu ya kufunga skrini kwenye simu yako</string>
+ <string name="create_phone_lock_dialog_message">Hujaweka mipangilio ya kufunga skrini kwenye simu yako. Ili ufungue wasifu wa gari ukitumia simu yako, weka kwanza mbinu ya kufunga skrini (inajulikana pia kama nambari ya siri) katika mipangilio ya simu yako.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Ujumbe mpya</item>
+ <item quantity="other">Ujumbe %d mpya</item>
+ </plurals>
+ <string name="name_not_available">Jina halipatikani</string>
</resources>
diff --git a/companiondevice/res/values-ta/strings.xml b/companiondevice/res/values-ta/strings.xml
index e8e4ac9..597026b 100644
--- a/companiondevice/res/values-ta/strings.xml
+++ b/companiondevice/res/values-ta/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"தொடர்புப்படுத்தப்பட்ட சாதனம்"</string>
- <string name="add_device_title" msgid="6166003577845888151">"தொடர்புடைய சாதனத்தைச் சேர்"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"கம்பேனியன் சாதனத்தை இணைத்தல்"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"டிரைவிங் அனுபவத்தை நிர்வகிக்க உதவும்பொருட்டு உங்கள் மொபைலைக் கம்பேனியன் சாதனமாகப் பயன்படுத்தலாம்"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"உங்கள் மொபைலில் "<b>"கம்பேனியன் ஆப்ஸ்"</b>" நிறுவியுள்ளதை உறுதிசெய்க"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"மொபைலில் உள்ள உறுதிப்படுத்தல் குறியீடு"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"மொபைலில் காட்டும் குறியீட்டுடன் இது பொருந்துகிறது என்பதை உறுதிசெய்யவும்"</string>
- <string name="associated_device_success" msgid="584760065696870256">"சாதனம் தொடர்புபடுத்தப்பட்டது"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"ஆப்ஸை திறந்து &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; இல் இணை"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"ஆப்ஸைத் திறந்து வழிமுறைகளைப் பின்பற்றுங்கள்"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;? அகற்றுதல்"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"உங்கள் கார் இனி இந்தச் சாதனத்துடன் இணைக்கப்பட்டிருக்காது. கூடுதலாக நீங்கள் இந்தக் காரைக் கம்பேனியன் ஆப்ஸிலிருந்து அகற்ற வேண்டியிருக்கும்."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> அகற்றப்பட்டது"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> ஐ அகற்ற முடியவில்லை"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"மொபைலில் அமைவைத் தொடர்க"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"ஏதோ தவறாகிவிட்டது"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"எதிர்பாராதவிதமாக இந்தத் திரையைச் சரியாகக் காட்ட முடியவில்லை. மீண்டும் முயலவும்."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"புளூடூத்தை ஆன் செய்தல்"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"உங்கள் மொபைலைக் கம்பேனியன் சாதனமாக அமைக்க, உங்கள் காரில் புளூடூத் இருக்க வேண்டும்."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"புளூடூத்தை ஆன் செய்யவா?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"கம்பேனியன் சாதனத்துடன் இணைக்க, உங்கள் காரில் புளூடூத் இருக்க வேண்டும்."</string>
- <string name="accept" msgid="1454710793329618813">"ஏற்கிறேன்"</string>
- <string name="reject" msgid="4315432282758892890">"நிராகரி"</string>
- <string name="confirm" msgid="3748997214719276945">"உறுதிசெய்"</string>
- <string name="cancel" msgid="4306609731174629323">"ரத்துசெய்"</string>
- <string name="remove" msgid="5513398257088729188">"அகற்று"</string>
- <string name="ok" msgid="2825038997730899083">"சரி"</string>
- <string name="connection" msgid="2798490936433656846">"இணைத்தல்"</string>
- <string name="forget_title" msgid="3027608547243824729">"இந்தச் சாதனத்தை அகற்று"</string>
- <string name="forget" msgid="2069897665699141222">"அகற்று"</string>
- <string name="disable" msgid="4619854429066283970">"முடக்கு"</string>
- <string name="enable" msgid="7656386199154111316">"இயக்கு"</string>
- <string name="continue_button" msgid="2748318968566159950">"தொடர்க"</string>
- <string name="retry" msgid="3783419451480721367">"மீண்டும் முயல்க"</string>
- <string name="turn_on" msgid="4288754850470994812">"இயக்கு"</string>
- <string name="not_now" msgid="8764692269093707622">"இப்போது வேண்டாம்"</string>
- <string name="connected" msgid="8051190714042020471">"இணைக்கப்பட்டது"</string>
- <string name="notDetected" msgid="4115229772085594506">"கண்டறிய முடியவில்லை"</string>
- <string name="disconnected" msgid="8526513868622591894">"துண்டிக்கப்பட்டது"</string>
- <string name="unknown" msgid="555736316465118024">"அறியாதது"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"மொபைல் மெசேஜ் சேவை இயங்குகிறது"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"மொபைல் மெசேஜ் சேவை செயலிலுள்ளது"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"கம்பேனியன் சாதனம் மூலம் மெசேஜ்களைப் பெறுகிறது"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"மொபைல் மூலம் சுயவிவரத்தை அன்லாக் செய்தல்"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"அன்லாக் விருப்பங்களை அமைப்பதற்குக் கம்பேனியன் ஆப்ஸைப் பார்க்கவும்"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"எனது சுயவிவரத்தை &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; மூலம் அன்லாக் செய்தல்"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"உங்கள் மொபைல் நன்றாக இணைக்கப்பட்டிருக்க வேண்டும்"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"இந்த அம்சத்தை இயக்க, உங்கள் காரிலும் மொபைலிலும் புளூடூத் ஆனில் இருக்கிறதா என்றும் இரண்டும் அருகருகே இருக்கிறதா என்றும் உறுதிசெய்யவும்"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"இப்போது உங்கள் சுயவிவரத்தை &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; மூலம் அன்லாக் செய்ய முடியும்"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"முதன்மை சுயவிவரப் பூட்டை உருவாக்குதல்"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"உங்கள் காரின் சுயவிவரத்தை மொபைல் மூலம் அன்லாக் செய்ய, முதன்மை சுயவிவர பூட்டின் காப்புப் பிரதி தேவை"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"உங்கள் சுயவிவரத்தை அன்லாக் செய்து முடித்தல்"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"புதிய சுயவிவரப் பூட்டை உருவாக்கியுள்ளீர்கள். அடுத்தாக உங்கள் மொபைல் சுயவிவரத்தைத் தானாக அன்லாக் ஆகிறதா என மீண்டும் உள்ளிட்டு உறுதிசெய்யவும்"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"இந்தச் சாதனத்தின் இணைப்பைத் துண்டிக்கவும்"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"இந்தச் சாதனத்தை மீண்டும் இணைக்கவும்"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"மொபைல் மூலம் அன்லாக் செய்யவும்"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"மொபைல் மூலம் உங்கள் சுயவிவரத்தை அன்லாக் செய்தல்"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"இந்த அம்சத்திற்கு அனுமதி வழங்க இங்கே தட்டவும்"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"ஏதோ தவறாகிவிட்டது"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"எதிர்பாராதவிதமாக இந்த அம்சம் தற்சமயம் இயங்கவில்லை. மீண்டும் முயலவும்."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"உங்கள் மொபைலில் திரைப் பூட்டை உருவாக்குதல்"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"உங்கள் மொபைலில் திரைப் பூட்டு அமைப்புகள் இல்லை. உங்கள் மொபைல் மூலம் காரின் சுயவிவரத்தை அன்லாக் செய்ய, மொபைலின் அமைப்புகளில் திரைப் பூட்டை (கடவுக்குறியீடு என்றும் அழைக்கப்படும்) முதலில் உருவாக்க வேண்டும்."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">தொடர்புடைய சாதனம்</string>
+ <string name="add_device_title">தொடர்புடைய சாதனத்தைச் சேர்</string>
+ <string name="add_associated_device_title">தொடர்புடைய சாதனத்தை இணைத்தல்</string>
+ <string name="add_associated_device_instruction">டிரைவிங் அனுபவத்தை நிர்வகிக்க உதவும் வகையில் உங்கள் மொபைலைக் தொடர்புடைய சாதனமாகப் பயன்படுத்தலாம்</string>
+ <string name="associated_device_install_app">மொபைலில் <b>கம்பேனியன் ஆப்ஸ்</b> நிறுவியுள்ளதை உறுதிசெய்துகொள்ளவும்</string>
+ <string name="associated_device_pairing_code_title">மொபைலில் காட்டும் குறியீட்டை உறுதிசெய்தல்</string>
+ <string name="associated_device_pairing_message">மொபைலில் காட்டும் குறியீட்டுடன் இது பொருந்துகிறது என்பதை உறுதிசெய்யவும்</string>
+ <string name="associated_device_success">சாதனம் தொடர்புபடுத்தப்பட்டது</string>
+ <string name="associated_device_select_device">ஆப்ஸைத் திறந்து &lt;b&gt;%1$s&lt;b&gt; உடன் இணைக்கவும்</string>
+ <string name="associated_device_open_app">ஆப்ஸைத் திறந்து அதிலுள்ள வழிமுறைகளைப் பின்பற்றுங்கள்</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; ஐ அகற்றவா?</string>
+ <string name="remove_associated_device_message">உங்கள் கார் இனி இந்தச் சாதனத்துடன் இணைக்கப்பட்டிருக்காது. மேலும் நீங்கள் இந்தக் காரைக் கம்பேனியன் ஆப்ஸிலிருந்து அகற்ற வேண்டியிருக்கும்.</string>
+ <string name="device_removed_success_toast_text">%1$s அகற்றப்பட்டது</string>
+ <string name="device_removed_failure_toast_text">%1$s ஐ அகற்ற முடியவில்லை</string>
+ <string name="continue_setup_toast_text">மொபைலில் அமைவைத் தொடர்க</string>
+ <string name="error_screen_title">ஏதோ தவறாகிவிட்டது</string>
+ <string name="error_screen_message">எதிர்பாராதவிதமாக இந்தத் திரையைச் சரியாகக் காட்ட முடியவில்லை. மீண்டும் முயலவும்.</string>
+ <string name="turn_on_bluetooth_title">புளூடூத்தை ஆன் செய்தல்</string>
+ <string name="turn_on_bluetooth_message">உங்கள் மொபைலைத் தொடர்புடைய சாதனமாக அமைக்க, உங்கள் காரில் புளூடூத் இருக்க வேண்டும்.</string>
+ <string name="turn_on_bluetooth_dialog_title">புளூடூத்தை ஆன் செய்யவா?</string>
+ <string name="turn_on_bluetooth_dialog_message">தொடர்புடைய சாதனத்துடன் இணைக்க, உங்கள் காரில் புளூடூத் இருக்க வேண்டும்.</string>
+ <string name="accept">ஏற்கிறேன்</string>
+ <string name="reject">நிராகரி</string>
+ <string name="confirm">சரி</string>
+ <string name="cancel">ரத்துசெய்</string>
+ <string name="remove">அகற்று</string>
+ <string name="ok">சரி</string>
+ <string name="connection">இணைப்பு</string>
+ <string name="forget_title">இந்தச் சாதனத்தை அகற்று</string>
+ <string name="forget">அகற்று</string>
+ <string name="disable">முடக்கு</string>
+ <string name="enable">இயக்கு</string>
+ <string name="continue_button">தொடர்க</string>
+ <string name="retry">மீண்டும் முயல்க</string>
+ <string name="turn_on">ஆன் செய்</string>
+ <string name="not_now">இப்போது வேண்டாம்</string>
+ <string name="connected">இணைக்கப்பட்டது</string>
+ <string name="notDetected">கண்டறிய முடியவில்லை</string>
+ <string name="disconnected">துண்டிக்கப்பட்டது</string>
+ <string name="unknown">அறியப்படாதது</string>
+ <string name="app_running_msg_channel_name">மொபைல் மெசேஜ் சேவை இயக்கத்திலுள்ளது</string>
+ <string name="app_running_msg_notification_title">மொபைல் மெசேஜ் சேவை செயலிலுள்ளது</string>
+ <string name="app_running_msg_notification_content">தொடர்புடைய சாதனம் மூலம் மெசேஜ்களைப் பெறுகிறது</string>
+ <string name="trusted_device_feature_title">மொபைல் மூலம் சுயவிவரத்தை அன்லாக் செய்தல்</string>
+ <string name="trusted_device_feature_instruction">அன்லாக் விருப்பங்களை அமைப்பதற்குக் கம்பேனியன் ஆப்ஸைப் பார்க்கவும்</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; மூலம் சுயவிவரத்தை அன்லாக் செய்தல்</string>
+ <string name="device_not_connected_dialog_title">உங்கள் மொபைல் சரியாக இணைக்கப்பட்டிருக்க வேண்டும்</string>
+ <string name="device_not_connected_dialog_message">இந்த அம்சத்தை ஆன் செய்ய, உங்கள் காரிலும் மொபைலிலும் \'புளூடூத்\' ஆனில் இருப்பதையும் இரண்டும் அருகருகே இருப்பதையும் உறுதிசெய்துகொள்ளவும்</string>
+ <string name="trusted_device_enrollment_success_message">இப்போது உங்கள் சுயவிவரத்தை &lt;b&gt;%1$s&lt;/b&gt; மூலம் அன்லாக் செய்ய முடியும்</string>
+ <string name="create_profile_lock_dialog_title">சுயவிவரத்திற்கான முதன்மை லாக்கை உருவாக்குதல்</string>
+ <string name="create_profile_lock_dialog_message">உங்கள் காரின் சுயவிவரத்தை மொபைல் மூலம் அன்லாக் செய்ய, சுயவிவரத்திற்கான முதன்மை லாக்கை மாற்று முறையாக அமைக்க வேண்டும்.</string>
+ <string name="unlock_profile_to_finish_title">நிறைவுசெய்ய, உங்கள் சுயவிவரத்தை அன்லாக் செய்தல்</string>
+ <string name="unlock_profile_to_finish_message">புதிய சுயவிவர லாக்கை உருவாக்கியுள்ளீர்கள். பிறகு உங்கள் சுயவிவரத்தை மொபைல் தானாக அன்லாக் செய்வதை உறுதிசெய்ய, புதிய லாக்கை மீண்டும் உள்ளிடவும்</string>
+ <string name="disable_device_connection_text">இந்தச் சாதனத்தின் இணைப்பைத் துண்டிக்கவும்</string>
+ <string name="enable_device_connection_text">இந்தச் சாதனத்தை மீண்டும் இணைக்கவும்</string>
+ <string name="trusted_device_notification_channel_name">மொபைல் மூலம் அன்லாக் செய்யவும்</string>
+ <string name="trusted_device_notification_title">மொபைல் மூலம் உங்கள் சுயவிவரத்தை அன்லாக் செய்தல்</string>
+ <string name="trusted_device_notification_content">இந்த அம்சத்திற்கு அனுமதி வழங்க இங்கே தட்டவும்</string>
+ <string name="trusted_device_enrollment_error_dialog_title">ஏதோ தவறாகிவிட்டது</string>
+ <string name="trusted_device_enrollment_error_dialog_message">எதிர்பாராதவிதமாக இந்த அம்சத்தை இப்போது ஆன் செய்ய இயலவில்லை. மீண்டும் முயலவும்.</string>
+ <string name="create_phone_lock_dialog_title">உங்கள் மொபைலில் \'திரைப் பூட்டை\' உருவாக்குதல்</string>
+ <string name="create_phone_lock_dialog_message">உங்கள் மொபைலில் \'திரைப் பூட்டு\' அமைப்பு இல்லை. உங்கள் மொபைல் மூலம் காரின் சுயவிவரத்தை அன்லாக் செய்ய, மொபைலின் அமைப்புகளில் \'திரைப் பூட்டை\' (கடவுக்குறியீடு என்றும் அழைக்கப்படும்) முதலில் உருவாக்க வேண்டும்.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">புதிய மெசேஜ்</item>
+ <item quantity="other">%d புதிய மெசேஜ்கள்</item>
+ </plurals>
+ <string name="name_not_available">பெயர் கிடைக்கவில்லை</string>
</resources>
diff --git a/companiondevice/res/values-te/strings.xml b/companiondevice/res/values-te/strings.xml
index bfc0914..d0a1bfe 100644
--- a/companiondevice/res/values-te/strings.xml
+++ b/companiondevice/res/values-te/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"అనుబంధించబడిన పరికరం"</string>
- <string name="add_device_title" msgid="6166003577845888151">"సహచర పరికరాన్ని జోడించండి"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"సహచర పరికరాన్ని కనెక్ట్ చేయండి"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"మీ డ్రైవింగ్ అనుభవాన్ని మేనేజ్ చేయడంలో సహాయపడటానికి మీ ఫోన్‌ను మీరు సహచర పరికరంగా ఉపయోగించవచ్చు"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"మీ ఫోన్‌లో "<b>"సహచర యాప్"</b>" ఇన్‌స్టాల్ చేయబడిందని నిర్ధారించుకోండి"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"ఫోన్‌లో కోడ్‌ను నిర్ధారించండి"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"ఇది మీ ఫోన్‌లో చూపించిన కోడ్‌తో మ్యాచ్ అవుతున్నట్లు నిర్ధారించండి"</string>
- <string name="associated_device_success" msgid="584760065696870256">"పరికరం విజయవంతంగా అనుబంధించబడింది"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"యాప్‌ తెరిచి, &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;కు కనెక్ట్ చేయండి"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"యాప్ తెరిచి, దానిలో సూచనలు ఫాలో అవ్వండి"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;ను విస్మరించాలా?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"ఇకపై ఈ కారు ఈ పరికరంతో పెయిర్ చేయబడదు. అంతే కాదు, మీరు ఈ కారును సహచర యాప్ నుండి తీసివేయాలి."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> విస్మరించబడింది"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g>ను విస్మరించడం విఫలమైంది"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"సెటప్‌ను మీ ఫోన్‌లో కొనసాగించండి"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"ఏదో తప్పు జరిగింది"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"దురదృష్టవశాత్తు, ఈ స్క్రీన్ సరిగ్గా డిస్‌ప్లే కాలేదు. దయచేసి మళ్ళీ ట్రై చేయండి."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"బ్లూటూత్‌ను ఆన్ చేయండి"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"మీ ఫోన్‌ను మీ సహచర పరికరంగా సెట్ చేయడానికి, మీ కారుకు బ్లూటూత్ అవసరం."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"బ్లూటూత్‌ను ఆన్ చేయాలా?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"మీ సహచర పరికరానికి కనెక్ట్ చేయడానికి, మీ కారుకు బ్లూటూత్ అవసరం."</string>
- <string name="accept" msgid="1454710793329618813">"ఆమోదించు"</string>
- <string name="reject" msgid="4315432282758892890">"తిరస్కరించు"</string>
- <string name="confirm" msgid="3748997214719276945">"నిర్ధారించు"</string>
- <string name="cancel" msgid="4306609731174629323">"రద్దు చేయి"</string>
- <string name="remove" msgid="5513398257088729188">"తీసివేయి"</string>
- <string name="ok" msgid="2825038997730899083">"సరే"</string>
- <string name="connection" msgid="2798490936433656846">"కనెక్షన్"</string>
- <string name="forget_title" msgid="3027608547243824729">"ఈ పరికరాన్ని విస్మరించు"</string>
- <string name="forget" msgid="2069897665699141222">"విస్మరించు"</string>
- <string name="disable" msgid="4619854429066283970">"డిజేబుల్ చేయి"</string>
- <string name="enable" msgid="7656386199154111316">"ఎనేబుల్ చేయి"</string>
- <string name="continue_button" msgid="2748318968566159950">"కొనసాగించు"</string>
- <string name="retry" msgid="3783419451480721367">"మళ్ళీ ట్రై చేయి"</string>
- <string name="turn_on" msgid="4288754850470994812">"ఆన్ చేయి"</string>
- <string name="not_now" msgid="8764692269093707622">"ఇప్పుడు కాదు"</string>
- <string name="connected" msgid="8051190714042020471">"కనెక్ట్ అయ్యింది"</string>
- <string name="notDetected" msgid="4115229772085594506">"గుర్తించబడలేదు"</string>
- <string name="disconnected" msgid="8526513868622591894">"డిస్‌కనెక్ట్ అయింది"</string>
- <string name="unknown" msgid="555736316465118024">"తెలియదు"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"ఫోన్ టెక్ట్స్ మెసేజ్ సర్వీస్ రన్ అవుతోంది"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"ఫోన్ టెక్ట్స్ మెసేజింగ్ సర్వీస్ యాక్టివ్‌గా ఉంది"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"సహచర పరికరం ద్వారా టెక్ట్స్ మెసేజ్‌లను స్వీకరిస్తోంది"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"ఫోన్‌తో ప్రొఫైల్‌ను అన్‌లాక్ చేయండి"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"అన్‌లాక్ చేసే ఆప్షన్‌లను సెట్ చేయడానికి మీ సహచర యాప్‌ను చెక్ చేయండి"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"నా ప్రొఫైల్‌ను అన్‌లాక్ చేయడానికి &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;ను అనుమతించు"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"మీ ఫోన్ యాక్టివ్‌గా కనెక్ట్ అయి ఉండాలి"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"ఈ ఫీచర్‌ను ఆన్ చేయడానికి, మీ కారు, అలాగే మీ ఫోన్‌లో బ్లూటూత్ ఆన్‌లో ఉందని, అవి రెండు ఒకదానికొకటి సమీపంలో ఉన్నాయని నిర్ధారించుకోండి"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"ఇప్పుడు &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయగలదు"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"ప్రాధమిక ప్రొఫైల్ లాక్‌ను రూపొందించండి"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయడానికి మీ ఫోన్‌ను ఉపయోగించేందుకు, మీకు బ్యాకప్‌గా ఒక ప్రాథ‌మిక ప్రొఫైల్ లాక్ అవసరం"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"పూర్తి చేయడానికి మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయండి"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"మీరు కొత్త ప్రొఫైల్ లాక్‌ను రూపొందించారు. తర్వాత, మీ ఫోన్ ఆటోమేటిక్‌గా మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయగలదని నిర్ధారించడానికి దాన్ని మళ్లీ ఎంటర్ చేయండి"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"ఈ పరికరాన్ని డిస్‌కనెక్ట్ చేయండి"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"ఈ పరికరాన్ని మళ్లీ కనెక్ట్ చేయండి"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"ఫోన్‌తో అన్‌లాక్ చేయండి"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయడానికి మీ ఫోన్‌ను అనుమతించండి"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"ఈ ఫీచర్‌ను అనుమతించడానికి ఇక్కడ ట్యాప్ చేయండి"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"ఏదో తప్పు జరిగింది"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"దురదృష్టవశాత్తూ, ప్రస్తుతం ఈ ఫీచర్‌ను ఆన్ చేయడం సాధ్యపడలేదు. దయచేసి మళ్ళీ ట్రై చేయండి."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"మీ ఫోన్‌లో స్క్రీన్ లాక్‌ను రూపొందించండి"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"మీ ఫోన్‌కు స్క్రీన్ లాక్ సెట్ చేయలేదు. మీ ఫోన్ ద్వారా మీ కారు ప్రొఫైల్‌ను అన్‌లాక్ చేయడానికి, ముందుగా మీ ఫోన్ సెట్టింగ్‌లలో స్క్రీన్ లాక్‌ను (దీనిని పాస్‌కోడ్ అని కూడా అంటారు) రూపొందించండి."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">అనుబంధించబడిన పరికరం</string>
+ <string name="add_device_title">అనుబంధించబడిన పరికరాన్ని జోడించు</string>
+ <string name="add_associated_device_title">సహచర పరికరాన్ని కనెక్ట్ చేయండి</string>
+ <string name="add_associated_device_instruction">మీ డ్రైవింగ్ అనుభవాన్ని మేనేజ్ చేయడంలో సహాయపడటానికి మీ ఫోన్‌ను మీరు సహచర పరికరంగా ఉపయోగించవచ్చు</string>
+ <string name="associated_device_install_app">మీ ఫోన్‌లో <b>సహచర యాప్</b> ఇన్‌స్టాల్ అయి ఉందని నిర్ధారించుకోండి</string>
+ <string name="associated_device_pairing_code_title">ఫోన్‌లో కోడ్‌ను నిర్ధారించండి</string>
+ <string name="associated_device_pairing_message">ఇది మీ ఫోన్‌లో చూపించిన కోడ్‌తో మ్యాచ్ అవుతున్నట్లు నిర్ధారించండి</string>
+ <string name="associated_device_success">పరికరం విజయవంతంగా అనుబంధించబడింది</string>
+ <string name="associated_device_select_device">యాప్‌ను తెరిచి, &lt;b&gt;%1$s&lt;b&gt;కు కనెక్ట్ చేయండి</string>
+ <string name="associated_device_open_app">యాప్ తెరిచి, దానిలోని సూచనలను ఫాలో అవ్వండి</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt;ను విస్మరించాలా?</string>
+ <string name="remove_associated_device_message">ఈ కారు ఇకపై ఈ పరికరంతో పెయిర్ చేయబడదు. అంతే కాదు, మీరు ఈ కారును సహచర యాప్ నుండి కూడా తీసివేయాలి.</string>
+ <string name="device_removed_success_toast_text">%1$s విస్మరించబడింది</string>
+ <string name="device_removed_failure_toast_text">%1$sను విస్మరించడం విఫలమైంది</string>
+ <string name="continue_setup_toast_text">సెటప్‌ను మీ ఫోన్‌లో కొనసాగించండి</string>
+ <string name="error_screen_title">ఏదో తప్పు జరిగింది</string>
+ <string name="error_screen_message">దురదృష్టవశాత్తు, ఈ స్క్రీన్ సరిగ్గా ప్రదర్శించబడలేదు. దయచేసి మళ్లీ ట్రై చేయండి.</string>
+ <string name="turn_on_bluetooth_title">బ్లూటూత్‌ను ఆన్ చేయండి</string>
+ <string name="turn_on_bluetooth_message">మీ ఫోన్‌ను మీ సహచర పరికరంగా సెటప్ చేయడానికి, మీ కారుకు బ్లూటూత్ అవసరం.</string>
+ <string name="turn_on_bluetooth_dialog_title">బ్లూటూత్‌ను ఆన్ చేయాలా?</string>
+ <string name="turn_on_bluetooth_dialog_message">మీ సహచర పరికరానికి కనెక్ట్ చేయడం కోసం, మీ కారుకు బ్లూటూత్ అవసరం.</string>
+ <string name="accept">అనుమతించు</string>
+ <string name="reject">తిరస్కరించు</string>
+ <string name="confirm">నిర్ధారించు</string>
+ <string name="cancel">రద్దు చేయి</string>
+ <string name="remove">తీసివేయి</string>
+ <string name="ok">సరే</string>
+ <string name="connection">కనెక్షన్</string>
+ <string name="forget_title">ఈ పరికరాన్ని విస్మరించు</string>
+ <string name="forget">విస్మరించు</string>
+ <string name="disable">డిజేబుల్ చేయి</string>
+ <string name="enable">ఎనేబుల్ చేయి</string>
+ <string name="continue_button">కొనసాగించు</string>
+ <string name="retry">మళ్లీ ట్రై చేయి</string>
+ <string name="turn_on">ఆన్ చేయి</string>
+ <string name="not_now">ఇప్పుడు కాదు</string>
+ <string name="connected">కనెక్ట్ చేయబడింది</string>
+ <string name="notDetected">గుర్తించబడలేదు</string>
+ <string name="disconnected">డిస్‌కనెక్ట్ అయింది</string>
+ <string name="unknown">తెలియదు</string>
+ <string name="app_running_msg_channel_name">ఫోన్ టెక్స్ట్ మెసేజ్ సర్వీస్ రన్ అవుతోంది</string>
+ <string name="app_running_msg_notification_title">ఫోన్ టెక్స్ట్ మెసేజింగ్ సర్వీస్ యాక్టివ్‌గా ఉంది</string>
+ <string name="app_running_msg_notification_content">సహచర పరికరం ద్వారా టెక్స్ట్ మెసేజ్‌లను అందుకుంటోంది</string>
+ <string name="trusted_device_feature_title">ఫోన్‌తో ప్రొఫైల్‌ను అన్‌లాక్ చేయండి</string>
+ <string name="trusted_device_feature_instruction">అన్‌లాక్ చేసే ఆప్షన్‌లను సెట్ చేయడానికి మీ సహచర యాప్‌ను చెక్ చేయండి</string>
+ <string name="trusted_device_item_title">నా ప్రొఫైల్‌ను అన్‌లాక్ చేయడానికి &lt;b&gt;%1$s&lt;/b&gt;కు అనుమతిని ఇవ్వు</string>
+ <string name="device_not_connected_dialog_title">మీ ఫోన్ యాక్టివ్‌గా కనెక్ట్ అయి ఉండాలి</string>
+ <string name="device_not_connected_dialog_message">ఈ ఫీచర్‌ను ఆన్ చేయడానికి, మీ కారులోను, ఫోన్‌లోను బ్లూటూత్ ఆన్‌లో ఉందని, అవి రెండు ఒకదానికొకటి దగ్గరగా ఉన్నాయని నిర్ధారించుకోండి</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; ఇప్పుడు మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయగలదు</string>
+ <string name="create_profile_lock_dialog_title">ప్రాథమిక ప్రొఫైల్ లాక్‌ను క్రియేట్ చేయండి</string>
+ <string name="create_profile_lock_dialog_message">మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయడానికి మీ ఫోన్‌ను ఉపయోగించేందుకు, మీకు బ్యాకప్‌గా ఒక ప్రాథమిక ప్రొఫైల్ లాక్ అవసరం</string>
+ <string name="unlock_profile_to_finish_title">పూర్తి చేయడానికి మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయండి</string>
+ <string name="unlock_profile_to_finish_message">మీరు కొత్త ప్రొఫైల్ లాక్‌ను క్రియేట్ చేశారు. తర్వాత, మీ ఫోన్ ఆటోమేటిక్‌గా మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయగలదని నిర్ధారించడానికి దాన్ని మళ్లీ ఎంటర్ చేయండి</string>
+ <string name="disable_device_connection_text">ఈ పరికరాన్ని డిస్‌కనెక్ట్ చేయండి</string>
+ <string name="enable_device_connection_text">ఈ పరికరాన్ని తిరిగి కనెక్ట్ చేయండి</string>
+ <string name="trusted_device_notification_channel_name">ఫోన్‌తో అన్‌లాక్ చేయండి</string>
+ <string name="trusted_device_notification_title">మీ ప్రొఫైల్‌ను అన్‌లాక్ చేయడానికి మీ ఫోన్‌ను అనుమతించండి</string>
+ <string name="trusted_device_notification_content">ఈ ఫీచర్‌ను ప్రామాణీకరించడానికి ఇక్కడ ట్యాప్ చేయండి</string>
+ <string name="trusted_device_enrollment_error_dialog_title">ఏదో తప్పు జరిగింది</string>
+ <string name="trusted_device_enrollment_error_dialog_message">దురదృష్టవశాత్తూ, ప్రస్తుతం ఈ ఫీచర్‌ను ఆన్ చేయడం సాధ్యపడలేదు. దయచేసి మళ్లీ ట్రై చేయండి.</string>
+ <string name="create_phone_lock_dialog_title">మీ ఫోన్‌లో స్క్రీన్ లాక్‌ను క్రియేట్ చేయండి</string>
+ <string name="create_phone_lock_dialog_message">మీ ఫోన్‌కు స్క్రీన్ లాక్‌ను సెట్ చేసి లేదు. మీ ఫోన్ ద్వారా మీ కారు ప్రొఫైల్‌ను అన్‌లాక్ చేయడానికి, ముందుగా మీ ఫోన్ సెట్టింగ్‌లలో స్క్రీన్ లాక్‌ను (దీనిని పాస్‌కోడ్ అని కూడా అంటారు) క్రియేట్ చేయండి.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">కొత్త మెసేజ్</item>
+ <item quantity="other">%d కొత్త మెసేజ్‌లు</item>
+ </plurals>
+ <string name="name_not_available">పేరు అందుబాటులో లేదు</string>
</resources>
diff --git a/companiondevice/res/values-th/strings.xml b/companiondevice/res/values-th/strings.xml
index ed66626..40252ef 100644
--- a/companiondevice/res/values-th/strings.xml
+++ b/companiondevice/res/values-th/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"อุปกรณ์ที่เชื่อมโยง"</string>
- <string name="add_device_title" msgid="6166003577845888151">"เพิ่มอุปกรณ์ที่เชื่อมโยง"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"เชื่อมต่ออุปกรณ์ที่ใช้ร่วมกัน"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"คุณใช้โทรศัพท์เป็นอุปกรณ์ที่ใช้ร่วมกันเพื่อจัดการประสบการณ์การขับขี่ได้"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"ตรวจสอบว่าคุณมี"<b>"แอปที่ใช้ร่วมกัน"</b>"ติดตั้งอยู่ในโทรศัพท์"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"ยืนยันรหัสในโทรศัพท์"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"ยืนยันว่ารหัสนี้ตรงกับรหัสที่แสดงในโทรศัพท์"</string>
- <string name="associated_device_success" msgid="584760065696870256">"เชื่อมโยงอุปกรณ์สำเร็จแล้ว"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"เปิดแอปและเชื่อมต่อกับ &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"เปิดแอปและทำตามวิธีการในคู่มือการใช้งาน"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"เลิกจำ &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; ไหม"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"รถคันนี้เลิกจับคู่กับอุปกรณ์เครื่องนี้แล้ว นอกจากนี้ คุณจะต้องนำรถออกจากแอปที่ใช้ร่วมกันด้วย"</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"เลิกจำ <xliff:g id="PHONE_NAME">%1$s</xliff:g> แล้ว"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"เลิกจำ <xliff:g id="PHONE_NAME">%1$s</xliff:g> ไม่สำเร็จ"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"ตั้งค่าต่อในโทรศัพท์ของคุณ"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"เกิดข้อผิดพลาด"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"ขออภัย ระบบไม่อาจแสดงหน้าจอนี้ได้อย่างถูกต้อง โปรดลองอีกครั้ง"</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"เปิดบลูทูธ"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"รถยนต์ต้องเปิดบลูทูธจึงจะตั้งค่าให้โทรศัพท์เป็นอุปกรณ์ที่ใช้ร่วมกันได้"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"เปิดบลูทูธไหม"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"รถยนต์ต้องเปิดบลูทูธจึงจะเชื่อมต่อกับอุปกรณ์ที่ใช้ร่วมกันได้"</string>
- <string name="accept" msgid="1454710793329618813">"ยอมรับ"</string>
- <string name="reject" msgid="4315432282758892890">"ปฏิเสธ"</string>
- <string name="confirm" msgid="3748997214719276945">"ยืนยัน"</string>
- <string name="cancel" msgid="4306609731174629323">"ยกเลิก"</string>
- <string name="remove" msgid="5513398257088729188">"นำออก"</string>
- <string name="ok" msgid="2825038997730899083">"ตกลง"</string>
- <string name="connection" msgid="2798490936433656846">"การเชื่อมต่อ"</string>
- <string name="forget_title" msgid="3027608547243824729">"เลิกจำอุปกรณ์นี้"</string>
- <string name="forget" msgid="2069897665699141222">"เลิกจำ"</string>
- <string name="disable" msgid="4619854429066283970">"ปิดใช้"</string>
- <string name="enable" msgid="7656386199154111316">"เปิดใช้"</string>
- <string name="continue_button" msgid="2748318968566159950">"ต่อไป"</string>
- <string name="retry" msgid="3783419451480721367">"ลองอีกครั้ง"</string>
- <string name="turn_on" msgid="4288754850470994812">"เปิด"</string>
- <string name="not_now" msgid="8764692269093707622">"ไว้ทีหลัง"</string>
- <string name="connected" msgid="8051190714042020471">"เชื่อมต่อแล้ว"</string>
- <string name="notDetected" msgid="4115229772085594506">"ไม่พบ"</string>
- <string name="disconnected" msgid="8526513868622591894">"เลิกเชื่อมต่อแล้ว"</string>
- <string name="unknown" msgid="555736316465118024">"ไม่ทราบ"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"บริการ SMS ทางโทรศัพท์ทำงานอยู่"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"เปิดใช้งานบริการรับส่งข้อความทางโทรศัพท์อยู่"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"รับ SMS ผ่านอุปกรณ์ที่ใช้ร่วมกัน"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"ปลดล็อกโปรไฟล์ด้วยโทรศัพท์"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"ไปที่แอปที่ใช้ร่วมกันเพื่อกำหนดตัวเลือกการปลดล็อก"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"อนุญาตให้ &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; ปลดล็อกโปรไฟล์ของฉัน"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"โทรศัพท์ต้องเชื่อมต่ออยู่"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"หากต้องการเปิดฟีเจอร์นี้ ให้ตรวจสอบว่ารถยนต์และโทรศัพท์เปิดบลูทูธอยู่ และอุปกรณ์ทั้ง 2 นี้อยู่ใกล้กัน"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"ตอนนี้ &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; ปลดล็อกโปรไฟล์ของคุณได้แล้ว"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"สร้างการล็อกโปรไฟล์หลัก"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"หากต้องการใช้โทรศัพท์เพื่อปลดล็อกโปรไฟล์ คุณต้องมีการล็อกโปรไฟล์หลักเป็นรายการสำรอง"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"ปลดล็อกโปรไฟล์เพื่อเสร็จสิ้นขั้นตอน"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"คุณสร้างการล็อกโปรไฟล์ใหม่แล้ว ต่อไปให้ป้อนอีกครั้งเพื่อยืนยันว่าโทรศัพท์ปลดล็อกโปรไฟล์ได้โดยอัตโนมัติ"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"เลิกเชื่อมต่ออุปกรณ์นี้"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"เชื่อมต่ออุปกรณ์นี้ใหม่"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"ปลดล็อกด้วยโทรศัพท์"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"อนุญาตให้โทรศัพท์ปลดล็อกโปรไฟล์ของคุณ"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"แตะที่นี่เพื่อให้สิทธิ์ฟีเจอร์นี้"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"เกิดข้อผิดพลาด"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"ขออภัย ระบบเปิดฟีเจอร์นี้ไม่ได้ในขณะนี้ โปรดลองอีกครั้ง"</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"สร้างการล็อกหน้าจอในโทรศัพท์"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"โทรศัพท์ยังไม่ได้ตั้งค่าการล็อกหน้าจอ หากต้องการปลดล็อกโปรไฟล์รถยนต์ด้วยโทรศัพท์ ก่อนอื่นให้สร้างการล็อกหน้าจอ (หรือรหัสผ่าน) ในการตั้งค่าโทรศัพท์"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">อุปกรณ์ที่เชื่อมโยง</string>
+ <string name="add_device_title">เพิ่มอุปกรณ์ที่เชื่อมโยง</string>
+ <string name="add_associated_device_title">เชื่อมต่ออุปกรณ์ที่ใช้ร่วมกัน</string>
+ <string name="add_associated_device_instruction">คุณใช้โทรศัพท์เป็นอุปกรณ์ที่ใช้ร่วมกันเพื่อช่วยจัดการประสบการณ์การขับขี่ได้</string>
+ <string name="associated_device_install_app">ตรวจสอบว่าคุณมี<b>แอปที่ใช้ร่วมกัน</b>ติดตั้งอยู่ในโทรศัพท์</string>
+ <string name="associated_device_pairing_code_title">ยืนยันรหัสในโทรศัพท์</string>
+ <string name="associated_device_pairing_message">ยืนยันว่ารหัสนี้ตรงกับรหัสที่แสดงในโทรศัพท์</string>
+ <string name="associated_device_success">เชื่อมโยงอุปกรณ์สำเร็จแล้ว</string>
+ <string name="associated_device_select_device">เปิดแอปและเชื่อมต่อกับ &lt;b&gt;%1$s&lt;b&gt;</string>
+ <string name="associated_device_open_app">เปิดแอปและทำตามวิธีการในแอป</string>
+ <string name="remove_associated_device_title">เลิกจำ &lt;b&gt;%1$s&lt;/b&gt; ไหม</string>
+ <string name="remove_associated_device_message">รถคันนี้เลิกจับคู่กับอุปกรณ์เครื่องนี้แล้ว นอกจากนี้ คุณจะต้องนำรถออกจากแอปที่ใช้ร่วมกันด้วย</string>
+ <string name="device_removed_success_toast_text">เลิกจำ %1$s แล้ว</string>
+ <string name="device_removed_failure_toast_text">เลิกจำ %1$s ไม่สำเร็จ</string>
+ <string name="continue_setup_toast_text">ตั้งค่าต่อในโทรศัพท์ของคุณ</string>
+ <string name="error_screen_title">เกิดข้อผิดพลาด</string>
+ <string name="error_screen_message">ขออภัย ระบบไม่อาจแสดงหน้าจอนี้ได้อย่างถูกต้อง โปรดลองอีกครั้ง</string>
+ <string name="turn_on_bluetooth_title">เปิดบลูทูธ</string>
+ <string name="turn_on_bluetooth_message">รถยนต์ต้องเปิดบลูทูธจึงจะตั้งค่าให้โทรศัพท์เป็นอุปกรณ์ที่ใช้ร่วมกันได้</string>
+ <string name="turn_on_bluetooth_dialog_title">เปิดบลูทูธไหม</string>
+ <string name="turn_on_bluetooth_dialog_message">รถยนต์ต้องเปิดบลูทูธจึงจะเชื่อมต่อกับอุปกรณ์ที่ใช้ร่วมกันได้</string>
+ <string name="accept">ยอมรับ</string>
+ <string name="reject">ปฏิเสธ</string>
+ <string name="confirm">ยืนยัน</string>
+ <string name="cancel">ยกเลิก</string>
+ <string name="remove">นำออก</string>
+ <string name="ok">ตกลง</string>
+ <string name="connection">การเชื่อมต่อ</string>
+ <string name="forget_title">เลิกจำอุปกรณ์นี้</string>
+ <string name="forget">เลิกจำ</string>
+ <string name="disable">ปิดใช้</string>
+ <string name="enable">เปิดใช้</string>
+ <string name="continue_button">ต่อไป</string>
+ <string name="retry">ลองอีกครั้ง</string>
+ <string name="turn_on">เปิด</string>
+ <string name="not_now">ไว้ทีหลัง</string>
+ <string name="connected">เชื่อมต่อแล้ว</string>
+ <string name="notDetected">ไม่พบ</string>
+ <string name="disconnected">เลิกเชื่อมต่อแล้ว</string>
+ <string name="unknown">ไม่ทราบ</string>
+ <string name="app_running_msg_channel_name">บริการ SMS ทางโทรศัพท์ทำงานอยู่</string>
+ <string name="app_running_msg_notification_title">เปิดใช้งานบริการ SMS ทางโทรศัพท์อยู่</string>
+ <string name="app_running_msg_notification_content">รับ SMS ผ่านอุปกรณ์ที่ใช้ร่วมกัน</string>
+ <string name="trusted_device_feature_title">ปลดล็อกโปรไฟล์ด้วยโทรศัพท์</string>
+ <string name="trusted_device_feature_instruction">ไปที่แอปที่ใช้ร่วมกันเพื่อกำหนดตัวเลือกการปลดล็อก</string>
+ <string name="trusted_device_item_title">อนุญาตให้ &lt;b&gt;%1$s&lt;/b&gt; ปลดล็อกโปรไฟล์ของฉัน</string>
+ <string name="device_not_connected_dialog_title">โทรศัพท์ต้องเชื่อมต่ออยู่</string>
+ <string name="device_not_connected_dialog_message">หากต้องการเปิดฟีเจอร์นี้ ให้ตรวจสอบว่ารถยนต์และโทรศัพท์เปิดบลูทูธอยู่ และอุปกรณ์ทั้ง 2 นี้อยู่ใกล้กัน</string>
+ <string name="trusted_device_enrollment_success_message">ตอนนี้ &lt;b&gt;%1$s&lt;/b&gt; ปลดล็อกโปรไฟล์ของคุณได้แล้ว</string>
+ <string name="create_profile_lock_dialog_title">สร้างการล็อกโปรไฟล์หลัก</string>
+ <string name="create_profile_lock_dialog_message">หากต้องการใช้โทรศัพท์เพื่อปลดล็อกโปรไฟล์ คุณต้องมีการล็อกโปรไฟล์หลักเป็นรายการสำรอง</string>
+ <string name="unlock_profile_to_finish_title">ปลดล็อกโปรไฟล์เพื่อเสร็จสิ้นขั้นตอน</string>
+ <string name="unlock_profile_to_finish_message">คุณสร้างการล็อกโปรไฟล์ใหม่แล้ว ต่อไปให้ป้อนอีกครั้งเพื่อยืนยันว่าโทรศัพท์ปลดล็อกโปรไฟล์ได้โดยอัตโนมัติ</string>
+ <string name="disable_device_connection_text">เลิกเชื่อมต่ออุปกรณ์นี้</string>
+ <string name="enable_device_connection_text">เชื่อมต่ออุปกรณ์นี้ใหม่</string>
+ <string name="trusted_device_notification_channel_name">ปลดล็อกด้วยโทรศัพท์</string>
+ <string name="trusted_device_notification_title">อนุญาตให้โทรศัพท์ปลดล็อกโปรไฟล์ของคุณ</string>
+ <string name="trusted_device_notification_content">แตะที่นี่เพื่อให้สิทธิ์ฟีเจอร์นี้</string>
+ <string name="trusted_device_enrollment_error_dialog_title">เกิดข้อผิดพลาด</string>
+ <string name="trusted_device_enrollment_error_dialog_message">ขออภัย ระบบเปิดฟีเจอร์นี้ไม่ได้ในขณะนี้ โปรดลองอีกครั้ง</string>
+ <string name="create_phone_lock_dialog_title">สร้างการล็อกหน้าจอในโทรศัพท์</string>
+ <string name="create_phone_lock_dialog_message">โทรศัพท์ยังไม่ได้ตั้งค่าการล็อกหน้าจอ หากต้องการปลดล็อกโปรไฟล์รถยนต์ด้วยโทรศัพท์ ก่อนอื่นให้สร้างการล็อกหน้าจอ (หรือรหัสผ่าน) ในการตั้งค่าโทรศัพท์</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">ข้อความใหม่</item>
+ <item quantity="other">%d ข้อความใหม่</item>
+ </plurals>
+ <string name="name_not_available">ไม่มีชื่อ</string>
</resources>
diff --git a/companiondevice/res/values-tl/strings.xml b/companiondevice/res/values-tl/strings.xml
index 3befd90..6d707c2 100644
--- a/companiondevice/res/values-tl/strings.xml
+++ b/companiondevice/res/values-tl/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Nauugnay na Device"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Magdagdag ng Nauugnay na Device"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Magkonekta ng kasamang device"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Puwede mong gamitin ang telepono mo bilang isang kasamang device para tumulong sa iyong pagmamaneho"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Tiyaking may naka-install kang "<b>"Kasamang App"</b>" sa telepono mo"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Code sa pagkumpirma sa telepono"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Kumpirmahing tumutugma ito sa code na ipinapakita sa telepono mo"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Naiugnay ang device"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Buksan ang app at kumonekta sa &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Buksan ang app at sundin ang tagubilin"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Kalimutan ang &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Hindi na ipapares ang kotseng ito sa device na ito. Dagdag pa rito, kakailanganin mong alisin ang kotseng ito sa Kasamang app."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Nakalimutan ang <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Hindi nakalimutan ang <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Ipagpatuloy ang pag-set up sa iyong telepono"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Nagkaproblema"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Sa kasamaang-palad, hindi makapag-display nang maayos ang screen na ito. Subukan ulit."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"I-on ang Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Para i-set up ang telepono mo bilang isang kasamang device, kailangan ng kotse mo ng Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"I-on ang Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Para kumonekta sa iyong kasamang device, kailangan ng kotse mo ng Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Tanggapin"</string>
- <string name="reject" msgid="4315432282758892890">"Tanggihan"</string>
- <string name="confirm" msgid="3748997214719276945">"Kumpirmahin"</string>
- <string name="cancel" msgid="4306609731174629323">"Kanselahin"</string>
- <string name="remove" msgid="5513398257088729188">"Alisin"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Koneksyon"</string>
- <string name="forget_title" msgid="3027608547243824729">"Kalimutan ang device na ito"</string>
- <string name="forget" msgid="2069897665699141222">"Kalimutan"</string>
- <string name="disable" msgid="4619854429066283970">"I-disable"</string>
- <string name="enable" msgid="7656386199154111316">"I-enable"</string>
- <string name="continue_button" msgid="2748318968566159950">"Magpatuloy"</string>
- <string name="retry" msgid="3783419451480721367">"Subukan ulit"</string>
- <string name="turn_on" msgid="4288754850470994812">"I-on"</string>
- <string name="not_now" msgid="8764692269093707622">"Huwag muna"</string>
- <string name="connected" msgid="8051190714042020471">"Konektado"</string>
- <string name="notDetected" msgid="4115229772085594506">"Hindi na-detect"</string>
- <string name="disconnected" msgid="8526513868622591894">"Nadiskonekta"</string>
- <string name="unknown" msgid="555736316465118024">"Hindi alam"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Gumagana ang serbisyo ng text message ng telepono"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Aktibo ang serbisyo ng text messaging ng telepono"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Nakakatanggap ng mga text message sa pamamagitan ng kasamang device"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"I-unlock ang profile gamit ang telepono"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Tingnan ang iyong Kasamang App para magtakda ng mga ospyon sa pag-unlock"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Hayaan ang &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; na i-unlock ang profile ko"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Dapat na aktibong nakakonekta ang telepono mo"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Para ma-on ang feature na ito, tiyaking naka-on ang bluetooth sa iyong kotse at telepono at malapit ang mga ito sa isa\'t isa"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"Puwede nang ma-unlock ng &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; ang profile mo"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Gumawa ng pangunahing lock ng profile"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Para magamit ang telepono mo para i-unlock ang iyong profile, kailangan mo ng pangunahing lock ng profile bilang isang backup"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"I-unlock ang profile mo para tapusin"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Nakagawa ka ng bagong lock ng profile. Pagkatapos, ilagay ito ulit para kumpirmahing puwedeng awtomatikong i-unlock ng telepono mo ang iyong profile"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Idiskonekta ang device na ito"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Ikonekta ulit ang device na ito"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"I-unlock gamit ang telepono"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Hayaan ang iyong telepono na i-unlock ang profile mo"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Mag-tap dito para pahintulutan ang feature na ito"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Nagkaproblema"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Sa kasawiang-palad, hindi ma-on ang feature na ito sa oras na ito. Subukan ulit."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Gumawa ng lock ng screen sa iyong telepono"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Walang nakatakdang lock ng screen ang telepono mo. Para ma-unlock ang profile ng kotse mo gamit ang iyong telepono, gumawa muna ng lock ng screen (na tinatawag ding passcode) sa mga setting ng telepono mo."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Nauugnay na Device</string>
+ <string name="add_device_title">Magdagdag ng Nauugnay na Device</string>
+ <string name="add_associated_device_title">Magkonekta ng kasamang device</string>
+ <string name="add_associated_device_instruction">Puwede mong gamitin ang iyong telepono bilang kasamang device para tumulong sa pagmamaneho mo</string>
+ <string name="associated_device_install_app">Tiyaking may naka-install kang <b>Kasamang App</b> sa telepono mo</string>
+ <string name="associated_device_pairing_code_title">Kumpirmahin ang code sa telepono</string>
+ <string name="associated_device_pairing_message">Kumpirmahing tumutugma ito sa code na ipinapakita sa telepono mo</string>
+ <string name="associated_device_success">Matagumpay na naiugnay ang device</string>
+ <string name="associated_device_select_device">Buksan ang app at kumonekta sa &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Buksan ang app at sundin ang mga tagubilin sa app</string>
+ <string name="remove_associated_device_title">Kalimutan ang &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Hindi na ipapares ang sasakyang ito sa device na ito. Bukod pa rito, kakailanganin mong alisin ang sasakyang ito sa Kasamang app.</string>
+ <string name="device_removed_success_toast_text">Nakalimutan ang %1$s</string>
+ <string name="device_removed_failure_toast_text">Hindi nakalimutan ang %1$s</string>
+ <string name="continue_setup_toast_text">Ipagpatuloy ang pag-set up sa iyong telepono</string>
+ <string name="error_screen_title">Nagkaproblema</string>
+ <string name="error_screen_message">Sa kasamaang-palad, hindi makapag-display nang maayos ang screen na ito. Pakisubukan ulit.</string>
+ <string name="turn_on_bluetooth_title">I-on ang Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Para ma-set up ang telepono mo bilang kasamang device, kailangan ng iyong sasakyan ng Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">I-on ang Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Para kumonekta sa iyong kasamang device, kailangan ng sasakyan mo ng Bluetooth.</string>
+ <string name="accept">Tanggapin</string>
+ <string name="reject">Tanggihan</string>
+ <string name="confirm">Kumpirmahin</string>
+ <string name="cancel">Kanselahin</string>
+ <string name="remove">Alisin</string>
+ <string name="ok">OK</string>
+ <string name="connection">Koneksyon</string>
+ <string name="forget_title">Kalimutan ang device na ito</string>
+ <string name="forget">Kalimutan</string>
+ <string name="disable">I-disable</string>
+ <string name="enable">I-enable</string>
+ <string name="continue_button">Magpatuloy</string>
+ <string name="retry">Subukan ulit</string>
+ <string name="turn_on">I-on</string>
+ <string name="not_now">Huwag muna</string>
+ <string name="connected">Nakakonekta</string>
+ <string name="notDetected">Hindi na-detect</string>
+ <string name="disconnected">Nadiskonekta</string>
+ <string name="unknown">Hindi Alam</string>
+ <string name="app_running_msg_channel_name">Gumagana ang serbisyo ng text message ng telepono</string>
+ <string name="app_running_msg_notification_title">Aktibo ang serbisyo ng text messaging ng telepono</string>
+ <string name="app_running_msg_notification_content">Nakakatanggap ng mga text message sa pamamagitan ng kasamang device</string>
+ <string name="trusted_device_feature_title">I-unlock ang profile gamit ang telepono</string>
+ <string name="trusted_device_feature_instruction">Tingnan ang iyong Kasamang App para magtakda ng mga ospyon sa pag-unlock</string>
+ <string name="trusted_device_item_title">Hayaan ang &lt;b&gt;%1$s&lt;/b&gt; na i-unlock ang profile ko</string>
+ <string name="device_not_connected_dialog_title">Dapat aktibong nakakonekta ang iyong telepono</string>
+ <string name="device_not_connected_dialog_message">Para ma-on ang feature na ito, tiyaking naka-on ang bluetooth sa iyong sasakyan at telepono at malapit ang mga ito sa isa\'t isa</string>
+ <string name="trusted_device_enrollment_success_message">Maa-unlock na ngayon ng &lt;b&gt;%1$s&lt;/b&gt; ang iyong profile</string>
+ <string name="create_profile_lock_dialog_title">Gumawa ng pangunahing lock ng profile</string>
+ <string name="create_profile_lock_dialog_message">Para magamit ang telepono mo para i-unlock ang iyong profile, kailangan mo ng pangunahing lock ng profile bilang backup</string>
+ <string name="unlock_profile_to_finish_title">I-unlock ang iyong profile para tapusin</string>
+ <string name="unlock_profile_to_finish_message">Gumawa ka ng bagong lock ng profile. Pagkatapos, ilagay ito ulit para kumpirmahing puwedeng awtomatikong i-unlock ng iyong telepono ang profile mo</string>
+ <string name="disable_device_connection_text">Idiskonekta ang device na ito</string>
+ <string name="enable_device_connection_text">Ikonekta ulit ang device na ito</string>
+ <string name="trusted_device_notification_channel_name">I-unlock gamit ang telepono</string>
+ <string name="trusted_device_notification_title">Hayaan ang iyong telepono na i-unlock ang profile mo</string>
+ <string name="trusted_device_notification_content">Mag-tap dito para pahintulutan ang feature na ito</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Nagkaproblema</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Sa kasamaang-palad, hindi ma-on ang feature na ito sa oras na ito. Pakisubukan ulit.</string>
+ <string name="create_phone_lock_dialog_title">Gumawa ng lock ng screen sa iyong telepono</string>
+ <string name="create_phone_lock_dialog_message">Walang nakatakdang lock ng screen ang iyong telepono. Para ma-unlock ang profile ng iyong sasakyan gamit ang telepono mo, gumawa muna ng lock ng screen (na tinatawag ding passcode) sa mga setting ng iyong telepono.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d bagong mensahe</item>
+ <item quantity="other">%d na bagong mensahe</item>
+ </plurals>
+ <string name="name_not_available">Hindi available ang pangalan</string>
</resources>
diff --git a/companiondevice/res/values-tr/strings.xml b/companiondevice/res/values-tr/strings.xml
index f69eb24..28a838d 100644
--- a/companiondevice/res/values-tr/strings.xml
+++ b/companiondevice/res/values-tr/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"İlişkilendirilmiş Cihaz"</string>
- <string name="add_device_title" msgid="6166003577845888151">"İlişkilendirilmiş Cihaz Ekle"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Tamamlayıcı cihaz bağlama"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Sürüş deneyiminizi yönetmenize yardımcı olması için telefonunuzu tamamlayıcı cihaz olarak kullanabilirsiniz"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Telefonunuzda "<b>"Tamamlayıcı Uygulamanın"</b>" yüklü olduğundan emin olun"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Kodu telefonda onaylayın"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Bunun telefonunuzda gösterilen kodla aynı olduğunu onaylayın"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Cihaz başarıyla ilişkilendirildi"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Uygulamayı açıp &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; adlı araca bağlanın"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Uygulamayı açıp uygulamanın talimatlarını uygulayın"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; unutulsun mu?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Aracınızın bu cihazla olan eşlemesi kaldırılacak. Ek olarak bu aracı Tamamlayıcı uygulamadan kaldırmanız gerekir."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> unutuldu"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> unutulamadı"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Kurulum işlemine telefonunuzda devam edin"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Hata oluştu"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Maalesef bu ekran düzgün görüntülenemedi. Lütfen tekrar deneyin."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Bluetooth\'u aç"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Telefonunuzu tamamlayıcı cihaz olarak ayarlamak için aracınızın Bluetooth\'a ihtiyacı var."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Bluetooth açılsın mı?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Aracınızın, tamamlayıcı cihazınıza bağlanması için Bluetooth\'a ihtiyacı var."</string>
- <string name="accept" msgid="1454710793329618813">"Kabul et"</string>
- <string name="reject" msgid="4315432282758892890">"Reddet"</string>
- <string name="confirm" msgid="3748997214719276945">"Onayla"</string>
- <string name="cancel" msgid="4306609731174629323">"İptal"</string>
- <string name="remove" msgid="5513398257088729188">"Kaldır"</string>
- <string name="ok" msgid="2825038997730899083">"Tamam"</string>
- <string name="connection" msgid="2798490936433656846">"Bağlantı"</string>
- <string name="forget_title" msgid="3027608547243824729">"Bu cihazı unut"</string>
- <string name="forget" msgid="2069897665699141222">"Unut"</string>
- <string name="disable" msgid="4619854429066283970">"Devre dışı bırak"</string>
- <string name="enable" msgid="7656386199154111316">"Etkinleştir"</string>
- <string name="continue_button" msgid="2748318968566159950">"Devam"</string>
- <string name="retry" msgid="3783419451480721367">"Tekrar dene"</string>
- <string name="turn_on" msgid="4288754850470994812">"Aç"</string>
- <string name="not_now" msgid="8764692269093707622">"Şimdi değil"</string>
- <string name="connected" msgid="8051190714042020471">"Bağlı"</string>
- <string name="notDetected" msgid="4115229772085594506">"Algılanmadı"</string>
- <string name="disconnected" msgid="8526513868622591894">"Bağlı değil"</string>
- <string name="unknown" msgid="555736316465118024">"Bilinmiyor"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Telefon kısa mesaj hizmeti çalışıyor"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Telefon kısa mesaj hizmeti etkin"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Tamamlayıcı cihazdan kısa mesajlar alınıyor"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Profilin kilidini telefonla açma"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Kilit açma seçeneklerini ayarlamak için Tamamlayıcı Uygulamanızı kontrol edin"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; adlı telefonun profilimin kilidini açmasına izin ver"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefonunuz aktif olarak bağlı olmalıdır"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Bu özelliği açmak için aracınız ile telefonunuzun Bluetooth\'larının açık ve birbirlerine yakın olduğundan emin olun"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;, artık profilinizin kilidini açabilir"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Birincil profil kilidi oluşturun"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Telefonunuzu kullanarak profilinizin kilidini açmak için yedek olarak birincil profil kilidine ihtiyacınız var"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"İşlemi tamamlamak için profilinizin kilidini açın"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Yeni bir profil kilidi oluşturdunuz. Sonraki adım olarak, telefonunuzun profilinizin kilidini otomatik olarak açabildiğini onaylamak için tekrar girin"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Bu cihazın bağlantısını kes"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Bu cihazı yeniden bağla"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Telefonla kilidi açma"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Telefonunuzun profilinizin kilidini açmasına izin verin"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Bu özelliği yetkilendirmek için buraya dokunun"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Hata oluştu"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Maalesef bu özellik şu anda açılamıyor. Lütfen tekrar deneyin."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Telefonunuzda ekran kilidi oluşturun"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Telefonunuzun ekran kilidi ayarlanmamış. Araç profilinizin kilidini telefonunuzla açmak için önce telefonunuzun ayarlarında bir ekran kilidi (şifre kodu olarak da bilinir) oluşturun."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">İlişkilendirilmiş Cihaz</string>
+ <string name="add_device_title">İlişkilendirilmiş Cihaz Ekle</string>
+ <string name="add_associated_device_title">Tamamlayıcı cihaz bağlayın</string>
+ <string name="add_associated_device_instruction">Sürüş deneyiminizi daha iyi yönetmek için telefonunuzu tamamlayıcı cihaz olarak kullanabilirsiniz</string>
+ <string name="associated_device_install_app">Telefonda <b>Tamamlayıcı Uygulamanın</b> yüklü olduğundan emin olun</string>
+ <string name="associated_device_pairing_code_title">Kodu telefonda onaylayın</string>
+ <string name="associated_device_pairing_message">Bunun telefonunuzda gösterilen kodla aynı olduğunu onaylayın</string>
+ <string name="associated_device_success">Cihaz başarıyla ilişkilendirildi</string>
+ <string name="associated_device_select_device">Uygulamayı açıp &lt;b&gt;%1$s&lt;b&gt; adlı arabaya bağlanın</string>
+ <string name="associated_device_open_app">Uygulamayı açıp uygulamanın talimatlarını izleyin</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; unutulsun mu?</string>
+ <string name="remove_associated_device_message">Aracınızın bu cihazla olan eşlemesi kaldırılacak. Ek olarak bu aracı Tamamlayıcı uygulamadan kaldırmanız gerekir.</string>
+ <string name="device_removed_success_toast_text">%1$s unutuldu</string>
+ <string name="device_removed_failure_toast_text">%1$s unutulamadı</string>
+ <string name="continue_setup_toast_text">Kurulum işlemine telefonunuzda devam edin</string>
+ <string name="error_screen_title">Bir hata oluştu</string>
+ <string name="error_screen_message">Maalesef bu ekran düzgün görüntülenemedi. Lütfen tekrar deneyin.</string>
+ <string name="turn_on_bluetooth_title">Bluetooth\'u açın</string>
+ <string name="turn_on_bluetooth_message">Telefonunuzu tamamlayıcı cihaz olarak ayarlamak için aracınızın Bluetooth\'a ihtiyacı var.</string>
+ <string name="turn_on_bluetooth_dialog_title">Bluetooth açılsın mı?</string>
+ <string name="turn_on_bluetooth_dialog_message">Aracınızın, tamamlayıcı cihazınıza bağlanması için Bluetooth\'a ihtiyacı var.</string>
+ <string name="accept">Kabul et</string>
+ <string name="reject">Reddet</string>
+ <string name="confirm">Onayla</string>
+ <string name="cancel">İptal</string>
+ <string name="remove">Kaldır</string>
+ <string name="ok">Tamam</string>
+ <string name="connection">Bağlantı</string>
+ <string name="forget_title">Bu cihazı unut</string>
+ <string name="forget">Unut</string>
+ <string name="disable">Devre dışı bırak</string>
+ <string name="enable">Etkinleştir</string>
+ <string name="continue_button">Devam</string>
+ <string name="retry">Tekrar dene</string>
+ <string name="turn_on">Aç</string>
+ <string name="not_now">Şimdi değil</string>
+ <string name="connected">Bağlı</string>
+ <string name="notDetected">Algılanmadı</string>
+ <string name="disconnected">Bağlı değil</string>
+ <string name="unknown">Bilinmiyor</string>
+ <string name="app_running_msg_channel_name">Telefon kısa mesaj hizmeti çalışıyor</string>
+ <string name="app_running_msg_notification_title">Telefon kısa mesaj hizmeti etkin</string>
+ <string name="app_running_msg_notification_content">Tamamlayıcı cihazdan kısa mesajlar alınıyor</string>
+ <string name="trusted_device_feature_title">Profilin kilidini telefonla açma</string>
+ <string name="trusted_device_feature_instruction">Kilit açma seçeneklerini ayarlamak için Tamamlayıcı Uygulamanızı kontrol edin</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; adlı telefonun profilimin kilidini açmasına izin ver</string>
+ <string name="device_not_connected_dialog_title">Telefonunuz aktif olarak bağlı olmalıdır</string>
+ <string name="device_not_connected_dialog_message">Bu özelliği açmak için aracınız ile telefonunuzun Bluetooth\'larının açık ve birbirlerine yakın olduğundan emin olun</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt;, artık profilinizin kilidini açabilir</string>
+ <string name="create_profile_lock_dialog_title">Birincil profil kilidi oluşturun</string>
+ <string name="create_profile_lock_dialog_message">Telefonunuzu kullanarak profilinizin kilidini açmak için birincil profil kilidine yedek olarak ihtiyacınız var</string>
+ <string name="unlock_profile_to_finish_title">İşlemi tamamlamak için profilinizin kilidini açın</string>
+ <string name="unlock_profile_to_finish_message">Yeni bir profil kilidi oluşturdunuz. Sonraki adımda, telefonunuzla profilinizin kilidini otomatik olarak açabildiğinizi onaylamak için tekrar girin</string>
+ <string name="disable_device_connection_text">Bu cihazın bağlantısını kes</string>
+ <string name="enable_device_connection_text">Bu cihazı yeniden bağla</string>
+ <string name="trusted_device_notification_channel_name">Telefonla kilidi açma</string>
+ <string name="trusted_device_notification_title">Telefonunuzun profilinizin kilidini açmasına izin verin</string>
+ <string name="trusted_device_notification_content">Bu özelliği yetkilendirmek için buraya dokunun</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Bir hata oluştu</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Maalesef bu özellik şu anda açılamıyor. Lütfen tekrar deneyin.</string>
+ <string name="create_phone_lock_dialog_title">Telefonunuzda ekran kilidi oluşturun</string>
+ <string name="create_phone_lock_dialog_message">Telefonunuzun ekran kilidi ayarlanmamış. Araç profilinizin kilidini telefonunuzla açmak için önce telefonunuzun ayarlarında bir ekran kilidi (şifre kodu olarak da bilinir) oluşturun.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Yeni mesaj</item>
+ <item quantity="other">%d yeni mesaj</item>
+ </plurals>
+ <string name="name_not_available">Ad kullanılamıyor</string>
</resources>
diff --git a/companiondevice/res/values-uk/strings.xml b/companiondevice/res/values-uk/strings.xml
index 2087e54..be748d1 100644
--- a/companiondevice/res/values-uk/strings.xml
+++ b/companiondevice/res/values-uk/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,76 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Зв\'язаний пристрій"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Додати зв\'язаний пристрій"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Підключити супутній пристрій"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Ви можете використовувати телефон як супутній пристрій, що допомагатиме вам за кермом"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Переконайтеся, що на телефоні встановлено "<b>"супутній додаток"</b></string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Підтвердьте код на телефоні"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Підтвердьте, що на телефоні з\'явився такий самий код"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Пристрій зв\'язано"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Відкрийте додаток і підключіться до &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Відкрийте додаток і виконайте вказівки"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Забути &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Цей автомобіль більше не буде підключено до цього пристрою. Також потрібно вилучити його із супутнього додатка."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> забуто"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Не вдалося забути <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Продовжте налаштування на телефоні"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Сталася помилка"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Не вдалося правильно відобразити цей екран. Повторіть спробу."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Увімкнути Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Щоб налаштувати телефон як супутній пристрій, в автомобілі потрібно ввімкнути Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Увімкнути Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Щоб підключитися до супутнього пристрою, в автомобілі потрібно ввімкнути Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Прийняти"</string>
- <string name="reject" msgid="4315432282758892890">"Відхилити"</string>
- <string name="confirm" msgid="3748997214719276945">"Підтвердити"</string>
- <string name="cancel" msgid="4306609731174629323">"Скасувати"</string>
- <string name="remove" msgid="5513398257088729188">"Вилучити"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Підключення"</string>
- <string name="forget_title" msgid="3027608547243824729">"Забути цей пристрій"</string>
- <string name="forget" msgid="2069897665699141222">"Забути"</string>
- <string name="disable" msgid="4619854429066283970">"Вимкнути"</string>
- <string name="enable" msgid="7656386199154111316">"Увімкнути"</string>
- <string name="continue_button" msgid="2748318968566159950">"Продовжити"</string>
- <string name="retry" msgid="3783419451480721367">"Повторити спробу"</string>
- <string name="turn_on" msgid="4288754850470994812">"Увімкнути"</string>
- <string name="not_now" msgid="8764692269093707622">"Не зараз"</string>
- <string name="connected" msgid="8051190714042020471">"З\'єднано"</string>
- <string name="notDetected" msgid="4115229772085594506">"Не знайдено"</string>
- <string name="disconnected" msgid="8526513868622591894">"Відключено"</string>
- <string name="unknown" msgid="555736316465118024">"Невідомо"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Сервіс текстових повідомлень на телефоні запущено"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Сервіс текстових повідомлень на телефоні активний"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Отримання текстових повідомлень через супутній пристрій"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Розблокувати пристрій через телефон"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Щоб налаштувати розблокування, перейдіть у супутній додаток"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Дозволити пристрою &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; розблокувати мій профіль"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Ваш телефон має бути підключеним"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Щоб увімкнути цю функцію, переконайтеся, що в автомобілі й на телефоні ввімкнено Bluetooth, і що пристрої розташовані поруч"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; тепер може розблоковувати профіль"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Налаштувати основний спосіб блокування профілю"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Щоб розблоковувати профіль телефоном, основний спосіб блокування профілю потрібно зробити резервним"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Розблокуйте профіль, щоб завершити"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Новий спосіб блокування профілю створено. Скористайтеся ним ще раз, щоб підтвердити, що ваш телефон може автоматично розблоковувати профіль."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Відключити цей пристрій"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Підключити цей пристрій знову"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Розблокувати за допомогою телефона"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Дозвольте телефону розблоковувати ваш профіль"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Натисніть тут, щоб дозволити цю функцію"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Сталася помилка"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Наразі цю функцію не можна ввімкнути. Повторіть спробу."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Налаштувати блокування екрана на телефоні"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"На вашому телефоні не налаштовано блокування екрана. Щоб розблоковувати профіль автомобіля телефоном, спершу створіть спосіб блокування екрана (інша назва – код доступу) в налаштуваннях телефона."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Зв\'язаний пристрій</string>
+ <string name="add_device_title">Додати зв\'язаний пристрій</string>
+ <string name="add_associated_device_title">Підключити супутній пристрій</string>
+ <string name="add_associated_device_instruction">Щоб їхати за кермом було ще зручніше, ви можете використовувати телефон як супутній пристрій</string>
+ <string name="associated_device_install_app">Переконайтеся, що на телефоні встановлено <b>супутній додаток</b></string>
+ <string name="associated_device_pairing_code_title">Підтвердьте код на телефоні</string>
+ <string name="associated_device_pairing_message">Підтвердьте, що на телефоні з\'явився такий самий код</string>
+ <string name="associated_device_success">Пристрій зв\'язано</string>
+ <string name="associated_device_select_device">Відкрийте додаток і підключіться до авто &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Відкрийте додаток і виконайте вказівки</string>
+ <string name="remove_associated_device_title">Вилучити автомобіль &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Цей автомобіль більше не буде підключено до цього пристрою. Вам також потрібно вилучити його із супутнього додатка.</string>
+ <string name="device_removed_success_toast_text">Телефон \"%1$s\" вилучено</string>
+ <string name="device_removed_failure_toast_text">Не вдалося вилучити телефон \"%1$s\"</string>
+ <string name="continue_setup_toast_text">Продовжте налаштування на телефоні</string>
+ <string name="error_screen_title">Сталася помилка</string>
+ <string name="error_screen_message">Не вдалося правильно відобразити цей екран. Повторіть спробу.</string>
+ <string name="turn_on_bluetooth_title">Увімкніть Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Щоб налаштувати телефон як супутній пристрій, в автомобілі потрібно ввімкнути Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Увімкнути Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Щоб підключитися до супутнього пристрою, в автомобілі потрібно ввімкнути Bluetooth.</string>
+ <string name="accept">Прийняти</string>
+ <string name="reject">Відхилити</string>
+ <string name="confirm">Підтвердити</string>
+ <string name="cancel">Скасувати</string>
+ <string name="remove">Вилучити</string>
+ <string name="ok">OK</string>
+ <string name="connection">Підключення</string>
+ <string name="forget_title">Вилучити цей пристрій</string>
+ <string name="forget">Вилучити</string>
+ <string name="disable">Вимкнути</string>
+ <string name="enable">Увімкнути</string>
+ <string name="continue_button">Продовжити</string>
+ <string name="retry">Повторити спробу</string>
+ <string name="turn_on">Увімкнути</string>
+ <string name="not_now">Не зараз</string>
+ <string name="connected">Підключено</string>
+ <string name="notDetected">Не знайдено</string>
+ <string name="disconnected">Від\'єднано</string>
+ <string name="unknown">Невідомо</string>
+ <string name="app_running_msg_channel_name">Сервіс текстових повідомлень на телефоні запущено</string>
+ <string name="app_running_msg_notification_title">Сервіс текстових повідомлень на телефоні активний</string>
+ <string name="app_running_msg_notification_content">Текстові повідомлення отримуються через супутній пристрій</string>
+ <string name="trusted_device_feature_title">Розблокувати профіль через телефон</string>
+ <string name="trusted_device_feature_instruction">Щоб налаштувати розблокування, перейдіть у супутній додаток</string>
+ <string name="trusted_device_item_title">Дозволити телефону &lt;b&gt;%1$s&lt;/b&gt; розблоковувати мій профіль</string>
+ <string name="device_not_connected_dialog_title">Ваш телефон має бути підключеним</string>
+ <string name="device_not_connected_dialog_message">Щоб увімкнути цю функцію, переконайтеся, що в автомобілі й на телефоні ввімкнено Bluetooth і що пристрої розташовані поруч</string>
+ <string name="trusted_device_enrollment_success_message">Телефон &lt;b&gt;%1$s&lt;/b&gt; тепер може розблоковувати ваш профіль</string>
+ <string name="create_profile_lock_dialog_title">Налаштувати основний спосіб блокування профілю</string>
+ <string name="create_profile_lock_dialog_message">Щоб розблоковувати профіль через телефон, спершу потрібно налаштувати основний спосіб блокування профілю</string>
+ <string name="unlock_profile_to_finish_title">Щоб завершити, розблокуйте профіль</string>
+ <string name="unlock_profile_to_finish_message">Новий спосіб блокування профілю створено. Скористайтеся ним ще раз, щоб підтвердити, що ваш телефон може автоматично розблоковувати профіль</string>
+ <string name="disable_device_connection_text">Відключити цей пристрій</string>
+ <string name="enable_device_connection_text">Підключити цей пристрій знову</string>
+ <string name="trusted_device_notification_channel_name">Розблокувати через телефон</string>
+ <string name="trusted_device_notification_title">Дозвольте телефону розблоковувати ваш профіль</string>
+ <string name="trusted_device_notification_content">Натисніть тут, щоб дозволити цю функцію</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Сталася помилка</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Наразі цю функцію не можна ввімкнути. Повторіть спробу.</string>
+ <string name="create_phone_lock_dialog_title">Налаштувати блокування екрана на телефоні</string>
+ <string name="create_phone_lock_dialog_message">На вашому телефоні не налаштовано блокування екрана. Щоб розблоковувати профіль автомобіля через телефон, спершу ввімкніть блокування екрана (укажіть код доступу) у налаштуваннях телефона.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d нове повідомлення</item>
+ <item quantity="few">%d нові повідомлення</item>
+ <item quantity="many">%d нових повідомлень</item>
+ <item quantity="other">%d нового повідомлення</item>
+ </plurals>
+ <string name="name_not_available">Ім\'я недоступне</string>
</resources>
diff --git a/companiondevice/res/values-ur/strings.xml b/companiondevice/res/values-ur/strings.xml
index 982b741..b8050b6 100644
--- a/companiondevice/res/values-ur/strings.xml
+++ b/companiondevice/res/values-ur/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"وابستہ آلہ"</string>
- <string name="add_device_title" msgid="6166003577845888151">"وابستہ آلہ شامل کریں"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"ایک ساتھی آلہ سے منسلک کریں"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"اپنے ڈرائیونگ کے تجربہ کو نظم کرنے میں مدد کے ليے آپ اپنے فون کو بطور ساتھی آلہ استعمال کر سکتے ہیں"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"یقینی بنائیں کہ آپ نے اپنے فون پر"<b>"ساتھی ایپ"</b>" کو انسٹال کیا ہے"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"فون پر کوڈ کی تصدیق کریں"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"تصدیق کریں کہ یہ آپ کے فون پر دکھائے گئے کوڈ سے مماثلت ہے"</string>
- <string name="associated_device_success" msgid="584760065696870256">"آلہ کامیابی کے ساتھ وابستہ کر دیا گیا ہے"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"ایپ کھولیں اور lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;‎&amp; سے منسلک کریں"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"ایپ کھولیں اور ایپ میں ہدایات کی پیروی کریں"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;‎&amp; کو بھول جائیں؟"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"اس کار کو اس آلہ کے ساتھ مزید نہیں جوڑا جائے گا۔ آپ کو اضافی طور پر اس کار ساتھی ایپ سے ہٹانے کی ضرورت ہوگی۔"</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> بھول چکا"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> کو بھولنے میں ناکام ہوگیا"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"اپنے فون پر سیٹ اپ جاری رکھیں"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"کچھ غلط ہوگیا"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"بدقسمتی سے، یہ اسکرین ٹھیک سے ڈسپلے نہیں ہوسکی۔ براہ کرم دوبارہ کوشش کریں۔"</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"بلوٹوتھ آن کریں"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"اپنے فون کو بطور ساتھی آلہ سیٹ اپ کرنے کے ليے، آپ کی کار کو بلوٹوتھ کی ضرورت ہے۔"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"بلوٹوتھ آن کریں؟"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"اپنے ساتھی آلہ کو منسلک کرنے کے لیے، آپ کی کار کو بلوٹوتھ کی ضرورت ہے۔"</string>
- <string name="accept" msgid="1454710793329618813">"قبول کریں"</string>
- <string name="reject" msgid="4315432282758892890">"مسترد کریں"</string>
- <string name="confirm" msgid="3748997214719276945">"تصدیق کریں"</string>
- <string name="cancel" msgid="4306609731174629323">"منسوخ کریں"</string>
- <string name="remove" msgid="5513398257088729188">"ہٹائیں"</string>
- <string name="ok" msgid="2825038997730899083">"ٹھیک ہے"</string>
- <string name="connection" msgid="2798490936433656846">"کنکشن"</string>
- <string name="forget_title" msgid="3027608547243824729">"اس آلہ کو بھول جائیں"</string>
- <string name="forget" msgid="2069897665699141222">"بھول جائیں"</string>
- <string name="disable" msgid="4619854429066283970">"غیر فعال کریں"</string>
- <string name="enable" msgid="7656386199154111316">"فعال کریں"</string>
- <string name="continue_button" msgid="2748318968566159950">"جاری رکھیں"</string>
- <string name="retry" msgid="3783419451480721367">"دوبارہ کوشش کریں"</string>
- <string name="turn_on" msgid="4288754850470994812">"آن کریں"</string>
- <string name="not_now" msgid="8764692269093707622">"ابھی نہیں"</string>
- <string name="connected" msgid="8051190714042020471">"منسلک"</string>
- <string name="notDetected" msgid="4115229772085594506">"پتہ نہیں چلا"</string>
- <string name="disconnected" msgid="8526513868622591894">"غیر منسلک"</string>
- <string name="unknown" msgid="555736316465118024">"نامعلوم"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"فون کی ٹیکسٹ پیغام کی سروس چل رہی ہے"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"فون کی ٹیکسٹ پیغام رسانی کی سروس فعال ہے"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"ساتھی آلہ کے ذریعے ٹیکسٹ پیغامات موصول ہو رہے ہیں"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"فون کے ساتھ پروفائل غیر مقفل کریں"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"غیر مقفل کرنے والے اختیارات ترتیب دینے کے ليے اپنے ساتھی ایپ کو چیک کریں"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;b&gt;‎&amp; کو میری پروفائل غیر مقفل کرنے دیں"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"آپ کا فون فعال طور پر منسلک ہونا چاہیے"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"اس خصوصیت کو آن کرنے کے ليے، یقینی بنائیں کہ آپ کی کار اور فون میں بلوٹوتھ آن ہے اور ایک دوسرے کے قریب ہیں"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"‎&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;b&gt;‎ اب آپ کی پروفائل کو غیر مقفل کر سکتا ہیں"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"ایک پرائمری پروفائل قفل تخلیق کریں"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"اپنے فون کو اپنی پروفائل کو غیر مقفل کرنے کے ليے استعمال کرنے کی خاطر، آپ کو بیک اپ کے طور پر ایک پرائمری پروفائل قفل کی ضرورت ہوگی"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"مکمل کرنے کے لیے اپنی پروفائل کو غیر مقفل کریں"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"آپ نے ایک نئی پروفائل قفل تخلیق کیا ہے۔ آگے، تصدیق کرنے کے لیے اسے دوبارہ درج کریں آپ کا فون آپ کی پروفائل کو خودکار طور پر غیر مقفل کر سکتا ہے"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"اس آلہ کو غیر منسلک کریں"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"اس آلہ کو دوبارہ منسلک کريں"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"فون کے ساتھ غیر مقفل کریں"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"آپ کے فون کو اپنی پروفائل غیر مقفل کرنے دیں"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"اس خصوصیت کو اجازت دینے کے ليے یہاں تھپتھپائیں"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"کچھ غلط ہوگیا"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"بدقسمتی سے، اس وقت اس خصوصیت کو آن نہیں کیا جا سکا۔ براہ کرم دوبارہ کوشش کریں۔"</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"اپنے فون پر ایک اسکرین لاک تخلیق کریں"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"آپ کے فون کے پاس اسکرین لاک سیٹ نہیں ہے۔ اپنی کار کی پروفائل کو اپنے فون سے غیر مقفل کرنے کے ليے، پہلے اپنے فونز کی ترتیبات میں ایک اسکرین لاک (جسے پاس کوڈ بھی کہا جاتا ہے) تخلیق کریں۔"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">وابستہ آلہ</string>
+ <string name="add_device_title">وابستہ آلہ شامل کریں</string>
+ <string name="add_associated_device_title">ساتھی آلہ منسلک کریں</string>
+ <string name="add_associated_device_instruction">ڈرائیونگ کے تجربہ کا نظم کرنے میں مدد کے ليے آپ اپنے فون کو ساتھی آلے کے بطور استعمال کر سکتے ہیں</string>
+ <string name="associated_device_install_app">یقینی بنائیں کہ آپ نے اپنے فون پر<b>ساتھی ایپ</b> کو انسٹال کیا ہے</string>
+ <string name="associated_device_pairing_code_title">فون پر کوڈ کی تصدیق کریں</string>
+ <string name="associated_device_pairing_message">تصدیق کریں کہ یہ آپ کے فون پر دکھائے گئے کوڈ سے مماثل ہے</string>
+ <string name="associated_device_success">آلہ کامیابی کے ساتھ وابستہ کر دیا گیا ہے</string>
+ <string name="associated_device_select_device">ایپ کھولیں اور &lt;b&gt;%1$s&lt;/b&gt; سے منسلک کریں</string>
+ <string name="associated_device_open_app">ایپ کھولیں اور ایپ میں موجود ہدایات کی پیروی کریں</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; کو بھول جائیں؟</string>
+ <string name="remove_associated_device_message">اس کار کو اس آلے سے مزید جوڑا نہیں جائے گا۔ آپ کو اضافی طور پر اس کار کو ساتھی ایپ سے ہٹانے کی ضرورت ہوگی۔</string>
+ <string name="device_removed_success_toast_text">%1$s کو بھلا دیا گیا</string>
+ <string name="device_removed_failure_toast_text">%1$s کو بھولنے میں ناکام</string>
+ <string name="continue_setup_toast_text">اپنے فون پر سیٹ اپ جاری رکھیں</string>
+ <string name="error_screen_title">کچھ غلط ہو گیا</string>
+ <string name="error_screen_message">بدقسمتی سے، یہ اسکرین اچھی طرح سے ڈسپلے نہیں ہو سکی۔ براہ کرم دوبارہ کوشش کریں۔</string>
+ <string name="turn_on_bluetooth_title">بلوٹوتھ آن کریں</string>
+ <string name="turn_on_bluetooth_message">اپنے فون کو بطور ساتھی آلہ سیٹ اپ کرنے کے ليے، آپ کی کار کو بلوٹوتھ کی ضرورت ہے۔</string>
+ <string name="turn_on_bluetooth_dialog_title">بلوٹوتھ آن کریں؟</string>
+ <string name="turn_on_bluetooth_dialog_message">اپنے ساتھی آلے کو منسلک کرنے کے لیے، آپ کی کار کو بلوٹوتھ کی ضرورت ہے۔</string>
+ <string name="accept">قبول کریں</string>
+ <string name="reject">مسترد کریں</string>
+ <string name="confirm">تصدیق کریں</string>
+ <string name="cancel">منسوخ کریں</string>
+ <string name="remove">ہٹائیں</string>
+ <string name="ok">ٹھیک ہے</string>
+ <string name="connection">کنکشن</string>
+ <string name="forget_title">اس آلے کو بھول جائیں</string>
+ <string name="forget">بھول جائیں</string>
+ <string name="disable">غیر فعال کریں</string>
+ <string name="enable">فعال کریں</string>
+ <string name="continue_button">جاری رکھیں</string>
+ <string name="retry">دوبارہ کوشش کریں</string>
+ <string name="turn_on">آن کریں</string>
+ <string name="not_now">ابھی نہیں</string>
+ <string name="connected">منسلک ہے</string>
+ <string name="notDetected">پتہ نہیں چلا</string>
+ <string name="disconnected">غیر منسلک ہے</string>
+ <string name="unknown">نامعلوم</string>
+ <string name="app_running_msg_channel_name">فون کی ٹیکسٹ پیغام کی سروس چل رہی ہے</string>
+ <string name="app_running_msg_notification_title">فون کی ٹیکسٹ پیغام رسانی کی سروس فعال ہے</string>
+ <string name="app_running_msg_notification_content">ساتھی آلے کے ذریعے ٹیکسٹ پیغامات موصول ہو رہے ہیں</string>
+ <string name="trusted_device_feature_title">فون سے پروفائل غیر مقفل کریں</string>
+ <string name="trusted_device_feature_instruction">غیر مقفل کرنے کے اختیارات سیٹ کرنے کے ليے اپنا ساتھی ایپ چیک کریں</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; کو میری پروفائل غیر مقفل کرنے دیں</string>
+ <string name="device_not_connected_dialog_title">آپ کا فون فعال طور پر منسلک ہونا چاہیے</string>
+ <string name="device_not_connected_dialog_message">اس خصوصیت کو آن کرنے کے ليے، یقینی بنائیں کہ آپ کی کار اور فون میں بلوٹوتھ آن ہے اور ایک دوسرے کے قریب ہیں</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; اب آپ کی پروفائل کو غیر مقفل کر سکتا ہے</string>
+ <string name="create_profile_lock_dialog_title">ایک بنیادی پروفائل لاک تخلیق کریں</string>
+ <string name="create_profile_lock_dialog_message">اپنی پروفائل کو غیر مقفل کرنے کے ليے اپنے فون کا استعمال کرنے کی خاطر، آپ کو بیک اپ کے طور پر ایک بنیادی پروفائل لاک کی ضرورت ہے</string>
+ <string name="unlock_profile_to_finish_title">مکمل کرنے کے لیے اپنی پروفائل کو غیر مقفل کریں</string>
+ <string name="unlock_profile_to_finish_message">آپ نے ایک نیا پروفائل لاک تخلیق کیا ہے۔ آگے، اس بات کی تصدیق کرنے کے لیے اسے دوبارہ درج کریں کہ فون آپ کی پروفائل کو خود بخود غیر مقفل کر سکتا ہے</string>
+ <string name="disable_device_connection_text">اس آلے کو غیر منسلک کریں</string>
+ <string name="enable_device_connection_text">اس آلے کو دوبارہ منسلک کريں</string>
+ <string name="trusted_device_notification_channel_name">فون کے ساتھ غیر مقفل کریں</string>
+ <string name="trusted_device_notification_title">اپنے فون کو اپنی پروفائل غیر مقفل کرنے دیں</string>
+ <string name="trusted_device_notification_content">اس خصوصیت کو اجازت دینے کے ليے یہاں تھپتھپائیں</string>
+ <string name="trusted_device_enrollment_error_dialog_title">کچھ غلط ہو گیا</string>
+ <string name="trusted_device_enrollment_error_dialog_message">بدقسمتی سے، اس وقت اس خصوصیت کو آن نہیں کیا جا سکا۔ براہ کرم دوبارہ کوشش کریں۔</string>
+ <string name="create_phone_lock_dialog_title">اپنے فون پر ایک اسکرین لاک تخلیق کریں</string>
+ <string name="create_phone_lock_dialog_message">آپ کے فون میں اسکرین لاک سیٹ نہیں ہے۔ اپنی کار کی پروفائل کو اپنے فون سے غیر مقفل کرنے کے ليے، پہلے اپنے فونز کی ترتیبات میں ایک اسکرین لاک (جسے پاس کوڈ بھی کہا جاتا ہے) تخلیق کریں۔</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">نیا پیغام</item>
+ <item quantity="other">%d نئے پیغامات</item>
+ </plurals>
+ <string name="name_not_available">نام دستیاب نہیں ہے</string>
</resources>
diff --git a/companiondevice/res/values-uz/strings.xml b/companiondevice/res/values-uz/strings.xml
index 4a13d89..de87873 100644
--- a/companiondevice/res/values-uz/strings.xml
+++ b/companiondevice/res/values-uz/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Ulangan qurilma"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Ulangan qurilmani kiritish"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Hamroh qurilmani ulang"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Harakatlanishni boshqarishga telefoningizni hamroh qurilma sifatida ishlatishingiz mumkin"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Telefoningizda "<b>"hamroh ilova"</b>" oʻrnatilganini tekshiring"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Kodni telefoningizda tasdiqlang"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Bu kod telefoningizdagi bilan mos ekanini tasdiqlang"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Qurilma ulandi"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Ilovani ochib, &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt; bilan ulang"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Ilovani oching va koʻrsatmalarga amal qiling"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt; olib tashlansinmi?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Bu avtomobil endi mazkur qurilma bilan ulanmaydi. Hamroh ilovadan bu avtomobilni olib tashlashingiz kerak boʻladi."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> olib tashlandi"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"<xliff:g id="PHONE_NAME">%1$s</xliff:g> olib tashlanmadi"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Sozlashni telefoningizda davom eting"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Xatolik yuz berdi"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Afsuski, bu ekran bexato namoyish etmadi. Qayta urining."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Bluetoothni yoqish"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Telefoningizni hamroh qurilma sifatida sozlash uchun avtomobilingizga Bluetooth zarur."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Bluetooth yoqilsinmi?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Hamroh qurilmaga ulanish uchun avtomobilga Bluetooth zarur."</string>
- <string name="accept" msgid="1454710793329618813">"Roziman"</string>
- <string name="reject" msgid="4315432282758892890">"Rad etish"</string>
- <string name="confirm" msgid="3748997214719276945">"Tasdiqlash"</string>
- <string name="cancel" msgid="4306609731174629323">"Bekor qilish"</string>
- <string name="remove" msgid="5513398257088729188">"Olib tashlash"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Ulanish"</string>
- <string name="forget_title" msgid="3027608547243824729">"Bu qurilmani olib tashlash"</string>
- <string name="forget" msgid="2069897665699141222">"Olib tashlash"</string>
- <string name="disable" msgid="4619854429066283970">"Faolsizlantirish"</string>
- <string name="enable" msgid="7656386199154111316">"Yoqish"</string>
- <string name="continue_button" msgid="2748318968566159950">"Davom etish"</string>
- <string name="retry" msgid="3783419451480721367">"Qaytadan"</string>
- <string name="turn_on" msgid="4288754850470994812">"Yoqish"</string>
- <string name="not_now" msgid="8764692269093707622">"Keyinroq"</string>
- <string name="connected" msgid="8051190714042020471">"Ulandi"</string>
- <string name="notDetected" msgid="4115229772085594506">"Aniqlanmadi"</string>
- <string name="disconnected" msgid="8526513868622591894">"Uzildi"</string>
- <string name="unknown" msgid="555736316465118024">"Noaniq"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Telefon SMS xizmati ishlamoqda"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Telefon SMS xizmati faol"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"SMS xabarlari hamroh qurilma orqali olinadi"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Profil qulfini telefon bilan ochish"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Qulfini ochish parametrlarini sozlash uchun hamroh ilovani tekshiring"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; orqali profilim qulfini ochishga ruxsat berilsin"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Telefoningiz faol ulangan boʻlishi kerak"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Bu funksiyani yoqish uchun avtomobil va telefoningizda Bluetooth yoqilganini va bir-biriga yaqinligini tekshiring"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; endi profilingiz qulfini ocha oladi"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Asosiy profil qulfini yaratish"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Profil qulfini ochishda telefoningizdan foydalanish uchun zaxira sifatida asosiy profil qulfi zarur"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Tamomlash uchun profilingiz qulfini oching"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Yangi profil qulfini yaratdingiz. Keyin uni qayta kiritish orqali telefoningiz profil qulfini avtomatik ravishda ocha olishini tasdiqlang."</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Bu qurilmani uzish"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Bu qurilmani qayta ulash"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Qulfini telefon bilan ochish"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Telefoningiz bilan profilingiz qulfini oching"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Bu funksiyaga ruxsat berish uchun shu yerga bosing"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Xatolik yuz berdi"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Bu funksiya yoqilmadi. Qayta urining."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Telefoningizda ekran qulfini yarating"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Telefoningizda ekran qulfi sozlanmagan. Telefoningiz orqali avtomobil profili qulfini ochish uchun avval telefon sozlamalarida ekran qulfini (kirish kodi ham deyiladi) yarating."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Aloqador qurilma</string>
+ <string name="add_device_title">Aloqador qurilmani kiritish</string>
+ <string name="add_associated_device_title">Hamroh qurilmani ulang</string>
+ <string name="add_associated_device_instruction">Harakatlanishni boshqarishga telefoningizni hamroh qurilma sifatida ishlatishingiz mumkin</string>
+ <string name="associated_device_install_app">Telefoningizda <b>hamroh ilova</b> oʻrnatilganini tekshiring</string>
+ <string name="associated_device_pairing_code_title">Kodni telefoningizda tasdiqlang</string>
+ <string name="associated_device_pairing_message">Bu kod telefoningizdagi bilan mos ekanini tasdiqlang</string>
+ <string name="associated_device_success">Qurilma ulandi</string>
+ <string name="associated_device_select_device">Ilovani ochib, &lt;b&gt;%1$s&lt;/b&gt; bilan ulang</string>
+ <string name="associated_device_open_app">Ilovani oching va koʻrsatmalarga amal qiling</string>
+ <string name="remove_associated_device_title">&lt;b&gt;%1$s&lt;/b&gt; olib tashlansinmi?</string>
+ <string name="remove_associated_device_message">Bu avtomobil endi mazkur qurilma bilan ulanmaydi. Hamroh ilovadan bu avtomobilni olib tashlashingiz kerak boʻladi.</string>
+ <string name="device_removed_success_toast_text">%1$s olib tashlandi</string>
+ <string name="device_removed_failure_toast_text">%1$s olib tashlanmadi</string>
+ <string name="continue_setup_toast_text">Sozlashni telefoningizda davom ettiring</string>
+ <string name="error_screen_title">Xatolik yuz berdi</string>
+ <string name="error_screen_message">Afsuski, bu ekran bexato namoyish etmadi. Qayta urining.</string>
+ <string name="turn_on_bluetooth_title">Bluetoothni yoqing</string>
+ <string name="turn_on_bluetooth_message">Telefoningizni hamroh qurilma sifatida sozlash uchun avtomobilingizga Bluetooth zarur.</string>
+ <string name="turn_on_bluetooth_dialog_title">Bluetooth yoqilsinmi?</string>
+ <string name="turn_on_bluetooth_dialog_message">Hamroh qurilmaga ulanish uchun avtomobilga Bluetooth zarur.</string>
+ <string name="accept">Qabul qilish</string>
+ <string name="reject">Rad etish</string>
+ <string name="confirm">Tasdiqlash</string>
+ <string name="cancel">Bekor qilish</string>
+ <string name="remove">Olib tashlash</string>
+ <string name="ok">OK</string>
+ <string name="connection">Aloqa</string>
+ <string name="forget_title">Bu qurilmani olib tashlash</string>
+ <string name="forget">Olib tashlash</string>
+ <string name="disable">Faolsizlantirish</string>
+ <string name="enable">Yoqish</string>
+ <string name="continue_button">Davom etish</string>
+ <string name="retry">Qayta urinish</string>
+ <string name="turn_on">Yoqish</string>
+ <string name="not_now">Hozir emas</string>
+ <string name="connected">Ulandi</string>
+ <string name="notDetected">Aniqlanmadi</string>
+ <string name="disconnected">Uzildi</string>
+ <string name="unknown">Noaniq</string>
+ <string name="app_running_msg_channel_name">Telefon SMS xizmati ishlamoqda</string>
+ <string name="app_running_msg_notification_title">Telefon SMS xizmati faol</string>
+ <string name="app_running_msg_notification_content">SMS xabarlari hamroh qurilma orqali olinadi</string>
+ <string name="trusted_device_feature_title">Profil qulfini telefon bilan ochish</string>
+ <string name="trusted_device_feature_instruction">Qulfini ochish parametrlarini sozlash uchun hamroh ilovani tekshiring</string>
+ <string name="trusted_device_item_title">&lt;b&gt;%1$s&lt;/b&gt; profilim qulfini ochishiga ruxsat berish</string>
+ <string name="device_not_connected_dialog_title">Telefoningiz faol ulangan boʻlishi kerak</string>
+ <string name="device_not_connected_dialog_message">Bu funksiyani yoqish uchun avtomobil va telefoningizda Bluetooth yoqilganini va bir-biriga yaqinligini tekshiring</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; endi profilingiz qulfini ocha oladi</string>
+ <string name="create_profile_lock_dialog_title">Asosiy profil qulfini yaratish</string>
+ <string name="create_profile_lock_dialog_message">Profil qulfini ochishda telefoningizdan foydalanish uchun zaxira sifatida asosiy profil qulfi zarur</string>
+ <string name="unlock_profile_to_finish_title">Tamomlash uchun profilingiz qulfini oching</string>
+ <string name="unlock_profile_to_finish_message">Yangi profil qulfini yaratdingiz. Keyin uni qayta kiritish orqali telefoningiz profil qulfini avtomatik ravishda ocha olishini tasdiqlang.</string>
+ <string name="disable_device_connection_text">Bu qurilmani uzish</string>
+ <string name="enable_device_connection_text">Bu qurilmani qayta ulash</string>
+ <string name="trusted_device_notification_channel_name">Qulfini telefon bilan ochish</string>
+ <string name="trusted_device_notification_title">Telefoningiz bilan profilingiz qulfini oching</string>
+ <string name="trusted_device_notification_content">Bu funksiyaga ruxsat berish uchun shu yerga bosing</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Xatolik yuz berdi</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Bu funksiya yoqilmadi. Qayta urining.</string>
+ <string name="create_phone_lock_dialog_title">Telefoningizda ekran qulfini yarating</string>
+ <string name="create_phone_lock_dialog_message">Telefoningizda ekran qulfi sozlanmagan. Telefoningiz orqali avtomobil profili qulfini ochish uchun avval telefon sozlamalarida ekran qulfini (kirish kodi ham deyiladi) yarating.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Yangi xabar</item>
+ <item quantity="other">%d ta yangi xabar</item>
+ </plurals>
+ <string name="name_not_available">Bu nom mavjud emas</string>
</resources>
diff --git a/companiondevice/res/values-vi/strings.xml b/companiondevice/res/values-vi/strings.xml
index 01dbb78..e226be1 100644
--- a/companiondevice/res/values-vi/strings.xml
+++ b/companiondevice/res/values-vi/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Thiết bị đã liên kết"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Thêm thiết bị đã liên kết"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Kết nối thiết bị đồng hành"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Bạn có thể dùng điện thoại như một thiết bị đồng hành để quản lý trải nghiệm lái xe của mình"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Đảm bảo bạn đã cài đặt "<b>"Ứng dụng đồng hành"</b>" trên điện thoại"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Xác nhận mã trên điện thoại"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Xác nhận rằng mã này khớp với mã hiển thị trên điện thoại của bạn"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Đã liên kết thành công thiết bị"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Mở ứng dụng rồi kết nối với &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Mở ứng dụng rồi làm theo hướng dẫn trong ứng dụng"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Xóa &lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Ô tô này sẽ không được ghép nối với thiết bị này nữa. Ngoài ra, bạn cần xóa ô tô này khỏi Ứng dụng đồng hành."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"Đã xóa <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Không thể xóa <xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Tiếp tục thiết lập trên điện thoại"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Đã xảy ra lỗi"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Rất tiếc, màn hình này không hiển thị được đúng cách. Vui lòng thử lại."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Bật Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Để thiết lập điện thoại làm thiết bị đồng hành, bạn cần bật Bluetooth cho ô tô."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Bật Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Để kết nối với thiết bị đồng hành, bạn cần bật Bluetooth cho ô tô."</string>
- <string name="accept" msgid="1454710793329618813">"Đồng ý"</string>
- <string name="reject" msgid="4315432282758892890">"Từ chối"</string>
- <string name="confirm" msgid="3748997214719276945">"Xác nhận"</string>
- <string name="cancel" msgid="4306609731174629323">"Hủy"</string>
- <string name="remove" msgid="5513398257088729188">"Xóa"</string>
- <string name="ok" msgid="2825038997730899083">"OK"</string>
- <string name="connection" msgid="2798490936433656846">"Kết nối"</string>
- <string name="forget_title" msgid="3027608547243824729">"Xóa thiết bị này"</string>
- <string name="forget" msgid="2069897665699141222">"Xóa"</string>
- <string name="disable" msgid="4619854429066283970">"Tắt"</string>
- <string name="enable" msgid="7656386199154111316">"Bật"</string>
- <string name="continue_button" msgid="2748318968566159950">"Tiếp tục"</string>
- <string name="retry" msgid="3783419451480721367">"Thử lại"</string>
- <string name="turn_on" msgid="4288754850470994812">"Bật"</string>
- <string name="not_now" msgid="8764692269093707622">"Để sau"</string>
- <string name="connected" msgid="8051190714042020471">"Đã kết nối"</string>
- <string name="notDetected" msgid="4115229772085594506">"Không tìm thấy"</string>
- <string name="disconnected" msgid="8526513868622591894">"Đã ngắt kết nối"</string>
- <string name="unknown" msgid="555736316465118024">"Không xác định"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Dịch vụ đồng bộ hóa tin nhắn văn bản qua điện thoại đang chạy"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Dịch vụ nhắn tin văn bản qua điện thoại đang chạy"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Nhận tin nhắn văn bản qua thiết bị đồng hành"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Dùng điện thoại mở khóa hồ sơ"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Kiểm tra Ứng dụng đồng hành để đặt các tùy chọn mở khóa"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Cho phép &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; mở khóa hồ sơ của tôi"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Điện thoại của bạn phải đã kết nối Bluetooth"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Để bật tính năng này, hãy nhớ bật Bluetooth cho ô tô và điện thoại, đồng thời đảm bảo 2 thiết bị này ở gần nhau"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"Giờ đây, &lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt; có thể mở khóa hồ sơ của bạn"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Tạo khóa hồ sơ chính"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Để dùng điện thoại mở khóa hồ sơ, bạn cần có một khóa hồ sơ chính làm khóa dự phòng"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Mở khóa hồ sơ của bạn để hoàn tất"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Bạn đã tạo một khóa hồ sơ mới. Tiếp theo, hãy nhập khóa này một lần nữa để xác nhận điện thoại có thể tự động mở khóa hồ sơ của bạn"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Ngắt kết nối thiết bị này"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Kết nối lại thiết bị này"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Dùng điện thoại mở khóa"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Cho phép điện thoại mở khóa hồ sơ của bạn"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Nhấn vào đây để cho phép dùng tính năng này"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Đã xảy ra lỗi"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Rất tiếc, hiện bạn không thể bật tính năng này. Vui lòng thử lại."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Tạo phương thức khóa màn hình trên điện thoại"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Bạn chưa đặt phương thức khóa màn hình trên điện thoại. Để dùng điện thoại mở khóa hồ sơ ô tô, trước tiên, hãy tạo một phương thức khóa màn hình (còn gọi là mật mã) trong phần cài đặt trên điện thoại."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Thiết bị được liên kết</string>
+ <string name="add_device_title">Thêm thiết bị được liên kết</string>
+ <string name="add_associated_device_title">Kết nối với thiết bị đồng hành</string>
+ <string name="add_associated_device_instruction">Bạn có thể dùng điện thoại làm một thiết bị đồng hành để quản lý trải nghiệm lái xe của mình</string>
+ <string name="associated_device_install_app">Hãy nhớ cài đặt <b>Ứng dụng đồng hành</b> trên điện thoại</string>
+ <string name="associated_device_pairing_code_title">Xác nhận mã trên điện thoại</string>
+ <string name="associated_device_pairing_message">Xác nhận rằng mã này khớp với mã hiện trên điện thoại của bạn</string>
+ <string name="associated_device_success">Đã liên kết thiết bị thành công</string>
+ <string name="associated_device_select_device">Mở ứng dụng rồi kết nối với &lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Mở ứng dụng rồi làm theo hướng dẫn trong ứng dụng</string>
+ <string name="remove_associated_device_title">Xóa &lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Ô tô này sẽ không được ghép nối với thiết bị này nữa. Ngoài ra, bạn cần xóa ô tô này khỏi Ứng dụng đồng hành.</string>
+ <string name="device_removed_success_toast_text">Đã xóa %1$s</string>
+ <string name="device_removed_failure_toast_text">Không thể xóa %1$s</string>
+ <string name="continue_setup_toast_text">Tiếp tục thiết lập trên điện thoại</string>
+ <string name="error_screen_title">Đã xảy ra lỗi</string>
+ <string name="error_screen_message">Rất tiếc, màn hình này không hiển thị đúng cách. Hãy thử lại.</string>
+ <string name="turn_on_bluetooth_title">Bật Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Để thiết lập điện thoại làm thiết bị đồng hành, bạn cần bật Bluetooth cho ô tô của mình.</string>
+ <string name="turn_on_bluetooth_dialog_title">Bật Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Để kết nối với thiết bị đồng hành, bạn cần bật Bluetooth cho ô tô của mình.</string>
+ <string name="accept">Chấp nhận</string>
+ <string name="reject">Từ chối</string>
+ <string name="confirm">Xác nhận</string>
+ <string name="cancel">Hủy</string>
+ <string name="remove">Xóa</string>
+ <string name="ok">OK</string>
+ <string name="connection">Kết nối</string>
+ <string name="forget_title">Xóa thiết bị này</string>
+ <string name="forget">Xóa</string>
+ <string name="disable">Tắt</string>
+ <string name="enable">Bật</string>
+ <string name="continue_button">Tiếp tục</string>
+ <string name="retry">Thử lại</string>
+ <string name="turn_on">Bật</string>
+ <string name="not_now">Để sau</string>
+ <string name="connected">Đã kết nối</string>
+ <string name="notDetected">Không tìm thấy</string>
+ <string name="disconnected">Đã ngắt kết nối</string>
+ <string name="unknown">Không xác định</string>
+ <string name="app_running_msg_channel_name">Dịch vụ tin nhắn văn bản trên điện thoại đang chạy</string>
+ <string name="app_running_msg_notification_title">Dịch vụ nhắn tin văn bản trên điện thoại đang hoạt động</string>
+ <string name="app_running_msg_notification_content">Nhận tin nhắn văn bản qua thiết bị đồng hành</string>
+ <string name="trusted_device_feature_title">Mở khóa hồ sơ bằng điện thoại</string>
+ <string name="trusted_device_feature_instruction">Kiểm tra Ứng dụng đồng hành để đặt các tùy chọn mở khóa</string>
+ <string name="trusted_device_item_title">Cho phép &lt;b&gt;%1$s&lt;/b&gt; mở khóa hồ sơ của tôi</string>
+ <string name="device_not_connected_dialog_title">Điện thoại của bạn phải được kết nối</string>
+ <string name="device_not_connected_dialog_message">Để bật tính năng này, hãy nhớ bật Bluetooth cho ô tô và điện thoại, đồng thời đảm bảo 2 thiết bị này ở gần nhau</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt; hiện có thể mở khóa hồ sơ của bạn</string>
+ <string name="create_profile_lock_dialog_title">Tạo khóa cho hồ sơ chính</string>
+ <string name="create_profile_lock_dialog_message">Để mở khóa hồ sơ bằng điện thoại, bạn cần có một khóa hồ sơ chính làm khóa dự phòng</string>
+ <string name="unlock_profile_to_finish_title">Mở khóa hồ sơ của bạn để hoàn tất</string>
+ <string name="unlock_profile_to_finish_message">Bạn đã tạo một khóa hồ sơ mới. Tiếp theo, hãy nhập khóa này một lần nữa để xác nhận điện thoại có thể tự động mở khóa hồ sơ của bạn</string>
+ <string name="disable_device_connection_text">Ngắt kết nối thiết bị này</string>
+ <string name="enable_device_connection_text">Kết nối lại thiết bị này</string>
+ <string name="trusted_device_notification_channel_name">Mở khóa bằng điện thoại</string>
+ <string name="trusted_device_notification_title">Cho phép mở khóa hồ sơ của bạn bằng điện thoại</string>
+ <string name="trusted_device_notification_content">Hãy nhấn vào đây để cấp quyền sử dụng tính năng này</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Đã xảy ra lỗi</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Rất tiếc, bạn hiện không thể bật tính năng này. Hãy thử lại.</string>
+ <string name="create_phone_lock_dialog_title">Tạo phương thức khóa màn hình trên điện thoại</string>
+ <string name="create_phone_lock_dialog_message">Bạn chưa thiết lập phương thức khóa màn hình trên điện thoại. Để mở khóa hồ sơ ô tô bằng điện thoại, trước tiên, hãy tạo một phương thức khóa màn hình (còn gọi là mật mã) trong phần cài đặt trên điện thoại.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">Tin nhắn mới</item>
+ <item quantity="other">%d tin nhắn mới</item>
+ </plurals>
+ <string name="name_not_available">Không có tên</string>
</resources>
diff --git a/companiondevice/res/values-zh-rCN/strings.xml b/companiondevice/res/values-zh-rCN/strings.xml
index 74ba32b..211c4c8 100644
--- a/companiondevice/res/values-zh-rCN/strings.xml
+++ b/companiondevice/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"关联的设备"</string>
- <string name="add_device_title" msgid="6166003577845888151">"添加关联的设备"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"连接配套设备"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"您可以将手机作为配套设备使用,帮助您管理驾驶体验"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"确保您在手机上安装了"<b>"配套应用"</b></string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"确认手机上的配对码"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"确认此配对码与手机上显示的配对码一致"</string>
- <string name="associated_device_success" msgid="584760065696870256">"设备已成功建立关联"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"打开应用并连接到&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"打开应用并按照应用中的说明操作"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"要移除&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;/b&gt;吗?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"这辆车将与此设备取消配对。您还需要将这辆车从配套应用中移除。"</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"已移除“<xliff:g id="PHONE_NAME">%1$s</xliff:g>”"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"无法移除“<xliff:g id="PHONE_NAME">%1$s</xliff:g>”"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"在手机上继续设置"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"出了点问题"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"很抱歉,此屏幕无法正常显示。请重试。"</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"开启蓝牙"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"如需将手机设为配套设备,您的汽车需要开启蓝牙。"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"要开启蓝牙吗?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"如需连接到配套设备,您的汽车需要开启蓝牙。"</string>
- <string name="accept" msgid="1454710793329618813">"接受"</string>
- <string name="reject" msgid="4315432282758892890">"拒绝"</string>
- <string name="confirm" msgid="3748997214719276945">"确认"</string>
- <string name="cancel" msgid="4306609731174629323">"取消"</string>
- <string name="remove" msgid="5513398257088729188">"移除"</string>
- <string name="ok" msgid="2825038997730899083">"确定"</string>
- <string name="connection" msgid="2798490936433656846">"连接"</string>
- <string name="forget_title" msgid="3027608547243824729">"移除此设备"</string>
- <string name="forget" msgid="2069897665699141222">"移除"</string>
- <string name="disable" msgid="4619854429066283970">"停用"</string>
- <string name="enable" msgid="7656386199154111316">"启用"</string>
- <string name="continue_button" msgid="2748318968566159950">"继续"</string>
- <string name="retry" msgid="3783419451480721367">"重试"</string>
- <string name="turn_on" msgid="4288754850470994812">"开启"</string>
- <string name="not_now" msgid="8764692269093707622">"以后再说"</string>
- <string name="connected" msgid="8051190714042020471">"已连接"</string>
- <string name="notDetected" msgid="4115229772085594506">"未检测到"</string>
- <string name="disconnected" msgid="8526513868622591894">"已断开连接"</string>
- <string name="unknown" msgid="555736316465118024">"未知"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"手机短信服务正在运行"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"手机短信服务已启用"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"正在通过配套设备接收短信"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"使用手机解锁个人资料"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"查看您的配套应用以设置解锁选项"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"允许&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;解锁我的个人资料"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"您的手机必须保持连接状态"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"如需开启此功能,请确保您的汽车和手机已开启蓝牙并且彼此靠近"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;/b&gt;现在可以解锁您的个人资料了"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"创建主要个人资料锁定"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"如需使用手机解锁您的个人资料,您需要创建备用的主要个人资料锁定"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"解锁您的个人资料即可完成操作"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"您已创建新的个人资料锁定。接下来,请重新输入个人资料锁定,以确认您的手机可自动解锁您的个人资料"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"断开与此设备的连接"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"重新连接此设备"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"使用手机解锁"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"允许手机解锁您的个人资料"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"点按此处即可为此功能授权"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"出了点问题"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"很抱歉,目前无法开启此功能。请重试。"</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"在手机上创建屏幕锁定"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"您的手机没有设置屏幕锁定。如需通过手机解锁汽车个人资料,请先在手机设置中创建屏幕锁定(也称为密码)。"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">关联的设备</string>
+ <string name="add_device_title">添加关联的设备</string>
+ <string name="add_associated_device_title">连接配套设备</string>
+ <string name="add_associated_device_instruction">您可以将手机作为配套设备使用,帮助您管理驾驶体验</string>
+ <string name="associated_device_install_app">确保您在手机上安装了<b>配套应用</b></string>
+ <string name="associated_device_pairing_code_title">确认手机上的配对码</string>
+ <string name="associated_device_pairing_message">确认此配对码与手机上显示的配对码一致</string>
+ <string name="associated_device_success">设备已成功建立关联</string>
+ <string name="associated_device_select_device">打开应用并连接到&lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">打开应用并按照应用中的说明操作</string>
+ <string name="remove_associated_device_title">要移除&lt;b&gt;%1$s&lt;/b&gt;吗?</string>
+ <string name="remove_associated_device_message">这辆车将与此设备取消配对。您还需要将这辆车从配套应用中移除。</string>
+ <string name="device_removed_success_toast_text">已移除“%1$s”</string>
+ <string name="device_removed_failure_toast_text">无法移除“%1$s”</string>
+ <string name="continue_setup_toast_text">在手机上继续设置</string>
+ <string name="error_screen_title">出了点问题</string>
+ <string name="error_screen_message">很抱歉,此屏幕无法正常显示。请重试。</string>
+ <string name="turn_on_bluetooth_title">开启蓝牙</string>
+ <string name="turn_on_bluetooth_message">如需将手机设为配套设备,您的汽车需要开启蓝牙。</string>
+ <string name="turn_on_bluetooth_dialog_title">要开启蓝牙吗?</string>
+ <string name="turn_on_bluetooth_dialog_message">如需连接到配套设备,您的汽车需要开启蓝牙。</string>
+ <string name="accept">接受</string>
+ <string name="reject">拒绝</string>
+ <string name="confirm">确认</string>
+ <string name="cancel">取消</string>
+ <string name="remove">移除</string>
+ <string name="ok">确定</string>
+ <string name="connection">连接</string>
+ <string name="forget_title">移除此设备</string>
+ <string name="forget">移除</string>
+ <string name="disable">停用</string>
+ <string name="enable">启用</string>
+ <string name="continue_button">继续</string>
+ <string name="retry">重试</string>
+ <string name="turn_on">开启</string>
+ <string name="not_now">以后再说</string>
+ <string name="connected">已连接</string>
+ <string name="notDetected">未检测到</string>
+ <string name="disconnected">已断开连接</string>
+ <string name="unknown">未知</string>
+ <string name="app_running_msg_channel_name">手机短信服务正在运行</string>
+ <string name="app_running_msg_notification_title">手机短信服务已启用</string>
+ <string name="app_running_msg_notification_content">正在通过配套设备接收短信</string>
+ <string name="trusted_device_feature_title">使用手机解锁个人资料</string>
+ <string name="trusted_device_feature_instruction">查看您的配套应用以设置解锁选项</string>
+ <string name="trusted_device_item_title">允许&lt;b&gt;%1$s&lt;/b&gt;解锁我的个人资料</string>
+ <string name="device_not_connected_dialog_title">您的手机必须保持连接状态</string>
+ <string name="device_not_connected_dialog_message">如需开启此功能,请确保您的汽车和手机已开启蓝牙并且彼此靠近</string>
+ <string name="trusted_device_enrollment_success_message">&lt;b&gt;%1$s&lt;/b&gt;现在可以解锁您的个人资料了</string>
+ <string name="create_profile_lock_dialog_title">创建主要个人资料锁定方式</string>
+ <string name="create_profile_lock_dialog_message">如需使用手机解锁您的个人资料,您需要创建备用的主要个人资料锁定方式</string>
+ <string name="unlock_profile_to_finish_title">解锁您的个人资料即可完成操作</string>
+ <string name="unlock_profile_to_finish_message">您已创建新的个人资料锁定方式。接下来,请重新输入个人资料锁定方式,以确认您的手机可自动解锁您的个人资料</string>
+ <string name="disable_device_connection_text">断开与此设备的连接</string>
+ <string name="enable_device_connection_text">重新连接此设备</string>
+ <string name="trusted_device_notification_channel_name">使用手机解锁</string>
+ <string name="trusted_device_notification_title">允许手机解锁您的个人资料</string>
+ <string name="trusted_device_notification_content">点按此处即可为此功能授权</string>
+ <string name="trusted_device_enrollment_error_dialog_title">出了点问题</string>
+ <string name="trusted_device_enrollment_error_dialog_message">很抱歉,目前无法开启此功能。请重试。</string>
+ <string name="create_phone_lock_dialog_title">在手机上创建屏幕锁定方式</string>
+ <string name="create_phone_lock_dialog_message">您的手机没有设置屏幕锁定方式。如需通过手机解锁汽车个人资料,请先在手机设置中创建屏幕锁定方式(也称为密码)。</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">新消息</item>
+ <item quantity="other">%d 条新消息</item>
+ </plurals>
+ <string name="name_not_available">名称不可用</string>
</resources>
diff --git a/companiondevice/res/values-zh-rHK/strings.xml b/companiondevice/res/values-zh-rHK/strings.xml
index 8c01594..40a187b 100644
--- a/companiondevice/res/values-zh-rHK/strings.xml
+++ b/companiondevice/res/values-zh-rHK/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"關聯裝置"</string>
- <string name="add_device_title" msgid="6166003577845888151">"新增關聯裝置"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"連接隨附裝置"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"您可利用手機作隨附裝置,幫助管理駕駛體驗"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"請確保您的手機已安裝"<b>"隨附應用程式"</b></string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"確認手機上的配對碼"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"確認此代碼與手機上的配對碼相符"</string>
- <string name="associated_device_success" msgid="584760065696870256">"裝置已成功連繫"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"開啟應用程式並連接至「<xliff:g id="CAR_NAME">%1$s</xliff:g>」"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"開啟應用程式並按照應用程式上的指示操作"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"要刪除「<xliff:g id="CAR_NAME">%1$s</xliff:g>」嗎?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"此汽車將不再與此裝置配對。您需另行在隨附應用程式中移除此汽車。"</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"已刪除「<xliff:g id="PHONE_NAME">%1$s</xliff:g>」"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"無法刪除「<xliff:g id="PHONE_NAME">%1$s</xliff:g>」"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"請在手機上繼續設定"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"發生問題"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"很抱歉,無法正常顯示此畫面。請再試一次。"</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"開啟藍牙"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"如要設定手機作隨附裝置,您的汽車需要有藍牙功能。"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"要開啟藍牙嗎?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"如要連接您的隨附裝置,您的汽車需要有藍牙功能。"</string>
- <string name="accept" msgid="1454710793329618813">"接受"</string>
- <string name="reject" msgid="4315432282758892890">"拒絕"</string>
- <string name="confirm" msgid="3748997214719276945">"確認"</string>
- <string name="cancel" msgid="4306609731174629323">"取消"</string>
- <string name="remove" msgid="5513398257088729188">"移除"</string>
- <string name="ok" msgid="2825038997730899083">"確定"</string>
- <string name="connection" msgid="2798490936433656846">"連接"</string>
- <string name="forget_title" msgid="3027608547243824729">"刪除此裝置"</string>
- <string name="forget" msgid="2069897665699141222">"刪除"</string>
- <string name="disable" msgid="4619854429066283970">"停用"</string>
- <string name="enable" msgid="7656386199154111316">"啟用"</string>
- <string name="continue_button" msgid="2748318968566159950">"繼續"</string>
- <string name="retry" msgid="3783419451480721367">"再試一次"</string>
- <string name="turn_on" msgid="4288754850470994812">"開啟"</string>
- <string name="not_now" msgid="8764692269093707622">"暫時不要"</string>
- <string name="connected" msgid="8051190714042020471">"已連接"</string>
- <string name="notDetected" msgid="4115229772085594506">"未能偵測"</string>
- <string name="disconnected" msgid="8526513868622591894">"已解除連接"</string>
- <string name="unknown" msgid="555736316465118024">"不明"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"正在執行手機短訊服務"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"已啟用手機短訊服務"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"正在透過隨附裝置接收短訊"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"使用手機為設定檔解鎖"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"請查看您的隨附應用程式以設定解鎖選項"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"允許「<xliff:g id="PHONE_NAME">%1$s</xliff:g>」為我的設定檔解鎖"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"手機必須已連接藍牙"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"如要啟用此功能,請確保您的汽車和手機均已開啟藍牙並互相靠近"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"「<xliff:g id="PHONE_NAME">%1$s</xliff:g>」現在可以為您的設定檔解鎖"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"建立主要設定檔鎖定"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"如要使用手機為您的設定檔解鎖,您需要有主要設定檔鎖定作為後備"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"為設定檔解鎖以完成"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"您已建立了新的設定檔鎖定。下一步,請再次輸入密碼以確認手機可自動為設定檔解鎖"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"解除連接此裝置"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"重新連接此裝置"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"使用手機解鎖"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"允許手機為設定檔解鎖"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"輕按這裡以授權此功能"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"發生問題"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"很抱歉,現在無法啟用此功能。請再試一次。"</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"在手機上建立螢幕鎖定"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"您的手機未有設定螢幕鎖定。如要使用手機為汽車設定檔解鎖,請先在手機設定中建立螢幕鎖定 (亦稱為密碼)。"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">關聯裝置</string>
+ <string name="add_device_title">新增關聯裝置</string>
+ <string name="add_associated_device_title">連接隨附裝置</string>
+ <string name="add_associated_device_instruction">您可利用手機作隨附裝置,幫助管理駕駛體驗</string>
+ <string name="associated_device_install_app">請確保您的手機已安裝<b>隨附應用程式</b></string>
+ <string name="associated_device_pairing_code_title">確認手機上的配對碼</string>
+ <string name="associated_device_pairing_message">確認此代碼與手機上的配對碼相符</string>
+ <string name="associated_device_success">裝置已成功連繫</string>
+ <string name="associated_device_select_device">開啟應用程式並連接至&lt;b&gt;「%1$s」&lt;b&gt;</string>
+ <string name="associated_device_open_app">開啟應用程式並按照應用程式上的指示操作</string>
+ <string name="remove_associated_device_title">要刪除&lt;b&gt;%1$s&lt;/b&gt;嗎?</string>
+ <string name="remove_associated_device_message">此汽車將不再與此裝置配對。您需另行在隨附應用程式中移除此汽車。</string>
+ <string name="device_removed_success_toast_text">已刪除「%1$s」</string>
+ <string name="device_removed_failure_toast_text">無法刪除「%1$s」</string>
+ <string name="continue_setup_toast_text">請在手機上繼續設定</string>
+ <string name="error_screen_title">發生錯誤</string>
+ <string name="error_screen_message">很抱歉,無法正常顯示此畫面。請再試一次。</string>
+ <string name="turn_on_bluetooth_title">開啟藍牙</string>
+ <string name="turn_on_bluetooth_message">如要設定手機作隨附裝置,您的汽車需要有藍牙功能。</string>
+ <string name="turn_on_bluetooth_dialog_title">啟用藍牙?</string>
+ <string name="turn_on_bluetooth_dialog_message">如要連接您的隨附裝置,您的汽車需要有藍牙功能。</string>
+ <string name="accept">接受</string>
+ <string name="reject">拒絕</string>
+ <string name="confirm">確認</string>
+ <string name="cancel">取消</string>
+ <string name="remove">移除</string>
+ <string name="ok">確定</string>
+ <string name="connection">連接</string>
+ <string name="forget_title">刪除此裝置</string>
+ <string name="forget">刪除</string>
+ <string name="disable">停用</string>
+ <string name="enable">啟用</string>
+ <string name="continue_button">繼續</string>
+ <string name="retry">重試</string>
+ <string name="turn_on">開啟</string>
+ <string name="not_now">暫時不要</string>
+ <string name="connected">已連接</string>
+ <string name="notDetected">未能偵測</string>
+ <string name="disconnected">已解除連接</string>
+ <string name="unknown">不明</string>
+ <string name="app_running_msg_channel_name">正在執行手機短訊服務</string>
+ <string name="app_running_msg_notification_title">已啟用手機短訊服務</string>
+ <string name="app_running_msg_notification_content">正在透過隨附裝置接收短訊</string>
+ <string name="trusted_device_feature_title">使用手機為設定檔解鎖</string>
+ <string name="trusted_device_feature_instruction">請查看您的隨附應用程式以設定解鎖選項</string>
+ <string name="trusted_device_item_title">允許「%1$s」&lt;b&gt;&lt;/b&gt;為我的設定檔解鎖</string>
+ <string name="device_not_connected_dialog_title">手機必須已連接藍牙</string>
+ <string name="device_not_connected_dialog_message">如要啟用此功能,請確保您的汽車和手機均已開啟藍牙並互相靠近</string>
+ <string name="trusted_device_enrollment_success_message">「%1$s」&lt;b&gt;&lt;/b&gt;現在可以為您的設定檔解鎖</string>
+ <string name="create_profile_lock_dialog_title">建立主要設定檔鎖定</string>
+ <string name="create_profile_lock_dialog_message">如要使用手機為您的設定檔解鎖,您需要有主要設定檔鎖定作為後備</string>
+ <string name="unlock_profile_to_finish_title">為設定檔解鎖以完成</string>
+ <string name="unlock_profile_to_finish_message">您已建立了新的設定檔鎖定。下一步,請再次輸入密碼以確認手機可自動為設定檔解鎖</string>
+ <string name="disable_device_connection_text">解除連接此裝置</string>
+ <string name="enable_device_connection_text">重新連接此裝置</string>
+ <string name="trusted_device_notification_channel_name">使用手機解鎖</string>
+ <string name="trusted_device_notification_title">允許手機為設定檔解鎖</string>
+ <string name="trusted_device_notification_content">輕按這裡以授權此功能</string>
+ <string name="trusted_device_enrollment_error_dialog_title">發生錯誤</string>
+ <string name="trusted_device_enrollment_error_dialog_message">很抱歉,現在無法啟用此功能。請再試一次。</string>
+ <string name="create_phone_lock_dialog_title">在手機上建立螢幕鎖定</string>
+ <string name="create_phone_lock_dialog_message">您的手機未有設定螢幕鎖定。如要使用手機為汽車設定檔解鎖,請先在手機設定中建立螢幕鎖定 (亦稱為密碼)。</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">新訊息</item>
+ <item quantity="other">%d 則新訊息</item>
+ </plurals>
+ <string name="name_not_available">找不到名稱</string>
</resources>
diff --git a/companiondevice/res/values-zh-rTW/strings.xml b/companiondevice/res/values-zh-rTW/strings.xml
index ae4bb19..d3f925f 100644
--- a/companiondevice/res/values-zh-rTW/strings.xml
+++ b/companiondevice/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"已建立關聯的裝置"</string>
- <string name="add_device_title" msgid="6166003577845888151">"新增關聯裝置"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"與隨附裝置連線"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"你可以將手機當成隨附裝置使用,協助你管理行車期間的各項動作"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"請確認手機上已安裝"<b>"隨附應用程式"</b></string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"確認手機上的配對碼"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"請確認這個配對碼與手機上顯示的配對碼相符"</string>
- <string name="associated_device_success" msgid="584760065696870256">"已成功建立裝置關聯"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"開啟應用程式並連線到「<xliff:g id="CAR_NAME">%1$s</xliff:g>」"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"開啟應用程式並按照當中的指示操作"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"要清除「<xliff:g id="CAR_NAME">%1$s</xliff:g>」嗎?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"這輛車將與這部裝置解除配對。你必須另外將這輛車從隨附應用程式中移除。"</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"已清除「<xliff:g id="PHONE_NAME">%1$s</xliff:g>」"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"無法清除「<xliff:g id="PHONE_NAME">%1$s</xliff:g>」"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"在手機上繼續進行設定"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"發生錯誤"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"很抱歉,系統無法正常顯示這個畫面,請再試一次。"</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"開啟藍牙"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"你的車輛必須開啟藍牙,才能將手機設為隨附裝置。"</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"要開啟藍牙嗎?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"你的車輛必須開啟藍牙,才能與隨附裝置連線。"</string>
- <string name="accept" msgid="1454710793329618813">"接受"</string>
- <string name="reject" msgid="4315432282758892890">"拒絕"</string>
- <string name="confirm" msgid="3748997214719276945">"確認"</string>
- <string name="cancel" msgid="4306609731174629323">"取消"</string>
- <string name="remove" msgid="5513398257088729188">"移除"</string>
- <string name="ok" msgid="2825038997730899083">"確定"</string>
- <string name="connection" msgid="2798490936433656846">"連線"</string>
- <string name="forget_title" msgid="3027608547243824729">"清除這部裝置"</string>
- <string name="forget" msgid="2069897665699141222">"清除"</string>
- <string name="disable" msgid="4619854429066283970">"停用"</string>
- <string name="enable" msgid="7656386199154111316">"啟用"</string>
- <string name="continue_button" msgid="2748318968566159950">"繼續"</string>
- <string name="retry" msgid="3783419451480721367">"再試一次"</string>
- <string name="turn_on" msgid="4288754850470994812">"開啟"</string>
- <string name="not_now" msgid="8764692269093707622">"暫時不要"</string>
- <string name="connected" msgid="8051190714042020471">"已連線"</string>
- <string name="notDetected" msgid="4115229772085594506">"未偵測到"</string>
- <string name="disconnected" msgid="8526513868622591894">"已中斷連線"</string>
- <string name="unknown" msgid="555736316465118024">"不明"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"手機訊息服務執行中"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"手機訊息服務已啟用"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"正在透過隨附裝置接收訊息"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"使用手機將設定檔解鎖"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"請使用隨附應用程式設定解鎖選項"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"允許「<xliff:g id="PHONE_NAME">%1$s</xliff:g>」將我的設定檔解鎖"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"你的手機必須保持連線狀態"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"如要開啟這項功能,請確認你的車輛和手機均已開啟藍牙且彼此相鄰"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"「<xliff:g id="PHONE_NAME">%1$s</xliff:g>」現在可以將你的設定檔解鎖了"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"設定主要設定檔鎖定"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"如要使用手機解鎖設定檔,你必須設定備用的主要設定檔鎖定"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"請將設定檔解鎖以完成作業"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"你已設定新的設定檔鎖定。接著,請再次輸入設定檔鎖定,確認你的手機可自動解鎖設定檔"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"中斷與這部裝置的連線"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"重新連線到這部裝置"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"使用手機解鎖"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"允許手機將設定檔解鎖"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"輕觸這裡即可授權這項功能"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"發生錯誤"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"很抱歉,目前無法開啟這項功能,請再試一次。"</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"在手機上設定螢幕鎖定"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"你的手機未設定螢幕鎖定。如要透過手機將車輛設定檔解鎖,請先在手機的設定頁面中設定螢幕鎖定 (即密碼)。"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">關聯裝置</string>
+ <string name="add_device_title">新增關聯裝置</string>
+ <string name="add_associated_device_title">與隨附裝置連線</string>
+ <string name="add_associated_device_instruction">你可以將手機當成隨附裝置使用,協助你管理行車期間的各項動作</string>
+ <string name="associated_device_install_app">請確認手機上已安裝<b>隨附應用程式</b></string>
+ <string name="associated_device_pairing_code_title">確認手機上的配對碼</string>
+ <string name="associated_device_pairing_message">請確認這個配對碼與手機上顯示的配對碼相符</string>
+ <string name="associated_device_success">已成功建立裝置關聯</string>
+ <string name="associated_device_select_device">開啟應用程式並連結到「%1$s」&lt;b&gt;&lt;/b&gt;</string>
+ <string name="associated_device_open_app">開啟應用程式並按照當中的指示操作</string>
+ <string name="remove_associated_device_title">要清除「%1$s」&lt;b&gt;&lt;/b&gt;嗎?</string>
+ <string name="remove_associated_device_message">這輛車將與這部裝置解除配對。你必須另外將這輛車從隨附應用程式中移除。</string>
+ <string name="device_removed_success_toast_text">已清除「%1$s」</string>
+ <string name="device_removed_failure_toast_text">無法清除「%1$s」</string>
+ <string name="continue_setup_toast_text">在手機上繼續進行設定</string>
+ <string name="error_screen_title">發生錯誤</string>
+ <string name="error_screen_message">很抱歉,系統無法正常顯示這個畫面,請再試一次。</string>
+ <string name="turn_on_bluetooth_title">開啟藍牙</string>
+ <string name="turn_on_bluetooth_message">你的車輛必須開啟藍牙,才能將手機設為隨附裝置。</string>
+ <string name="turn_on_bluetooth_dialog_title">要開啟藍牙嗎?</string>
+ <string name="turn_on_bluetooth_dialog_message">你的車輛必須開啟藍牙,才能與隨附裝置連線。</string>
+ <string name="accept">接受</string>
+ <string name="reject">拒絕</string>
+ <string name="confirm">確認</string>
+ <string name="cancel">取消</string>
+ <string name="remove">移除</string>
+ <string name="ok">確定</string>
+ <string name="connection">連線</string>
+ <string name="forget_title">清除這部裝置</string>
+ <string name="forget">清除</string>
+ <string name="disable">停用</string>
+ <string name="enable">啟用</string>
+ <string name="continue_button">繼續</string>
+ <string name="retry">再試一次</string>
+ <string name="turn_on">開啟</string>
+ <string name="not_now">暫時不要</string>
+ <string name="connected">已連線</string>
+ <string name="notDetected">未偵測到</string>
+ <string name="disconnected">已中斷連線</string>
+ <string name="unknown">不明</string>
+ <string name="app_running_msg_channel_name">手機訊息服務執行中</string>
+ <string name="app_running_msg_notification_title">手機訊息服務已啟用</string>
+ <string name="app_running_msg_notification_content">正在透過隨附裝置接收訊息</string>
+ <string name="trusted_device_feature_title">使用手機將設定檔解鎖</string>
+ <string name="trusted_device_feature_instruction">請使用隨附應用程式設定解鎖選項</string>
+ <string name="trusted_device_item_title">允許「%1$s」&lt;b&gt;&lt;/b&gt;將我的設定檔解鎖</string>
+ <string name="device_not_connected_dialog_title">你的手機必須保持連線狀態</string>
+ <string name="device_not_connected_dialog_message">如要開啟這項功能,請確認你的車輛和手機均已開啟藍牙且彼此相鄰</string>
+ <string name="trusted_device_enrollment_success_message">「%1$s」&lt;b&gt;&lt;/b&gt;現在可以將你的設定檔解鎖了</string>
+ <string name="create_profile_lock_dialog_title">設定主要設定檔鎖定</string>
+ <string name="create_profile_lock_dialog_message">如要使用手機解鎖設定檔,你必須設定備用的主要設定檔鎖定</string>
+ <string name="unlock_profile_to_finish_title">請將設定檔解鎖以完成作業</string>
+ <string name="unlock_profile_to_finish_message">你已設定新的設定檔鎖定。接著,請再次輸入設定檔鎖定,確認你的手機可自動解鎖設定檔</string>
+ <string name="disable_device_connection_text">中斷與這部裝置的連線</string>
+ <string name="enable_device_connection_text">重新連線到這部裝置</string>
+ <string name="trusted_device_notification_channel_name">使用手機解鎖</string>
+ <string name="trusted_device_notification_title">允許手機將設定檔解鎖</string>
+ <string name="trusted_device_notification_content">輕觸這裡即可授權這項功能</string>
+ <string name="trusted_device_enrollment_error_dialog_title">發生錯誤</string>
+ <string name="trusted_device_enrollment_error_dialog_message">很抱歉,目前無法開啟這項功能,請再試一次。</string>
+ <string name="create_phone_lock_dialog_title">在手機上設定螢幕鎖定</string>
+ <string name="create_phone_lock_dialog_message">你的手機未設定螢幕鎖定。如要透過手機將車輛設定檔解鎖,請先在手機的設定頁面中設定螢幕鎖定 (即密碼)。</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">新訊息</item>
+ <item quantity="other">%d 則新訊息</item>
+ </plurals>
+ <string name="name_not_available">無法使用這個名稱</string>
</resources>
diff --git a/companiondevice/res/values-zu/strings.xml b/companiondevice/res/values-zu/strings.xml
index c760c77..1cebd0d 100644
--- a/companiondevice/res/values-zu/strings.xml
+++ b/companiondevice/res/values-zu/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (C) 2019 The Android Open Source Project
+ ~ Copyright (C) 2021 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -13,70 +13,74 @@
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
- -->
+ -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="default_device_name" msgid="405493967512651629">"Idivayisi ehlobene"</string>
- <string name="add_device_title" msgid="6166003577845888151">"Engeza Idivayisi ehlobene"</string>
- <string name="add_associated_device_title" msgid="3275596124326477381">"Xhuma idivayisi engumngane"</string>
- <string name="add_associated_device_instruction" msgid="1015406964657139291">"Ungasebenzisa ifoni yakho njengedivayisi engumgane ukukusiza uphathe ukuzizwela kwakho kokushayela"</string>
- <string name="associated_device_install_app" msgid="981663561198924864">"Qiniseka ukuthi "<b>"Unohlelo lokusebenza olungumngane"</b>" olufakwe kwifoni yakho"</string>
- <string name="associated_device_pairing_code_title" msgid="5118861901337336309">"Qinisekisa ikhodi kufoni"</string>
- <string name="associated_device_pairing_message" msgid="7319249426394299109">"Qinisekisa ukuthi lokhu kufana nekhodi eboniswe kufoni yakho"</string>
- <string name="associated_device_success" msgid="584760065696870256">"Idivayisi ihlotshaniswe ngokuphumelelayo"</string>
- <string name="associated_device_select_device" msgid="1931869046289060602">"Vula uhlelo lokusebenza bese uxhuma ku-&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;"</string>
- <string name="associated_device_open_app" msgid="6602241720850890521">"Vula uhlelo lokusebenza bese ulandela imiyalelo kuhlelo lokusebenza"</string>
- <string name="remove_associated_device_title" msgid="4060806982019423895">"Khohlwa i-&lt;b&gt;<xliff:g id="CAR_NAME">%1$s</xliff:g>&lt;b&gt;?"</string>
- <string name="remove_associated_device_message" msgid="3991333597951462900">"Le moto ngeke isabhangqwa nale divayisi. Ngaphezu kwalokho kuzodingeka ukuthi ususe le moto kuhlelo lokusebenza Elingumngane."</string>
- <string name="device_removed_success_toast_text" msgid="3242832156490823936">"I-<xliff:g id="PHONE_NAME">%1$s</xliff:g> ikhohliwe"</string>
- <string name="device_removed_failure_toast_text" msgid="3756625943664982395">"Yehlulekile ukukhohlwa i-<xliff:g id="PHONE_NAME">%1$s</xliff:g>"</string>
- <string name="continue_setup_toast_text" msgid="8487187853051037413">"Qhubeka nokusetha ifoni yakho"</string>
- <string name="error_screen_title" msgid="3977744142045194903">"Okuthile akuhambanga kahle"</string>
- <string name="error_screen_message" msgid="1217200461704367056">"Ngeshwa, lesi sikrini asikwazanga ukubonisa kahle. Sicela uzame futhi."</string>
- <string name="turn_on_bluetooth_title" msgid="2877749869113938263">"Vula i-Bluetooth"</string>
- <string name="turn_on_bluetooth_message" msgid="5087006108685547788">"Ukusetha ifoni yakho njengedivayisi engumngane, imoto yakho idinga i-Bluetooth."</string>
- <string name="turn_on_bluetooth_dialog_title" msgid="8693712073791430461">"Vula i-Bluetooth?"</string>
- <string name="turn_on_bluetooth_dialog_message" msgid="5347157597209022072">"Ukuxhuma kudivayisi yakho engumngane, imoto yakho idinga i-Bluetooth."</string>
- <string name="accept" msgid="1454710793329618813">"Yamukela"</string>
- <string name="reject" msgid="4315432282758892890">"Nqaba"</string>
- <string name="confirm" msgid="3748997214719276945">"Qinisekisa"</string>
- <string name="cancel" msgid="4306609731174629323">"Khansela"</string>
- <string name="remove" msgid="5513398257088729188">"Susa"</string>
- <string name="ok" msgid="2825038997730899083">"KULUNGILE"</string>
- <string name="connection" msgid="2798490936433656846">"Uxhumo"</string>
- <string name="forget_title" msgid="3027608547243824729">"Khohlwa le divayisi"</string>
- <string name="forget" msgid="2069897665699141222">"Khohlwa"</string>
- <string name="disable" msgid="4619854429066283970">"Khubaza"</string>
- <string name="enable" msgid="7656386199154111316">"Nika amandla"</string>
- <string name="continue_button" msgid="2748318968566159950">"Qhubeka"</string>
- <string name="retry" msgid="3783419451480721367">"Zama futhi"</string>
- <string name="turn_on" msgid="4288754850470994812">"Vula"</string>
- <string name="not_now" msgid="8764692269093707622">"Hhayi manje"</string>
- <string name="connected" msgid="8051190714042020471">"Ixhunyiwe"</string>
- <string name="notDetected" msgid="4115229772085594506">"Ayitholiwe"</string>
- <string name="disconnected" msgid="8526513868622591894">"Inqamukile"</string>
- <string name="unknown" msgid="555736316465118024">"Akwaziwa"</string>
- <string name="app_running_msg_channel_name" msgid="87011783084544733">"Isevisi yomyalezo obhaliwe wefoni iyasebenza"</string>
- <string name="app_running_msg_notification_title" msgid="388907180286994900">"Isevisi yomlayezo obhaliwe wefoni iyasebenza"</string>
- <string name="app_running_msg_notification_content" msgid="4602261901969140233">"Ithola imiyalezo ebhaliwe ngohlelo lokusebenza lomngane"</string>
- <string name="trusted_device_feature_title" msgid="2690568414493283969">"Vula iphrofayela ngefoni"</string>
- <string name="trusted_device_feature_instruction" msgid="2546439818978826962">"Hlola Uhlelo lwakho lokusebenza elingumngane ukusetha izinketho zokuvula"</string>
- <string name="trusted_device_item_title" msgid="4390572381407233745">"Vumela i-&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;b&gt; ukuvula iphrofayela yami"</string>
- <string name="device_not_connected_dialog_title" msgid="1157155922752758658">"Ifoni yakho kufanele ixhunywe ngokusebenzayo"</string>
- <string name="device_not_connected_dialog_message" msgid="4987412656697205324">"Ukuvula lesi sici, qiniseka ukuthi imoto nefoni yakho kuvulwe i-bluetooth futhi kuseduzane"</string>
- <string name="trusted_device_enrollment_success_message" msgid="2080578779942302923">"I-&lt;b&gt;<xliff:g id="PHONE_NAME">%1$s</xliff:g>&lt;b&gt; manje isingakwazi ukuvula iphrofayela yakho"</string>
- <string name="create_profile_lock_dialog_title" msgid="7865225698595414341">"Dala ukhiye wephrofayela oyinhloko"</string>
- <string name="create_profile_lock_dialog_message" msgid="5078929325894045416">"Ukusebenzisa ifoni yakho ukuvula iphrofayela yakho, udinga ukukhiya iphrofayela okuyinhloko njengekhophi yasenqolobaneni"</string>
- <string name="unlock_profile_to_finish_title" msgid="6542028315996392302">"Vula iphrofayela yakho ukuqeda"</string>
- <string name="unlock_profile_to_finish_message" msgid="8616094218201557262">"Udale ukhiye wephrofayela omusha. Okulandelayo, ufake futhi ukuqinisekisa ukuthi ifoni yakho ingakwazi ukuvula iphrofayela ngokuzenzekelayo"</string>
- <string name="disable_device_connection_text" msgid="4361795552013963732">"Nqamula le divayisi"</string>
- <string name="enable_device_connection_text" msgid="7742550392552935783">"Xhuma kabusha le divayisi"</string>
- <string name="trusted_device_notification_channel_name" msgid="6717174570621750321">"Vula ngefoni"</string>
- <string name="trusted_device_notification_title" msgid="249913439061543209">"Vumela ifoni yakho ukuvula iphrofayela yakho"</string>
- <string name="trusted_device_notification_content" msgid="7536321078698712456">"Thepha lapha ukugunyaza lesi sici"</string>
- <string name="trusted_device_enrollment_error_dialog_title" msgid="8120284275374458606">"Okuthile akuhambanga kahle"</string>
- <string name="trusted_device_enrollment_error_dialog_message" msgid="7205036748277720461">"Ngeshwa, lesi sici asikwazanga ukuvulwa okwamanje. Sicela uzame futhi."</string>
- <string name="create_phone_lock_dialog_title" msgid="9160142569534569820">"Dala ukukhiya isikrini kufoni yakho"</string>
- <string name="create_phone_lock_dialog_message" msgid="8209460622086922427">"Ifoni yakho ayinakho ukukhiya isikrini okusethiwe. Ukuvula iphrofayela yakho yemoto ngefoni yakho, dala kuqala ukukhiya isikrini (okwaziwa futhi ngokuthi ikhodi yokudlula) kumasethingi wefoni yakho"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="default_device_name">Idivayisi ehlobene</string>
+ <string name="add_device_title">Engeza Idivayisi ehlobene</string>
+ <string name="add_associated_device_title">Xhuma idivayisi engumngane</string>
+ <string name="add_associated_device_instruction">Ungasebenzisa ifoni yakho njengedivayisi engumgane ukukusiza uphathe ukuzizwela kwakho kokushayela</string>
+ <string name="associated_device_install_app">Qiniseka ukuthi <b>Unohlelo lokusebenza elingumngane</b> olufakwe efonini yakho</string>
+ <string name="associated_device_pairing_code_title">Qinisekisa ikhodi kufoni</string>
+ <string name="associated_device_pairing_message">Qinisekisa ukuthi lokhu kufana nekhodi eboniswe kufoni yakho</string>
+ <string name="associated_device_success">Idivayisi ihlotshaniswe ngokuphumelelayo</string>
+ <string name="associated_device_select_device">Vula uhlelo lokusebenza bese uxhuma ku-&lt;b&gt;%1$s&lt;/b&gt;</string>
+ <string name="associated_device_open_app">Vula uhlelo lokusebenza bese ulandela imiyalelo kuhlelo lokusebenza</string>
+ <string name="remove_associated_device_title">Khohlwa i-&lt;b&gt;%1$s&lt;/b&gt;?</string>
+ <string name="remove_associated_device_message">Le moto ngeke isabhangqwa nale divayisi. Ngaphezu kwalokho kuzodingeka ukuthi ususe le moto kuhlelo lokusebenza Elingumngane.</string>
+ <string name="device_removed_success_toast_text">I-%1$s ikhohliwe</string>
+ <string name="device_removed_failure_toast_text">Yehlulekile ukukhohlwa i-%1$s</string>
+ <string name="continue_setup_toast_text">Qhubeka nokusetha ifoni yakho</string>
+ <string name="error_screen_title">Okuthile akuhambanga kahle</string>
+ <string name="error_screen_message">Ngeshwa, lesi sikrini asikwazanga ukubonisa kahle. Zama futhi.</string>
+ <string name="turn_on_bluetooth_title">Vula i-Bluetooth</string>
+ <string name="turn_on_bluetooth_message">Ukusetha ifoni yakho njengedivayisi engumngane, imoto yakho idinga i-Bluetooth.</string>
+ <string name="turn_on_bluetooth_dialog_title">Vula i-Bluetooth?</string>
+ <string name="turn_on_bluetooth_dialog_message">Ukuxhuma kudivayisi yakho engumngane, imoto yakho idinga i-Bluetooth.</string>
+ <string name="accept">Yamukela</string>
+ <string name="reject">Nqaba</string>
+ <string name="confirm">Qinisekisa</string>
+ <string name="cancel">Khansela</string>
+ <string name="remove">Susa</string>
+ <string name="ok">KULUNGILE</string>
+ <string name="connection">Uxhumo</string>
+ <string name="forget_title">Khohlwa le divayisi</string>
+ <string name="forget">Khohlwa</string>
+ <string name="disable">Khubaza</string>
+ <string name="enable">Nika amandla</string>
+ <string name="continue_button">Qhubeka</string>
+ <string name="retry">Zama futhi</string>
+ <string name="turn_on">Vula</string>
+ <string name="not_now">Hhayi manje</string>
+ <string name="connected">Ixhunyiwe</string>
+ <string name="notDetected">Ayitholiwe</string>
+ <string name="disconnected">Inqamukile</string>
+ <string name="unknown">Akwaziwa</string>
+ <string name="app_running_msg_channel_name">Isevisi yomyalezo obhaliwe wefoni iyasebenza</string>
+ <string name="app_running_msg_notification_title">Isevisi yomlayezo obhaliwe wefoni iyasebenza</string>
+ <string name="app_running_msg_notification_content">Ithola imiyalezo ebhaliwe ngohlelo lokusebenza lomngane</string>
+ <string name="trusted_device_feature_title">Vula iphrofayela ngefoni</string>
+ <string name="trusted_device_feature_instruction">Hlola Uhlelo lwakho lokusebenza elingumngane ukusetha izinketho zokuvula</string>
+ <string name="trusted_device_item_title">Vumela i-&lt;b&gt;%1$s&lt;/b&gt; ivule iphrofayela lami</string>
+ <string name="device_not_connected_dialog_title">Ifoni yakho kufanele ixhunywe ngokusebenzayo</string>
+ <string name="device_not_connected_dialog_message">Ukuvula lesi sici, qiniseka ukuthi imoto nefoni yakho kuvulwe i-bluetooth futhi kuseduzane</string>
+ <string name="trusted_device_enrollment_success_message">I-&lt;b&gt;%1$s&lt;/b&gt; manje isiyakwazi ukuvula iphrofayela lakho</string>
+ <string name="create_profile_lock_dialog_title">Dala ukhiye wephrofayela oyinhloko</string>
+ <string name="create_profile_lock_dialog_message">Ukusebenzisa ifoni yakho ukuvula iphrofayela yakho, udinga ukukhiya iphrofayela okuyinhloko njengekhophi yasenqolobaneni</string>
+ <string name="unlock_profile_to_finish_title">Vula iphrofayela yakho ukuqeda</string>
+ <string name="unlock_profile_to_finish_message">Udale ukhiye wephrofayela omusha. Okulandelayo, ufake futhi ukuqinisekisa ukuthi ifoni yakho ingakwazi ukuvula iphrofayela ngokuzenzekelayo</string>
+ <string name="disable_device_connection_text">Nqamula le divayisi</string>
+ <string name="enable_device_connection_text">Xhuma kabusha le divayisi</string>
+ <string name="trusted_device_notification_channel_name">Vula ngefoni</string>
+ <string name="trusted_device_notification_title">Vumela ifoni yakho ukuvula iphrofayela yakho</string>
+ <string name="trusted_device_notification_content">Thepha lapha ukugunyaza lesi sici</string>
+ <string name="trusted_device_enrollment_error_dialog_title">Okuthile akuhambanga kahle</string>
+ <string name="trusted_device_enrollment_error_dialog_message">Ngeshwa, lesi sici asikwazanga ukuvulwa okwamanje. Zama futhi.</string>
+ <string name="create_phone_lock_dialog_title">Dala ukukhiya isikrini kufoni yakho</string>
+ <string name="create_phone_lock_dialog_message">Ifoni yakho ayinakho ukukhiya isikrini okusethiwe. Ukuvula iphrofayela yakho yemoto ngefoni yakho, dala kuqala ukukhiya isikrini (okwaziwa futhi ngokuthi ikhodi yokudlula) kumasethingi wefoni yakho.</string>
+ <plurals name="notification_new_message">
+ <item quantity="one">%d imilayezo emisha</item>
+ <item quantity="other">%d imilayezo emisha</item>
+ </plurals>
+ <string name="name_not_available">Igama alitholakali</string>
</resources>
diff --git a/companiondevice/res/values/config.xml b/companiondevice/res/values/config.xml
index ce05f94..8cfef9a 100644
--- a/companiondevice/res/values/config.xml
+++ b/companiondevice/res/values/config.xml
@@ -22,8 +22,6 @@
<string name="car_spp_service_uuid_secure" translatable="false">32a0e1c6-bbd2-11ea-b3de-0242ac130004</string>
- <bool name="enable_spp_support">false</bool>
-
<!-- Services to start early in the single user (user 0). -->
<string-array name="early_single_user_services" translatable="false">
<item>com.google.android.companiondevicesupport/com.google.android.connecteddevice.trust.TrustedDeviceManagerService</item>
diff --git a/companiondevice/res/values/strings.xml b/companiondevice/res/values/strings.xml
index e425c50..c23dd1f 100644
--- a/companiondevice/res/values/strings.xml
+++ b/companiondevice/res/values/strings.xml
@@ -16,9 +16,11 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Name of application [CHAR LIMIT=25] -->
+ <!-- Name of application -->
<string name="app_name" translatable="false">Companion Device</string>
- <!-- Default value for associated device list item [CHAR LIMIT=20] -->
+ <!-- Title of application entry in Settings [CHAR LIMIT=30] -->
+ <string name="settings_entry_title">Companion Device</string>
+ <!-- Default value for associated device list item [CHAR LIMIT=25] -->
<string name="default_device_name">Associated Device</string>
<!-- Label for button to add an associated device [CHAR LIMIT=50] -->
<string name="add_device_title">Add Associated Device</string>
@@ -26,7 +28,7 @@
<string name="add_associated_device_title">Connect a companion device</string>
<!-- Instruction for adding associated device [CHAR LIMIT=100] -->
<string name="add_associated_device_instruction">You can use your phone as a companion device to help manage your driving experience</string>
- <!-- Instruction for opening Companion App [CHAR LIMIT=60] -->
+ <!-- Instruction for opening Companion App [CHAR LIMIT=100] -->
<string name="associated_device_install_app">Make sure you have <b>Companion App</b> installed on your phone</string>
<!-- Title for confirm pairing code fragment [CHAR LIMIT=60]-->
<string name="associated_device_pairing_code_title">Confirm code on phone</string>
@@ -34,8 +36,8 @@
<string name="associated_device_pairing_message">Confirm that this matches the code shown on your phone</string>
<!-- Message shown when user associates a device successfully [CHAR LIMIT=100]-->
<string name="associated_device_success">Device has been associated successfully</string>
- <!-- Adding an associated device [CHAR LIMIT=50]-->
- <string name="associated_device_select_device">Open the app and connect to &lt;b><xliff:g id="car_name" example="MyCar">%1$s</xliff:g>&lt;b></string>
+ <!-- Adding an associated device [CHAR LIMIT=100]-->
+ <string name="associated_device_select_device">Open the app and connect to &lt;b><xliff:g id="car_name" example="MyCar">%1$s</xliff:g>&lt;/b></string>
<!-- Open the companion app and follow the instructions that appear in the companion app when it is opened [CHAR LIMIT=60]-->
<string name="associated_device_open_app">Open the app and follow instructions in the app</string>
<!-- Title for remove device dialog [CHAR LIMIT=40]-->
@@ -104,7 +106,7 @@
<!-- NotificationMsg Feature strings-->
<!--Notification Channel name for the silent "message notification service running" notification [CHAR LIMIT=100]-->
<string name="app_running_msg_channel_name">Phone text message service running</string>
- <!--Notification Channel description for the silent "message notification service running" notification [CHAR LIMIT=50]-->
+ <!--Notification Channel description for the silent "message notification service running" notification [CHAR LIMIT=60]-->
<string name="app_running_msg_notification_title">Phone text messaging service is active</string>
<!--Notification Channel content for the silent "message notification service running" notification [CHAR LIMIT=100]-->
<string name="app_running_msg_notification_content">Receiving text messages via companion device</string>
diff --git a/companiondevice/src/com/google/android/companiondevicesupport/AssociatedDeviceDetailFragment.java b/companiondevice/src/com/google/android/companiondevicesupport/AssociatedDeviceDetailFragment.java
index 73a2208..22ef944 100644
--- a/companiondevice/src/com/google/android/companiondevicesupport/AssociatedDeviceDetailFragment.java
+++ b/companiondevice/src/com/google/android/companiondevicesupport/AssociatedDeviceDetailFragment.java
@@ -16,21 +16,33 @@
package com.google.android.companiondevicesupport;
-import androidx.lifecycle.ViewModelProviders;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import androidx.lifecycle.ViewModelProvider;
+import android.content.DialogInterface;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
+import android.text.Html;
+import android.text.Spanned;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
+import com.google.android.connecteddevice.model.AssociatedDeviceDetails;
+import com.google.android.connecteddevice.service.AssociatedDeviceViewModel;
+import com.google.android.connecteddevice.service.AssociatedDeviceViewModelFactory;
import com.google.android.connecteddevice.trust.TrustedDeviceConstants;
/** Fragment that shows the details of an associated device. */
public class AssociatedDeviceDetailFragment extends Fragment {
private static final String TAG = "AssociatedDeviceDetailFragment";
+ private static final String REMOVE_DEVICE_DIALOG_TAG = "RemoveDeviceDialog";
private TextView deviceName;
private TextView connectionStatusText;
private ImageView connectionStatusIndicator;
@@ -52,16 +64,21 @@ public class AssociatedDeviceDetailFragment extends Fragment {
connectionStatusText = view.findViewById(R.id.connection_status_text);
connectionStatusIndicator = view.findViewById(R.id.connection_status_indicator);
- model = ViewModelProviders.of(getActivity()).get(AssociatedDeviceViewModel.class);
- model.getDeviceDetails().observe(this, this::setDeviceDetails);
+ model =
+ new ViewModelProvider(
+ requireActivity(),
+ new AssociatedDeviceViewModelFactory(
+ requireActivity().getApplication(),
+ getResources().getBoolean(R.bool.enable_spp)))
+ .get(AssociatedDeviceViewModel.class);
+ model.getCurrentDeviceDetails().observe(this, this::setDeviceDetails);
view.findViewById(R.id.connection_button)
.setOnClickListener(
l -> {
model.toggleConnectionStatusForCurrentDevice();
});
- view.findViewById(R.id.remove_button)
- .setOnClickListener(v -> model.selectCurrentDeviceToRemove());
+ view.findViewById(R.id.remove_button).setOnClickListener(v -> showRemoveDeviceDialog());
view.findViewById(R.id.trusted_device_feature_button)
.setOnClickListener(
v ->
@@ -69,6 +86,14 @@ public class AssociatedDeviceDetailFragment extends Fragment {
TrustedDeviceConstants.INTENT_ACTION_TRUSTED_DEVICE_SETTING));
}
+ @Override
+ public void onCreate(@Nullable Bundle bundle) {
+ super.onCreate(bundle);
+ if (bundle != null) {
+ resumeRemoveDeviceDialog();
+ }
+ }
+
private void setDeviceDetails(AssociatedDeviceDetails deviceDetails) {
if (deviceDetails == null) {
return;
@@ -106,4 +131,56 @@ public class AssociatedDeviceDetailFragment extends Fragment {
this.connectionText.setText(connectionText);
this.connectionIcon.setImageDrawable(connectionIcon);
}
+
+ private void showRemoveDeviceDialog() {
+ String deviceName = model.getCurrentDeviceDetails().getValue().getDeviceName();
+ RemoveDeviceDialogFragment dialogFragment =
+ RemoveDeviceDialogFragment.newInstance(deviceName, (d, w) -> model.removeCurrentDevice());
+ dialogFragment.show(getParentFragmentManager(), REMOVE_DEVICE_DIALOG_TAG);
+ }
+
+ private void resumeRemoveDeviceDialog() {
+ RemoveDeviceDialogFragment removeDeviceDialogFragment =
+ (RemoveDeviceDialogFragment)
+ getParentFragmentManager().findFragmentByTag(REMOVE_DEVICE_DIALOG_TAG);
+ if (removeDeviceDialogFragment != null) {
+ removeDeviceDialogFragment.setOnConfirmListener((d, w) -> model.removeCurrentDevice());
+ }
+ }
+
+ /** Dialog fragment to confirm removing an associated device. */
+ public static class RemoveDeviceDialogFragment extends DialogFragment {
+ private static final String DEVICE_NAME_KEY = "device_name";
+
+ private DialogInterface.OnClickListener onConfirmListener;
+
+ static RemoveDeviceDialogFragment newInstance(
+ @NonNull String deviceName, @NonNull DialogInterface.OnClickListener listener) {
+ Bundle bundle = new Bundle();
+ bundle.putString(DEVICE_NAME_KEY, deviceName);
+ RemoveDeviceDialogFragment fragment = new RemoveDeviceDialogFragment();
+ fragment.setArguments(bundle);
+ fragment.setOnConfirmListener(listener);
+ return fragment;
+ }
+
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ Bundle bundle = getArguments();
+ String deviceName = bundle.getString(DEVICE_NAME_KEY);
+ String title = getString(R.string.remove_associated_device_title, deviceName);
+ Spanned styledTitle = Html.fromHtml(title, Html.FROM_HTML_MODE_LEGACY);
+ return new AlertDialog.Builder(getActivity())
+ .setTitle(styledTitle)
+ .setMessage(getString(R.string.remove_associated_device_message))
+ .setNegativeButton(getString(R.string.cancel), null)
+ .setPositiveButton(getString(R.string.forget), onConfirmListener)
+ .setCancelable(true)
+ .create();
+ }
+
+ void setOnConfirmListener(@NonNull DialogInterface.OnClickListener onConfirmListener) {
+ this.onConfirmListener = onConfirmListener;
+ }
+ }
}
diff --git a/companiondevice/src/com/google/android/companiondevicesupport/AssociationActivity.java b/companiondevice/src/com/google/android/companiondevicesupport/AssociationActivity.java
index 73e053a..3c53ca1 100644
--- a/companiondevice/src/com/google/android/companiondevicesupport/AssociationActivity.java
+++ b/companiondevice/src/com/google/android/companiondevicesupport/AssociationActivity.java
@@ -18,21 +18,19 @@ package com.google.android.companiondevicesupport;
import android.app.AlertDialog;
import android.app.Dialog;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
import android.bluetooth.BluetoothAdapter;
-import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
-import android.text.Html;
-import android.text.Spanned;
import android.widget.Toast;
-import androidx.annotation.NonNull;
import com.google.android.companiondevicesupport.ui.Toolbar;
import com.google.android.connecteddevice.api.RemoteFeature;
import com.google.android.connecteddevice.model.AssociatedDevice;
+import com.google.android.connecteddevice.service.AssociatedDeviceViewModel;
+import com.google.android.connecteddevice.service.AssociatedDeviceViewModelFactory;
/** Activity class for association */
public class AssociationActivity extends FragmentActivity {
@@ -43,7 +41,6 @@ public class AssociationActivity extends FragmentActivity {
private static final String PAIRING_CODE_FRAGMENT_TAG = "ConfirmPairingCodeFragment";
private static final String TURN_ON_BLUETOOTH_FRAGMENT_TAG = "TurnOnBluetoothFragment";
private static final String ASSOCIATION_ERROR_FRAGMENT_TAG = "AssociationErrorFragment";
- private static final String REMOVE_DEVICE_DIALOG_TAG = "RemoveDeviceDialog";
private static final String TURN_ON_BLUETOOTH_DIALOG_TAG = "TurnOnBluetoothDialog";
private Toolbar toolbar;
@@ -58,16 +55,13 @@ public class AssociationActivity extends FragmentActivity {
toolbar.setOnBackButtonClickListener(v -> finish());
observeViewModel();
- if (saveInstanceState != null) {
- resumePreviousState();
- }
}
@Override
protected void onStart() {
super.onStart();
// Only start association if a device is not already associated.
- if (model.getDeviceDetails().getValue() == null) {
+ if (model.getCurrentDeviceDetails().getValue() == null) {
model.startAssociation();
}
}
@@ -79,7 +73,12 @@ public class AssociationActivity extends FragmentActivity {
}
private void observeViewModel() {
- model = ViewModelProviders.of(this).get(AssociatedDeviceViewModel.class);
+ model =
+ new ViewModelProvider(
+ this,
+ new AssociatedDeviceViewModelFactory(
+ getApplication(), getResources().getBoolean(R.bool.enable_spp)))
+ .get(AssociatedDeviceViewModel.class);
model
.getAssociationState()
@@ -150,7 +149,7 @@ public class AssociationActivity extends FragmentActivity {
}
});
model
- .getDeviceDetails()
+ .getCurrentDeviceDetails()
.observe(
this,
deviceDetails -> {
@@ -164,46 +163,35 @@ public class AssociationActivity extends FragmentActivity {
runOnUiThread(this::showAssociatedDeviceDetailFragment);
}
});
-
- model
- .getDeviceToRemove()
- .observe(
- this,
- device -> {
- if (device != null) {
- runOnUiThread(() -> showRemoveDeviceDialog(device));
- }
- });
-
model
.getRemovedDevice()
.observe(
this,
device -> {
if (device != null) {
- runOnUiThread(
- () ->
- Toast.makeText(
- getApplicationContext(),
- getString(
- R.string.device_removed_success_toast_text,
- device.getDeviceName()),
- Toast.LENGTH_SHORT)
- .show());
+ runOnUiThread(() -> showDeviceRemovedToast(device.getDeviceName()));
finish();
}
});
model
- .isFinished()
+ .isServiceDisconnected()
.observe(
this,
- isFinished -> {
- if (isFinished) {
+ isServiceDisconnected -> {
+ if (isServiceDisconnected) {
finish();
}
});
}
+ private void showDeviceRemovedToast(String deviceName) {
+ Toast.makeText(
+ getApplicationContext(),
+ getString(R.string.device_removed_success_toast_text, deviceName),
+ Toast.LENGTH_SHORT)
+ .show();
+ }
+
private void showTurnOnBluetoothFragment() {
showProgressBar();
TurnOnBluetoothFragment fragment = new TurnOnBluetoothFragment();
@@ -253,13 +241,6 @@ public class AssociationActivity extends FragmentActivity {
toolbar.showProgressBar();
}
- private void showRemoveDeviceDialog(AssociatedDevice device) {
- RemoveDeviceDialogFragment removeDeviceDialogFragment =
- RemoveDeviceDialogFragment.newInstance(
- device.getDeviceName(), (d, which) -> model.removeCurrentDevice());
- removeDeviceDialogFragment.show(getSupportFragmentManager(), REMOVE_DEVICE_DIALOG_TAG);
- }
-
private void showTurnOnBluetoothDialog() {
if (!BluetoothAdapter.getDefaultAdapter().isEnabled()) {
TurnOnBluetoothDialogFragment fragment = new TurnOnBluetoothDialogFragment();
@@ -267,15 +248,6 @@ public class AssociationActivity extends FragmentActivity {
}
}
- private void resumePreviousState() {
- RemoveDeviceDialogFragment removeDeviceDialogFragment =
- (RemoveDeviceDialogFragment)
- getSupportFragmentManager().findFragmentByTag(REMOVE_DEVICE_DIALOG_TAG);
- if (removeDeviceDialogFragment != null) {
- removeDeviceDialogFragment.setOnConfirmListener((d, which) -> model.removeCurrentDevice());
- }
- }
-
private void launchFragment(Fragment fragment, String tag) {
getSupportFragmentManager()
.beginTransaction()
@@ -308,42 +280,6 @@ public class AssociationActivity extends FragmentActivity {
return RemoteFeature.ACTION_ASSOCIATION_SETTING.equals(action);
}
- /** Dialog fragment to confirm removing an associated device. */
- public static class RemoveDeviceDialogFragment extends DialogFragment {
- private static final String DEVICE_NAME_KEY = "device_name";
-
- private DialogInterface.OnClickListener onConfirmListener;
-
- static RemoveDeviceDialogFragment newInstance(
- @NonNull String deviceName, DialogInterface.OnClickListener listener) {
- Bundle bundle = new Bundle();
- bundle.putString(DEVICE_NAME_KEY, deviceName);
- RemoveDeviceDialogFragment fragment = new RemoveDeviceDialogFragment();
- fragment.setArguments(bundle);
- fragment.setOnConfirmListener(listener);
- return fragment;
- }
-
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState) {
- Bundle bundle = getArguments();
- String deviceName = bundle.getString(DEVICE_NAME_KEY);
- String title = getString(R.string.remove_associated_device_title, deviceName);
- Spanned styledTitle = Html.fromHtml(title, Html.FROM_HTML_MODE_LEGACY);
- return new AlertDialog.Builder(getActivity())
- .setTitle(styledTitle)
- .setMessage(getString(R.string.remove_associated_device_message))
- .setNegativeButton(getString(R.string.cancel), null)
- .setPositiveButton(getString(R.string.forget), onConfirmListener)
- .setCancelable(true)
- .create();
- }
-
- void setOnConfirmListener(DialogInterface.OnClickListener onConfirmListener) {
- this.onConfirmListener = onConfirmListener;
- }
- }
-
/** Dialog fragment to turn on bluetooth. */
public static class TurnOnBluetoothDialogFragment extends DialogFragment {
@Override
diff --git a/companiondevice/src/com/google/android/companiondevicesupport/AssociationErrorFragment.java b/companiondevice/src/com/google/android/companiondevicesupport/AssociationErrorFragment.java
index 01d6cfd..1a608c1 100644
--- a/companiondevice/src/com/google/android/companiondevicesupport/AssociationErrorFragment.java
+++ b/companiondevice/src/com/google/android/companiondevicesupport/AssociationErrorFragment.java
@@ -16,12 +16,14 @@
package com.google.android.companiondevicesupport;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import com.google.android.connecteddevice.service.AssociatedDeviceViewModel;
+import com.google.android.connecteddevice.service.AssociatedDeviceViewModelFactory;
/** Fragment that displays when an error happens during association. */
public class AssociationErrorFragment extends Fragment {
@@ -38,7 +40,12 @@ public class AssociationErrorFragment extends Fragment {
.setOnClickListener(
v -> {
AssociatedDeviceViewModel model =
- ViewModelProviders.of(getActivity()).get(AssociatedDeviceViewModel.class);
+ new ViewModelProvider(
+ requireActivity(),
+ new AssociatedDeviceViewModelFactory(
+ requireActivity().getApplication(),
+ getResources().getBoolean(R.bool.enable_spp)))
+ .get(AssociatedDeviceViewModel.class);
model.retryAssociation();
});
}
diff --git a/companiondevice/src/com/google/android/companiondevicesupport/OobAssociatedDeviceViewModel.java b/companiondevice/src/com/google/android/companiondevicesupport/OobAssociatedDeviceViewModel.java
index e96ebe3..76607ae 100644
--- a/companiondevice/src/com/google/android/companiondevicesupport/OobAssociatedDeviceViewModel.java
+++ b/companiondevice/src/com/google/android/companiondevicesupport/OobAssociatedDeviceViewModel.java
@@ -24,6 +24,7 @@ import android.bluetooth.BluetoothAdapter;
import android.os.RemoteException;
import com.google.android.connecteddevice.api.IAssociatedDeviceManager;
import com.google.android.connecteddevice.model.OobEligibleDevice;
+import com.google.android.connecteddevice.service.AssociatedDeviceViewModel;
/** {@link ViewModel} for out of band association. */
public class OobAssociatedDeviceViewModel extends AssociatedDeviceViewModel {
@@ -32,14 +33,14 @@ public class OobAssociatedDeviceViewModel extends AssociatedDeviceViewModel {
private final OobEligibleDevice oobEligibleDevice;
public OobAssociatedDeviceViewModel(
- Application application, OobEligibleDevice oobEligibleDevice) {
- super(application);
+ Application application, OobEligibleDevice oobEligibleDevice, boolean isSppEnabled) {
+ super(application, isSppEnabled);
this.oobEligibleDevice = oobEligibleDevice;
}
@Override
- protected void startAssociation() {
+ public void startAssociation() {
IAssociatedDeviceManager manager = getAssociatedDeviceManager();
if (manager == null) {
return;
diff --git a/companiondevice/src/com/google/android/companiondevicesupport/OobAssociatedDeviceViewModelFactory.java b/companiondevice/src/com/google/android/companiondevicesupport/OobAssociatedDeviceViewModelFactory.java
index 439c91b..139b8b7 100644
--- a/companiondevice/src/com/google/android/companiondevicesupport/OobAssociatedDeviceViewModelFactory.java
+++ b/companiondevice/src/com/google/android/companiondevicesupport/OobAssociatedDeviceViewModelFactory.java
@@ -27,22 +27,20 @@ public class OobAssociatedDeviceViewModelFactory extends ViewModelProvider.Andro
private final Application application;
private final OobEligibleDevice oobEligibleDevice;
-
- public static OobAssociatedDeviceViewModelFactory getInstance(
- Application application, OobEligibleDevice oobEligibleDevice) {
- return new OobAssociatedDeviceViewModelFactory(application, oobEligibleDevice);
- }
+ private final boolean isSppEnabled;
public OobAssociatedDeviceViewModelFactory(
- @NonNull Application application, OobEligibleDevice oobEligibleDevice) {
+ @NonNull Application application, OobEligibleDevice oobEligibleDevice, boolean isSppEnabled) {
super(application);
this.application = application;
this.oobEligibleDevice = oobEligibleDevice;
+ this.isSppEnabled = isSppEnabled;
}
@NonNull
@Override
public <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
- return modelClass.cast(new OobAssociatedDeviceViewModel(application, oobEligibleDevice));
+ return modelClass.cast(
+ new OobAssociatedDeviceViewModel(application, oobEligibleDevice, isSppEnabled));
}
}
diff --git a/companiondevice/src/com/google/android/companiondevicesupport/OobAssociationActivity.java b/companiondevice/src/com/google/android/companiondevicesupport/OobAssociationActivity.java
index 9195e26..1c20628 100644
--- a/companiondevice/src/com/google/android/companiondevicesupport/OobAssociationActivity.java
+++ b/companiondevice/src/com/google/android/companiondevicesupport/OobAssociationActivity.java
@@ -92,9 +92,10 @@ public class OobAssociationActivity extends FragmentActivity {
model =
new ViewModelProvider(
ViewModelStore::new,
- OobAssociatedDeviceViewModelFactory.getInstance(
+ new OobAssociatedDeviceViewModelFactory(
getApplication(),
- new OobEligibleDevice(deviceAddress, OobEligibleDevice.OOB_TYPE_BLUETOOTH)))
+ new OobEligibleDevice(deviceAddress, OobEligibleDevice.OOB_TYPE_BLUETOOTH),
+ getResources().getBoolean(R.bool.enable_spp)))
.get(OobAssociatedDeviceViewModel.class);
model
diff --git a/companiondevice/src/com/google/android/companiondevicesupport/trust/TrustedDeviceActivity.java b/companiondevice/src/com/google/android/companiondevicesupport/trust/TrustedDeviceActivity.java
index ceaf934..01d567a 100644
--- a/companiondevice/src/com/google/android/companiondevicesupport/trust/TrustedDeviceActivity.java
+++ b/companiondevice/src/com/google/android/companiondevicesupport/trust/TrustedDeviceActivity.java
@@ -25,15 +25,10 @@ import static com.google.android.connecteddevice.util.SafeLog.logw;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.KeyguardManager;
-import androidx.lifecycle.ViewModelProviders;
-import android.content.ComponentName;
-import android.content.Context;
+import androidx.lifecycle.ViewModelProvider;
import android.content.DialogInterface;
import android.content.Intent;
-import android.content.ServiceConnection;
import android.os.Bundle;
-import android.os.IBinder;
-import android.os.RemoteException;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentActivity;
import android.text.Html;
@@ -42,17 +37,11 @@ import android.widget.Toast;
import androidx.annotation.Nullable;
import com.google.android.companiondevicesupport.R;
import com.google.android.companiondevicesupport.ui.Toolbar;
-import com.google.android.connecteddevice.api.IDeviceAssociationCallback;
import com.google.android.connecteddevice.model.AssociatedDevice;
-import com.google.android.connecteddevice.model.ConnectedDevice;
import com.google.android.connecteddevice.trust.TrustedDeviceConstants;
-import com.google.android.connecteddevice.trust.TrustedDeviceManagerService;
import com.google.android.connecteddevice.trust.TrustedDeviceViewModel;
-import com.google.android.connecteddevice.trust.api.ITrustedDeviceCallback;
-import com.google.android.connecteddevice.trust.api.ITrustedDeviceEnrollmentCallback;
-import com.google.android.connecteddevice.trust.api.ITrustedDeviceManager;
+import com.google.android.connecteddevice.trust.TrustedDeviceViewModel.EnrollmentState;
import com.google.android.connecteddevice.trust.api.TrustedDevice;
-import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
/** Activity for enrolling and viewing trusted devices. */
@@ -88,8 +77,6 @@ public class TrustedDeviceActivity extends FragmentActivity {
private final AtomicBoolean isStartedForEnrollment = new AtomicBoolean(false);
- private final AtomicBoolean hasPendingCredential = new AtomicBoolean(false);
-
/**
* {@code true} if this activity is relaunched for enrollment and the activity needs to be
* finished after enrollment has completed.
@@ -98,8 +85,6 @@ public class TrustedDeviceActivity extends FragmentActivity {
private KeyguardManager keyguardManager;
- private ITrustedDeviceManager trustedDeviceManager;
-
private Toolbar toolbar;
private TrustedDeviceViewModel model;
@@ -116,12 +101,11 @@ public class TrustedDeviceActivity extends FragmentActivity {
toolbar.showProgressBar();
toolbar.setOnBackButtonClickListener(v -> finish());
+ extractAssociatedDevice();
+
isScreenLockNewlyCreated.set(false);
isStartedForEnrollment.set(false);
- hasPendingCredential.set(false);
wasRelaunched.set(false);
- Intent intent = new Intent(this, TrustedDeviceManagerService.class);
- bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
}
@Override
@@ -132,7 +116,7 @@ public class TrustedDeviceActivity extends FragmentActivity {
case ACTIVATE_TOKEN_REQUEST_CODE:
if (resultCode != RESULT_OK) {
loge(TAG, "Lock screen was unsuccessful. Returned result code: " + resultCode + ".");
- finishEnrollment();
+ model.finishEnrollment();
return;
}
logd(TAG, "Credentials accepted. Waiting for TrustAgent to activate " + "token.");
@@ -143,24 +127,11 @@ public class TrustedDeviceActivity extends FragmentActivity {
isScreenLockNewlyCreated.set(false);
return;
}
-
- if (hasPendingCredential.get()) {
- showUnlockProfileDialogFragment();
- }
+ isScreenLockNewlyCreated.set(true);
+ model.processEnrollment();
break;
case RETRIEVE_ASSOCIATED_DEVICE_REQUEST_CODE:
- AssociatedDevice device = data.getParcelableExtra(ASSOCIATED_DEVICE_DATA_NAME_EXTRA);
- if (device == null) {
- loge(TAG, "No valid associated device.");
- return;
- }
- model.setAssociatedDevice(device);
- Intent incomingIntent = getIntent();
- if (isStartedForEnrollment(incomingIntent)) {
- processEnrollment();
- return;
- }
- showTrustedDeviceDetailFragment(device);
+ onAssociatedDeviceRetrieved(data);
break;
default:
logw(TAG, "Unrecognized activity result. Request code: " + requestCode + ". Ignoring.");
@@ -173,21 +144,10 @@ public class TrustedDeviceActivity extends FragmentActivity {
super.onNewIntent(intent);
wasRelaunched.set(true);
if (isStartedForEnrollment(intent)) {
- processEnrollment();
+ model.processEnrollment();
}
}
- @Override
- protected void onDestroy() {
- try {
- unregisterCallbacks();
- } catch (RemoteException e) {
- loge(TAG, "Error while disconnecting from service.", e);
- }
- unbindService(serviceConnection);
- super.onDestroy();
- }
-
private void resumePreviousState(Bundle saveInstanceState) {
if (saveInstanceState == null) {
return;
@@ -208,106 +168,86 @@ public class TrustedDeviceActivity extends FragmentActivity {
}
private void observeViewModel() {
- model = ViewModelProviders.of(this).get(TrustedDeviceViewModel.class);
+ model = new ViewModelProvider(this).get(TrustedDeviceViewModel.class);
+ model.getAssociatedDevice().observe(this, this::onAssociatedDeviceEnrolled);
+ model.getEnrollmentError().observe(this, this::onEnrollmentError);
+
+ model.getEnrollmentState().observe(this, this::onEnrollmentStateChanged);
+
model
- .getDeviceToDisable()
- .observe(
- this,
- trustedDevice -> {
- if (trustedDevice == null) {
- return;
- }
- model.setDeviceToDisable(null);
- if (trustedDeviceManager == null) {
- loge(TAG, "Failed to remove trusted device. service not connected.");
- return;
- }
- try {
- logd(TAG, "calling removeTrustedDevice");
- trustedDeviceManager.removeTrustedDevice(trustedDevice);
- } catch (RemoteException e) {
- loge(TAG, "Failed to remove trusted device.", e);
- }
- });
+ .getEnabledDevice()
+ .observe(this, device -> runOnUiThread(() -> showEnrollmentSuccessToast(device)));
model
- .getDeviceToEnable()
+ .isCurrentAssociatedDeviceRemoved()
.observe(
this,
- associatedDevice -> {
- if (associatedDevice == null) {
- return;
+ isFinished -> {
+ if (isFinished) {
+ finish();
}
- model.setDeviceToEnable(null);
- attemptInitiatingEnrollment(associatedDevice);
});
}
- private boolean hasAssociatedDevice() {
- Intent intent = getIntent();
- String action = intent.getAction();
- if (!TrustedDeviceConstants.INTENT_ACTION_TRUSTED_DEVICE_SETTING.equals(action)) {
- return false;
- }
- AssociatedDevice device = intent.getParcelableExtra(ASSOCIATED_DEVICE_DATA_NAME_EXTRA);
+ private void onAssociatedDeviceEnrolled(AssociatedDevice device) {
if (device == null) {
- loge(TAG, "No valid associated device.");
- return false;
+ return;
}
- model.setAssociatedDevice(device);
showTrustedDeviceDetailFragment(device);
- return true;
+ Intent incomingIntent = getIntent();
+ if (isStartedForEnrollment(incomingIntent)) {
+ model.processEnrollment();
+ }
}
- private void attemptInitiatingEnrollment(AssociatedDevice device) {
- if (!isCompanionDeviceConnected(device.getDeviceId())) {
- DeviceNotConnectedDialogFragment fragment = new DeviceNotConnectedDialogFragment();
- fragment.show(getSupportFragmentManager(), DEVICE_NOT_CONNECTED_DIALOG_TAG);
- return;
- }
- try {
- trustedDeviceManager.initiateEnrollment(device.getDeviceId());
- } catch (RemoteException e) {
- loge(TAG, "Failed to initiate enrollment. ", e);
+ private void onEnrollmentError(Integer error) {
+ if (error != null) {
+ runOnUiThread(() -> showEnrollmentErrorDialogFragment(error));
}
}
- private boolean isCompanionDeviceConnected(String deviceId) {
- if (trustedDeviceManager == null) {
- loge(
- TAG,
- "Failed to check connection status for device: " + deviceId + "Service not connected.");
- return false;
- }
- List<ConnectedDevice> devices = null;
- try {
- devices = trustedDeviceManager.getActiveUserConnectedDevices();
- } catch (RemoteException e) {
- loge(TAG, "Failed to check connection status for device: " + deviceId, e);
- return false;
+ private void onEnrollmentStateChanged(EnrollmentState state) {
+ logd(TAG, "new enrollment state: " + state.name());
+ switch (state) {
+ case WAITING_FOR_PASSWORD_SETUP:
+ runOnUiThread(this::promptToCreatePassword);
+ break;
+ case NO_CONNECTION:
+ runOnUiThread(this::showDeviceNotConnectedDialog);
+ break;
+ case CREDENTIAL_PENDING:
+ validateCredentials();
+ break;
+ case FINISHED:
+ model.resetEnrollmentState();
+ finishEnrollment();
+ break;
+ default:
+ break;
}
- if (devices == null || devices.isEmpty()) {
- return false;
+ }
+
+ private void extractAssociatedDevice() {
+ Intent intent = getIntent();
+ String action = intent.getAction();
+ if (!TrustedDeviceConstants.INTENT_ACTION_TRUSTED_DEVICE_SETTING.equals(action)) {
+ retrieveAssociatedDevice();
+ return;
}
- for (ConnectedDevice device : devices) {
- if (device.getDeviceId().equals(deviceId)) {
- return true;
- }
+ AssociatedDevice device = intent.getParcelableExtra(ASSOCIATED_DEVICE_DATA_NAME_EXTRA);
+ if (device == null) {
+ logd(TAG, "Failed to extract associated device intent, start retrieving associated device.");
+ retrieveAssociatedDevice();
+ return;
}
- return false;
+ model.setAssociatedDevice(device);
}
private void validateCredentials() {
- logd(TAG, "Validating credentials to activate token.");
KeyguardManager keyguardManager = getKeyguardManager();
if (keyguardManager == null) {
logd(TAG, "KeyguardManager was null. Aborting.");
return;
}
- if (!isStartedForEnrollment.get()) {
- hasPendingCredential.set(true);
- logd(TAG, "Activity not started for enrollment. Credentials are pending.");
- return;
- }
if (isScreenLockNewlyCreated.get()) {
showUnlockProfileDialogFragment();
return;
@@ -320,21 +260,10 @@ public class TrustedDeviceActivity extends FragmentActivity {
loge(TAG, "User either has no lock screen, or a token is already registered.");
return;
}
- hasPendingCredential.set(false);
- isStartedForEnrollment.set(false);
logd(TAG, "Prompting user to validate credentials.");
startActivityForResult(confirmIntent, ACTIVATE_TOKEN_REQUEST_CODE);
}
- private void processEnrollment() {
- isStartedForEnrollment.set(true);
- if (hasPendingCredential.get()) {
- validateCredentials();
- return;
- }
- maybePromptToCreatePassword();
- }
-
private static boolean isStartedForEnrollment(Intent intent) {
return intent != null
&& intent.getBooleanExtra(TrustedDeviceConstants.INTENT_EXTRA_ENROLL_NEW_TOKEN, false);
@@ -348,11 +277,10 @@ public class TrustedDeviceActivity extends FragmentActivity {
}
}
- private void maybePromptToCreatePassword() {
+ private void promptToCreatePassword() {
if (isDeviceSecure()) {
return;
}
-
CreateProfileLockDialogFragment fragment =
CreateProfileLockDialogFragment.newInstance((d, w) -> createScreenLock());
fragment.show(getSupportFragmentManager(), CREATE_PROFILE_LOCK_DIALOG_TAG);
@@ -364,7 +292,6 @@ public class TrustedDeviceActivity extends FragmentActivity {
}
logd(TAG, "User has not set a lock screen. Redirecting to set up.");
Intent intent = new Intent(ACTION_LOCK_SETTINGS);
- isScreenLockNewlyCreated.set(true);
startActivityForResult(intent, CREATE_LOCK_REQUEST_CODE);
}
@@ -397,7 +324,15 @@ public class TrustedDeviceActivity extends FragmentActivity {
fragment.show(getSupportFragmentManager(), UNLOCK_PROFILE_TO_FINISH_DIALOG_TAG);
}
+ private void showDeviceNotConnectedDialog() {
+ DeviceNotConnectedDialogFragment fragment = new DeviceNotConnectedDialogFragment();
+ fragment.show(getSupportFragmentManager(), DEVICE_NOT_CONNECTED_DIALOG_TAG);
+ }
+
private void showEnrollmentSuccessToast(TrustedDevice device) {
+ if (device == null) {
+ return;
+ }
AssociatedDevice addedDevice = model.getAssociatedDevice().getValue();
if (addedDevice == null) {
loge(TAG, "No associated device retrieved when a trusted device has been added.");
@@ -434,90 +369,6 @@ public class TrustedDeviceActivity extends FragmentActivity {
}
}
- private void registerCallbacks() throws RemoteException {
- if (trustedDeviceManager == null) {
- loge(TAG, "Server not connected when attempting to register callbacks.");
- return;
- }
- trustedDeviceManager.registerTrustedDeviceEnrollmentCallback(trustedDeviceEnrollmentCallback);
- trustedDeviceManager.registerTrustedDeviceCallback(trustedDeviceCallback);
- trustedDeviceManager.registerAssociatedDeviceCallback(deviceAssociationCallback);
- }
-
- private void unregisterCallbacks() throws RemoteException {
- if (trustedDeviceManager == null) {
- loge(TAG, "Server not connected when attempting to unregister callbacks.");
- return;
- }
- trustedDeviceManager.unregisterTrustedDeviceEnrollmentCallback(
- trustedDeviceEnrollmentCallback);
- trustedDeviceManager.unregisterTrustedDeviceCallback(trustedDeviceCallback);
- trustedDeviceManager.unregisterAssociatedDeviceCallback(deviceAssociationCallback);
- }
-
- private final ServiceConnection serviceConnection =
- new ServiceConnection() {
- @Override
- public void onServiceConnected(ComponentName name, IBinder service) {
- trustedDeviceManager = ITrustedDeviceManager.Stub.asInterface(service);
- try {
- registerCallbacks();
- } catch (RemoteException e) {
- loge(TAG, "Error while connecting to service.");
- return;
- }
-
- model.updateTrustedDevices(trustedDeviceManager);
-
- logd(TAG, "Successfully connected to TrustedDeviceManager.");
-
- if (!hasAssociatedDevice()) {
- retrieveAssociatedDevice();
- }
- }
-
- @Override
- public void onServiceDisconnected(ComponentName name) {}
- };
-
- private final ITrustedDeviceCallback trustedDeviceCallback =
- new ITrustedDeviceCallback.Stub() {
- @Override
- public void onTrustedDeviceAdded(TrustedDevice device) {
- logd(TAG, "Added trusted device: " + device.getDeviceId() + ".");
- model.setEnabledDevice(device);
- showEnrollmentSuccessToast(device);
- finishEnrollment();
- }
-
- @Override
- public void onTrustedDeviceRemoved(TrustedDevice device) {
- logd(TAG, "Removed trusted device: " + device.getDeviceId() + ".");
- model.setDisabledDevice(device);
- }
- };
-
- private final IDeviceAssociationCallback deviceAssociationCallback =
- new IDeviceAssociationCallback.Stub() {
- @Override
- public void onAssociatedDeviceAdded(AssociatedDevice device) {}
-
- @Override
- public void onAssociatedDeviceRemoved(AssociatedDevice device) {
- AssociatedDevice currentDevice = model.getAssociatedDevice().getValue();
- if (device.equals(currentDevice)) {
- finish();
- }
- }
-
- @Override
- public void onAssociatedDeviceUpdated(AssociatedDevice device) {
- if (device != null) {
- model.setAssociatedDevice(device);
- }
- }
- };
-
@Nullable
private KeyguardManager getKeyguardManager() {
if (keyguardManager == null) {
@@ -529,20 +380,21 @@ public class TrustedDeviceActivity extends FragmentActivity {
return keyguardManager;
}
- private final ITrustedDeviceEnrollmentCallback trustedDeviceEnrollmentCallback =
- new ITrustedDeviceEnrollmentCallback.Stub() {
-
- @Override
- public void onValidateCredentialsRequest() {
- validateCredentials();
- }
-
- @Override
- public void onTrustedDeviceEnrollmentError(int error) {
- loge(TAG, "Failed to enroll trusted device, encountered error: " + error + ".");
- showEnrollmentErrorDialogFragment(error);
- }
- };
+ private void onAssociatedDeviceRetrieved(Intent data) {
+ if (data == null) {
+ loge(TAG, "Intent is null. Failed to extract associated device from intent.");
+ finish();
+ return;
+ }
+ AssociatedDevice device = data.getParcelableExtra(ASSOCIATED_DEVICE_DATA_NAME_EXTRA);
+ if (device == null) {
+ loge(TAG, "Associated device extracted from intent is null.");
+ finish();
+ return;
+ }
+ model.setAssociatedDevice(device);
+ logd(TAG, "on associated device retrieved from association activity: " + device);
+ }
/** Dialog Fragment to notify that the device is not actively connected. */
public static class DeviceNotConnectedDialogFragment extends DialogFragment {
diff --git a/companiondevice/src/com/google/android/companiondevicesupport/trust/TrustedDeviceDetailFragment.java b/companiondevice/src/com/google/android/companiondevicesupport/trust/TrustedDeviceDetailFragment.java
index 758e5f6..1461187 100644
--- a/companiondevice/src/com/google/android/companiondevicesupport/trust/TrustedDeviceDetailFragment.java
+++ b/companiondevice/src/com/google/android/companiondevicesupport/trust/TrustedDeviceDetailFragment.java
@@ -18,7 +18,7 @@ package com.google.android.companiondevicesupport.trust;
import static com.google.android.connecteddevice.util.SafeLog.loge;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import android.text.Html;
@@ -70,19 +70,19 @@ public class TrustedDeviceDetailFragment extends Fragment {
associatedDevice = bundle.getParcelable(ASSOCIATED_DEVICE_KEY);
trustedDeviceTitle = view.findViewById(R.id.trusted_device_item_title);
setTrustedDeviceTitle();
- model = ViewModelProviders.of(requireActivity()).get(TrustedDeviceViewModel.class);
+ model = new ViewModelProvider(requireActivity()).get(TrustedDeviceViewModel.class);
trustedDeviceSwitch = view.findViewById(R.id.trusted_device_switch);
trustedDeviceSwitch.setOnCheckedChangeListener(
(buttonView, isChecked) -> {
if (isChecked && trustedDevice == null) {
// When the current device has not been enrolled as trusted device, turning on the
// switch is for enrolling the current device.
- model.setDeviceToEnable(associatedDevice);
+ model.enrollTrustedDevice(associatedDevice);
trustedDeviceSwitch.setChecked(false);
} else if (!isChecked && trustedDevice != null) {
// When the current device has been enrolled as trusted device, turning off the
// switch is for disable trusted device feature for the current device.
- model.setDeviceToDisable(trustedDevice);
+ model.disableTrustedDevice(trustedDevice);
trustedDeviceSwitch.setChecked(true);
}
// Ignore other conditions as {@link Switch#setChecked(boolean)} will always trigger
diff --git a/libs/companionprotos/src/capabilities_exchange.proto b/libs/companionprotos/src/capabilities_exchange.proto
new file mode 100644
index 0000000..d3e285a
--- /dev/null
+++ b/libs/companionprotos/src/capabilities_exchange.proto
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto3";
+
+package com.google.android.companionprotos;
+
+option java_package = "com.google.android.companionprotos";
+option java_outer_classname = "CapabilitiesExchangeProto";
+
+message CapabilitiesExchange {
+
+ enum OobChannel {
+ // The OOB channel is unknown.
+ //
+ // Note, this enum name is prefixed. See
+ // go/proto-best-practices-checkers#enum-default-value-name-conflict
+ OOB_CHANNEL_UNKNOWN = 0;
+
+ // Bluetooth RFCOMM OOB channel
+ BT_RFCOMM = 1;
+ }
+
+ // All supported OOB channels
+ repeated OobChannel supported_oob_channels = 1;
+
+}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/ConnectedDeviceManager.java b/libs/connecteddevice/src/com/google/android/connecteddevice/ConnectedDeviceManager.java
index 6224321..ef5a34a 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/ConnectedDeviceManager.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/ConnectedDeviceManager.java
@@ -34,6 +34,7 @@ import com.google.android.connecteddevice.oob.BluetoothRfcommChannel;
import com.google.android.connecteddevice.oob.OobChannel;
import com.google.android.connecteddevice.storage.ConnectedDeviceStorage;
import com.google.android.connecteddevice.storage.ConnectedDeviceStorage.AssociatedDeviceCallback;
+import com.google.android.connecteddevice.storage.ConnectedDeviceStorage.OnAssociatedDevicesRetrievedListener;
import com.google.android.connecteddevice.transport.spp.ConnectedDeviceSppDelegateBinder;
import com.google.android.connecteddevice.util.ByteUtils;
import com.google.android.connecteddevice.util.EventLog;
@@ -52,6 +53,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
/** Manager of devices connected to the car. */
+@SuppressWarnings("AndroidConcurrentHashMap") // Targeting sdk version 29
public class ConnectedDeviceManager {
private static final String TAG = "ConnectedDeviceManager";
@@ -78,6 +80,8 @@ public class ConnectedDeviceManager {
*/
private final Executor connectionExecutor;
+ private final Executor storageExecutor;
+
private final ThreadSafeCallbacks<DeviceAssociationCallback> deviceAssociationCallbacks =
new ThreadSafeCallbacks<>();
@@ -125,6 +129,7 @@ public class ConnectedDeviceManager {
storage,
sppDelegateBinder,
Executors.newCachedThreadPool(),
+ Executors.newSingleThreadExecutor(),
Executors.newSingleThreadExecutor());
}
@@ -134,13 +139,15 @@ public class ConnectedDeviceManager {
@NonNull ConnectedDeviceStorage storage,
@NonNull ConnectedDeviceSppDelegateBinder sppDelegateBinder,
@NonNull Executor connectionExecutor,
- @NonNull Executor callbackExecutor) {
+ @NonNull Executor callbackExecutor,
+ @NonNull Executor storageExecutor) {
this.storage = storage;
this.carBluetoothManager = carBluetoothManager;
this.connectionExecutor = connectionExecutor;
this.carBluetoothManager.registerCallback(generateCarManagerCallback(), callbackExecutor);
this.storage.setAssociatedDeviceCallback(associatedDeviceCallback);
this.sppDelegateBinder = sppDelegateBinder;
+ this.storageExecutor = storageExecutor;
}
/**
@@ -339,13 +346,11 @@ public class ConnectedDeviceManager {
}
/**
- * Get a list of associated devices for the given user.
- *
- * @return Associated device list.
+ * Retrieves devices associated with the active user and notifies the given {@link
+ * OnAssociatedDevicesRetrievedListener}.
*/
- @NonNull
- public List<AssociatedDevice> getActiveUserAssociatedDevices() {
- return storage.getActiveUserAssociatedDevices();
+ public void retrieveActiveUserAssociatedDevices(OnAssociatedDevicesRetrievedListener listener) {
+ storageExecutor.execute(() -> storage.retrieveForActiveUserAssociatedDevice(listener));
}
/** Notify that the user has accepted a pairing code or any out-of-band confirmation. */
@@ -359,31 +364,36 @@ public class ConnectedDeviceManager {
* @param deviceId Device identifier.
*/
public void removeActiveUserAssociatedDevice(@NonNull String deviceId) {
- storage.removeAssociatedDeviceForActiveUser(deviceId);
+ storageExecutor.execute(() -> storage.removeAssociatedDeviceForActiveUser(deviceId));
disconnectDevice(deviceId);
}
/**
* Enable connection on an associated device.
- *
* @param deviceId Device identifier.
*/
public void enableAssociatedDeviceConnection(@NonNull String deviceId) {
logd(TAG, "enableAssociatedDeviceConnection() called on " + deviceId);
- storage.updateAssociatedDeviceConnectionEnabled(deviceId, /* isConnectionEnabled= */ true);
-
- connectToActiveUserDevice();
+ storageExecutor.execute(
+ () -> {
+ storage.updateAssociatedDeviceConnectionEnabled(
+ deviceId, /* isConnectionEnabled= */ true);
+ connectToActiveUserDevice();
+ });
}
/**
* Disable connection on an associated device.
- *
* @param deviceId Device identifier.
*/
public void disableAssociatedDeviceConnection(@NonNull String deviceId) {
logd(TAG, "disableAssociatedDeviceConnection() called on " + deviceId);
- storage.updateAssociatedDeviceConnectionEnabled(deviceId, /* isConnectionEnabled= */ false);
- disconnectDevice(deviceId);
+ storageExecutor.execute(
+ () -> {
+ storage.updateAssociatedDeviceConnectionEnabled(
+ deviceId, /* isConnectionEnabled= */ false);
+ disconnectDevice(deviceId);
+ });
}
private void disconnectDevice(String deviceId) {
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/api/IAssociatedDeviceManager.aidl b/libs/connecteddevice/src/com/google/android/connecteddevice/api/IAssociatedDeviceManager.aidl
index 545998c..9304ea1 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/api/IAssociatedDeviceManager.aidl
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/api/IAssociatedDeviceManager.aidl
@@ -19,6 +19,7 @@ package com.google.android.connecteddevice.api;
import com.google.android.connecteddevice.api.IAssociationCallback;
import com.google.android.connecteddevice.api.IConnectionCallback;
import com.google.android.connecteddevice.api.IDeviceAssociationCallback;
+import com.google.android.connecteddevice.api.IOnAssociatedDevicesRetrievedListener;
import com.google.android.connecteddevice.model.AssociatedDevice;
import com.google.android.connecteddevice.model.ConnectedDevice;
import com.google.android.connecteddevice.model.OobEligibleDevice;
@@ -45,12 +46,12 @@ interface IAssociatedDeviceManager {
void stopAssociation();
/**
- * Returns a {@link List<AssociatedDevice>} of devices associated with the
- * given user from the database.
+ * Retrieves the devices associated with the active user from the database.
*
- * <p>Cannot be called on the main thread.
+ * @param listener {@link IOnAssociatedDevicesRetrievedListener} that will
+ * be notified when the associated devices are retrieved.
*/
- List<AssociatedDevice> getActiveUserAssociatedDevices();
+ void retrievedActiveUserAssociatedDevices(in IOnAssociatedDevicesRetrievedListener listener);
/** Confirms the paring code. */
void acceptVerification();
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/api/IOnAssociatedDevicesRetrievedListener.aidl b/libs/connecteddevice/src/com/google/android/connecteddevice/api/IOnAssociatedDevicesRetrievedListener.aidl
new file mode 100644
index 0000000..1a42a17
--- /dev/null
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/api/IOnAssociatedDevicesRetrievedListener.aidl
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.connecteddevice.api;
+
+import com.google.android.connecteddevice.model.AssociatedDevice;
+
+/** Listener for retrieving devices associated with the active user. */
+oneway interface IOnAssociatedDevicesRetrievedListener {
+ /** Triggered when the devices associated with the active user are retrieved. */
+ void onAssociatedDevicesRetrieved(in List<AssociatedDevice> devices);
+}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/CalendarSyncFeature2.java b/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/CalendarSyncFeature2.java
index a585ae0..ebc8fc4 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/CalendarSyncFeature2.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/CalendarSyncFeature2.java
@@ -8,8 +8,12 @@ import static java.lang.String.format;
import android.content.Context;
import android.os.ParcelUuid;
+import androidx.annotation.VisibleForTesting;
import com.google.android.connecteddevice.api.RemoteFeature;
+import com.google.android.connecteddevice.calendarsync.android.CalendarSyncAccess;
+import com.google.android.connecteddevice.calendarsync.common.Logger;
import com.google.android.connecteddevice.model.ConnectedDevice;
+import com.google.android.connecteddevice.util.SafeLog;
/** A {@link RemoteFeature} that handles synchronizing calendar data with another device. */
final class CalendarSyncFeature2 extends RemoteFeature {
@@ -17,21 +21,38 @@ final class CalendarSyncFeature2 extends RemoteFeature {
private static final String TAG = "CalendarSyncFeature2";
private static final ParcelUuid FEATURE_ID =
ParcelUuid.fromString("5a1a16fd-1ebd-4dbe-bfa7-37e40de0fd80");
+ private final CalendarSyncAccess calendarSyncAccess;
+ /**
+ * Creates a {@link CalendarSyncFeature2} and creates all dependencies. This takes the role of
+ * injecting dependencies to the constructor below.
+ */
CalendarSyncFeature2(Context context) {
+ this(context, new CalendarSyncAccess(new ConnectedDeviceLoggerFactory()));
+ }
+
+ /**
+ * Creates a {@link CalendarSyncFeature2} and accepts all dependencies. This allows tests to
+ * replace dependencies with mocks.
+ */
+ @VisibleForTesting
+ CalendarSyncFeature2(Context context, CalendarSyncAccess calendarSyncAccess) {
super(context, FEATURE_ID);
+ this.calendarSyncAccess = calendarSyncAccess;
}
@Override
public void start() {
- logd(TAG, "Starting");
super.start();
+ logd(TAG, "Starting");
+ calendarSyncAccess.start();
}
@Override
public void stop() {
- logd(TAG, "Stopping");
super.stop();
+ logd(TAG, "Stopping");
+ calendarSyncAccess.stop();
}
@Override
@@ -40,7 +61,7 @@ final class CalendarSyncFeature2 extends RemoteFeature {
logw(TAG, "Ignoring insecure message from " + device.getDeviceName());
return;
}
- logi(TAG, "Received message from " + device.getDeviceName());
+ calendarSyncAccess.access(sync -> sync.receive(device.getDeviceId(), message));
}
@Override
@@ -50,6 +71,39 @@ final class CalendarSyncFeature2 extends RemoteFeature {
@Override
protected void onDeviceDisconnected(ConnectedDevice device) {
- logi(TAG, format("Device %s disconnected", device.getDeviceName()));
+ calendarSyncAccess.access((sync) -> sync.clear(device.getDeviceId()));
+ }
+
+ /** A factory for {@link Logger}s that uses the connecteddevice {@link SafeLog}. */
+ private static class ConnectedDeviceLoggerFactory implements Logger.Factory {
+ @Override
+ public Logger create(String tag) {
+ return new Logger() {
+ @Override
+ public void debug(String message) {
+ logd(tag, message);
+ }
+
+ @Override
+ public void info(String message) {
+ logi(tag, message);
+ }
+
+ @Override
+ public void warn(String message) {
+ logw(tag, message);
+ }
+
+ @Override
+ public void error(String message) {
+ loge(tag, message);
+ }
+
+ @Override
+ public void error(String message, Exception e) {
+ loge(tag, message, e);
+ }
+ };
+ }
}
}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/CalendarSyncService.java b/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/CalendarSyncService.java
index 06c9cd0..a241204 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/CalendarSyncService.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/CalendarSyncService.java
@@ -16,14 +16,21 @@
package com.google.android.connecteddevice.calendarsync;
+import static com.google.android.connecteddevice.util.SafeLog.logi;
+
import android.app.Service;
import android.content.Intent;
import android.os.IBinder;
+import android.os.StrictMode;
+import android.util.Log;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
/** Early start service that provides the Calendar Sync feature to the foreground user. */
public final class CalendarSyncService extends Service {
+
+ private static final String TAG = "CalendarSyncService";
+
/**
* A flag that controls whether the new bi-directional sync implementation is used. The value
* should only by changed by tests before the service is created.
@@ -55,11 +62,24 @@ public final class CalendarSyncService extends Service {
public void onCreate() {
super.onCreate();
if (enableBidirectionalSync) {
+ logi(TAG, "Creating CalendarSyncFeature2");
calendarSyncFeature = new CalendarSyncFeature2(getApplicationContext());
calendarSyncFeature.start();
} else {
+ logi(TAG, "Creating CalendarSyncManager");
calendarSyncManager = new CalendarSyncManager(getApplicationContext());
}
+
+ // TODO(b/177819109) This setting is global and should be enabled in Application.onCreate().
+ // Enable StrictMode globally when debug logging is enabled.
+ if (Log.isLoggable(TAG, Log.DEBUG)) {
+ // Settings for the current (main) thread.
+ StrictMode.setThreadPolicy(
+ new StrictMode.ThreadPolicy.Builder().detectAll().penaltyDialog().build());
+
+ // Settings for the entire application process.
+ StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder().detectAll().penaltyDeath().build());
+ }
}
@Override
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/android/CalendarSyncAccess.java b/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/android/CalendarSyncAccess.java
new file mode 100644
index 0000000..9ff62ac
--- /dev/null
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/android/CalendarSyncAccess.java
@@ -0,0 +1,88 @@
+package com.google.android.connecteddevice.calendarsync.android;
+
+import static com.google.common.base.Preconditions.checkState;
+
+import android.os.Handler;
+import android.os.HandlerThread;
+import androidx.annotation.Nullable;
+import com.google.android.connecteddevice.calendarsync.common.CalendarSync;
+import com.google.android.connecteddevice.calendarsync.common.Logger;
+import java.util.function.Consumer;
+
+/**
+ * Allows access to a {@link CalendarSync} on a background handler thread.
+ *
+ * <p>Manages starting and stopping the handler thread.
+ *
+ * <p>This is used from both Android implementations: the phone and the car.
+ */
+public class CalendarSyncAccess {
+ private static final String TAG = "CalendarSyncAccess";
+
+ private final Logger.Factory loggerFactory;
+ private final Logger logger;
+
+ @Nullable private HandlerThread backgroundHandlerThread;
+ @Nullable private Handler handler;
+ @Nullable private CalendarSync sync;
+
+ public CalendarSyncAccess(Logger.Factory loggerFactory) {
+ this.loggerFactory = loggerFactory;
+ logger = loggerFactory.create(TAG);
+ }
+
+ /**
+ * Runs a task with the {@link CalendarSync} by posting on the background handler. Must be called
+ * after {@link #start()}
+ */
+ public void access(Consumer<CalendarSync> task) {
+ checkState(sync != null, "Must call start() first");
+ handler.post(
+ () -> {
+ try {
+ task.accept(sync);
+ } catch (RuntimeException e) {
+ // Catch and log exceptions without crashing the background thread.
+ logger.error("Caught exception on calendar access thread", e);
+ }
+ });
+ }
+
+ /** Returns true when the background thread is started after calling {@link #start()}. */
+ public boolean isStarted() {
+ return sync != null;
+ }
+
+ /**
+ * Start the background handler thread and creates the {@link CalendarSync}. Must be called before
+ * calling {@link #access(Consumer)}. This calls {@link CalendarSync#start()} on the background
+ * handler.
+ */
+ public void start() {
+ if (sync == null) {
+ backgroundHandlerThread = new HandlerThread(TAG);
+ backgroundHandlerThread.start();
+ handler = new Handler(backgroundHandlerThread.getLooper());
+ sync = new CalendarSync(loggerFactory);
+ handler.post(sync::start);
+ } else {
+ logger.error("start() was called multiple times without calling stop() first.");
+ }
+ }
+
+ /**
+ * Stops the background handler thread and releases the {@link CalendarSync}. This calls {@link
+ * CalendarSync#stop()} on the background handler.
+ */
+ public void stop() {
+ if (sync != null) {
+ sync.stop();
+ sync = null;
+ backgroundHandlerThread.quitSafely();
+ backgroundHandlerThread = null;
+ handler = null;
+ } else {
+ logger.error("stop() was called without calling start() first.");
+ }
+ }
+}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/common/CalendarSync.java b/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/common/CalendarSync.java
new file mode 100644
index 0000000..c32b809
--- /dev/null
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/common/CalendarSync.java
@@ -0,0 +1,88 @@
+package com.google.android.connecteddevice.calendarsync.common;
+
+import java.util.Set;
+
+/**
+ * Synchronizes calendar data from the <a
+ * href="https://developer.android.com/guide/topics/providers/calendar-provider">calendar
+ * provider</a> on this device with remote devices.
+ *
+ * <p>Each remote device has a <i>time window</i> for events that will be observed for changes.
+ * Changes to events outside of that window will be ignored.
+ *
+ * <p>If the calendar synchronization is initiated on this device by calling {@link #sync(String,
+ * Set)} then it is considered the <i>source</i> calendar. Otherwise the calendar is received from
+ * the remote device and it is considered the <i>replica</i>.
+ *
+ * <p>Early versions of this feature do not support sending calendar changes in both directions but
+ * have a <i>sender</i> and a <i>receiver</i>. This version supports sending and receiving
+ * incremental updates to calendars.
+ *
+ * <p>For backwards compatibility this class supports two modes depending on the version of the
+ * remote device feature:
+ *
+ * <ol>
+ * <li><b>Replace mode for legacy remote devices</b>
+ * <p>When a remote device does not support updates this device will send or receive the full
+ * calendar data when there is any change to the synchronized calendars.
+ * <li><b>Update mode</b>
+ * <p>When a remote device does support updates this device will send and receive incremental
+ * updates to synchronized calendars.
+ * </ol>
+ *
+ * The initial message to a remote device always assumes the receiver is a legacy device. Only after
+ * receiving a message from the remote device can it know the version. This is fine because the
+ * first message will always contain the full source calendar data. Upon receiving the first message
+ * the version is updated and subsequent changes may be sent as updates.
+ *
+ * <p>This class is not thread-safe and after construction should only be accessed by a single
+ * non-main thread.
+ */
+// TODO(b/166134901) Work in progress - complete the features documented above.
+@SuppressWarnings("unused")
+public class CalendarSync {
+ private static final String TAG = "CalendarSync";
+ private static final int PROTOCOL_VERSION = 1;
+ private static final int UPDATABLE_VERSION = 1;
+
+ private final Logger logger;
+
+ public CalendarSync(Logger.Factory loggerFactory) {
+ logger = loggerFactory.create(TAG);
+ }
+
+ /**
+ * Sets the ids of local calendars to synchronize to the given receiver device.
+ *
+ * <p>This device is the 'source' of the data and the remote device stores the 'replica'. The
+ * remote device will create a new calendar and act as the <a
+ * href="https://developer.android.com/guide/topics/providers/calendar-provider#sync-adapter">sync
+ * adapter</a>.
+ *
+ * <p>If the receiver supports updates then changes to the replica are sent back to the source.
+ */
+ public void sync(String deviceId, Set<String> calendarIds) {
+ logger.debug(String.format("Sync calendars %s with device %s", calendarIds, deviceId));
+ }
+
+ /** Receives a message from the remote device. */
+ public void receive(String deviceId, byte[] message) {
+ logger.debug(
+ String.format("Receive $s message of size %s from device %s", message.length, deviceId));
+ }
+
+ /** Clears all data for the given device. */
+ public void clear(String deviceId) {
+ logger.debug("Clear device " + deviceId);
+ }
+
+ /** Must be called before using the other methods of this class. */
+ public void start() {
+ logger.debug("Start");
+ }
+
+ /** Must be called when the synchronization will be stopped. */
+ public void stop() {
+ logger.debug("Stop");
+ }
+}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/common/Logger.java b/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/common/Logger.java
new file mode 100644
index 0000000..c443791
--- /dev/null
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/common/Logger.java
@@ -0,0 +1,51 @@
+package com.google.android.connecteddevice.calendarsync.common;
+
+/**
+ * An interface that allows platform specific logging implementations to be used in the common code.
+ */
+public interface Logger {
+
+ /** Logs a DEBUG level message. */
+ void debug(String message);
+
+ /** Logs an INFO level message. */
+ void info(String message);
+
+ /** Logs a WARN level message. */
+ void warn(String message);
+
+ /** Logs an ERROR level message. */
+ void error(String message);
+
+ /** Logs an ERROR level message with an exception. */
+ void error(String message, Exception e);
+
+ /** Creates a {@link Logger} with the given name. */
+ interface Factory {
+ Logger create(String name);
+ }
+
+ /** A no-op implementation for testing that does not log anything. */
+ class NoOpLoggerFactory implements Logger.Factory {
+ @Override
+ public Logger create(String name) {
+ return new Logger() {
+ @Override
+ public void debug(String message) {}
+
+ @Override
+ public void info(String message) {}
+
+ @Override
+ public void warn(String message) {}
+
+ @Override
+ public void error(String message) {}
+
+ @Override
+ public void error(String message, Exception e) {}
+ };
+ }
+ }
+ ;
+}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/common/package-info.java b/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/common/package-info.java
new file mode 100644
index 0000000..c4f7231
--- /dev/null
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/calendarsync/common/package-info.java
@@ -0,0 +1,5 @@
+// Shorten class names in generated Objective-C code.
+@ObjectiveCName("CS")
+package com.google.android.connecteddevice.calendarsync.common;
+
+import com.google.j2objc.annotations.ObjectiveCName;
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/connection/CarBluetoothManager.java b/libs/connecteddevice/src/com/google/android/connecteddevice/connection/CarBluetoothManager.java
index 2459932..930f759 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/connection/CarBluetoothManager.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/connection/CarBluetoothManager.java
@@ -26,8 +26,10 @@ import android.bluetooth.BluetoothGatt;
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import com.google.android.connecteddevice.model.AssociatedDevice;
import com.google.android.connecteddevice.oob.OobChannel;
+import com.google.android.connecteddevice.oob.OobConnectionManager;
import com.google.android.connecteddevice.storage.ConnectedDeviceStorage;
import com.google.android.connecteddevice.util.ThreadSafeCallbacks;
import java.util.UUID;
@@ -50,14 +52,19 @@ public abstract class CarBluetoothManager {
private final boolean isCompressionEnabled;
+ private final OobConnectionManager oobConnectionManager;
+
private String clientDeviceName;
private String clientDeviceAddress;
+ private AssociationCallback associationCallback;
+
protected CarBluetoothManager(
@NonNull ConnectedDeviceStorage connectedDeviceStorage, boolean enableCompression) {
storage = connectedDeviceStorage;
isCompressionEnabled = enableCompression;
+ oobConnectionManager = new OobConnectionManager();
}
/** Attempt to connect to device with provided id. */
@@ -82,20 +89,52 @@ public abstract class CarBluetoothManager {
@NonNull String nameForAssociation, @NonNull AssociationCallback callback);
/** Start the association with a new device using out of band verification code exchange */
- public abstract void startOutOfBandAssociation(
+ public void startOutOfBandAssociation(
@NonNull String nameForAssociation,
@NonNull OobChannel oobChannel,
- @NonNull AssociationCallback callback);
+ @NonNull AssociationCallback callback) {
+ logd(TAG, "Starting out of band association.");
+ startAssociation(
+ nameForAssociation,
+ new AssociationCallback() {
+ @Override
+ public void onAssociationStartSuccess(String deviceName) {
+ associationCallback = callback;
+ boolean success = oobConnectionManager.startOobExchange(oobChannel);
+ if (!success) {
+ callback.onAssociationStartFailure();
+ return;
+ }
+ callback.onAssociationStartSuccess(deviceName);
+ }
+
+ @Override
+ public void onAssociationStartFailure() {
+ callback.onAssociationStartFailure();
+ }
+ });
+ }
/** Disconnect the provided device from this manager. */
public abstract void disconnectDevice(@NonNull String deviceId);
+ /** Get current {@link OobConnectionManager}. */
+ @Nullable
+ @VisibleForTesting
+ public OobConnectionManager getOobConnectionManager() {
+ return oobConnectionManager;
+ }
+
/** Get current {@link AssociationCallback}. */
@Nullable
- public abstract AssociationCallback getAssociationCallback();
+ public AssociationCallback getAssociationCallback() {
+ return associationCallback;
+ }
/** Set current {@link AssociationCallback}. */
- public abstract void setAssociationCallback(@Nullable AssociationCallback callback);
+ public void setAssociationCallback(@Nullable AssociationCallback callback) {
+ this.associationCallback = callback;
+ }
/** Set the value of the client device name */
public void setClientDeviceName(String deviceName) {
@@ -181,6 +220,8 @@ public abstract class CarBluetoothManager {
clientDeviceAddress = null;
clientDeviceName = null;
connectedDevices.clear();
+ oobConnectionManager.reset();
+ associationCallback = null;
}
/** Notify that the user has accepted a pairing code or other out-of-band confirmation. */
@@ -311,7 +352,7 @@ public abstract class CarBluetoothManager {
protected final void disconnectWithError(@NonNull String errorMessage, @Nullable Exception e) {
loge(TAG, errorMessage, e);
if (isAssociating()) {
- getAssociationCallback().onAssociationError(DEVICE_ERROR_INVALID_HANDSHAKE);
+ associationCallback.onAssociationError(DEVICE_ERROR_INVALID_HANDSHAKE);
}
reset();
}
@@ -347,9 +388,9 @@ public abstract class CarBluetoothManager {
clientDeviceAddress,
clientDeviceName,
/* isConnectionEnabled= */ true));
- AssociationCallback callback = getAssociationCallback();
- if (callback != null) {
- callback.onAssociationCompleted(deviceId);
+ if (associationCallback != null) {
+ associationCallback.onAssociationCompleted(deviceId);
+ oobConnectionManager.reset();
setAssociationCallback(null);
}
}
@@ -368,7 +409,8 @@ public abstract class CarBluetoothManager {
callbacks.invoke(callback -> callback.onSecureChannelError(deviceId));
if (isAssociating()) {
- getAssociationCallback().onAssociationError(error);
+ associationCallback.onAssociationError(error);
+ oobConnectionManager.reset();
}
disconnectWithError("Error while establishing secure connection.");
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/connection/DeviceMessageStream.java b/libs/connecteddevice/src/com/google/android/connecteddevice/connection/DeviceMessageStream.java
index 63a28c8..24032b4 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/connection/DeviceMessageStream.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/connection/DeviceMessageStream.java
@@ -24,16 +24,20 @@ import androidx.annotation.IntRange;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
+import com.google.android.companionprotos.CapabilitiesExchangeProto.CapabilitiesExchange;
+import com.google.android.companionprotos.CapabilitiesExchangeProto.CapabilitiesExchange.OobChannel;
import com.google.android.companionprotos.DeviceMessageProto.Message;
import com.google.android.companionprotos.OperationProto.OperationType;
import com.google.android.companionprotos.PacketProto.Packet;
import com.google.android.companionprotos.VersionExchangeProto.VersionExchange;
import com.google.android.connecteddevice.util.ByteUtils;
+import com.google.common.collect.ImmutableList;
import com.google.protobuf.ByteString;
import com.google.protobuf.ExtensionRegistryLite;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayDeque;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -46,9 +50,16 @@ public abstract class DeviceMessageStream {
private static final String TAG = "DeviceMessageStream";
+ public static final int MIN_SECURITY_VERSION_FOR_CAPABILITIES_EXCHANGE = 3;
+
// Messaging and security versions are dictated by this device.
@VisibleForTesting public static final int MESSAGING_VERSION = 3;
- @VisibleForTesting public static final int SECURITY_VERSION = 2;
+ @VisibleForTesting public static final int MIN_SECURITY_VERSION = 2;
+ // TODO(b/175066810): Increment the security version to 3 only when capabilities exchange is fully
+ // implemented on IHU and mobile.
+ @VisibleForTesting public static final int MAX_SECURITY_VERSION = 2;
+
+ private static final ImmutableList<OobChannel> SUPPORTED_OOB_CHANNELS = ImmutableList.of();
private final ArrayDeque<Packet> packetQueue = new ArrayDeque<>();
@@ -59,7 +70,15 @@ public abstract class DeviceMessageStream {
private final MessageIdGenerator messageIdGenerator = new MessageIdGenerator();
- private final AtomicBoolean isVersionExchanged = new AtomicBoolean(false);
+ private enum MessageExchangeState {
+ UNKNOWN,
+ WAITING_FOR_VERSION_EXCHANGE,
+ WAITING_FOR_CAPABILITIES_EXCHANGE,
+ WAITING_FOR_MESSAGE_PACKETS
+ }
+
+ private MessageExchangeState messageExchangeState =
+ MessageExchangeState.WAITING_FOR_VERSION_EXCHANGE;
private final AtomicBoolean isSendingInProgress = new AtomicBoolean(false);
@@ -71,6 +90,12 @@ public abstract class DeviceMessageStream {
/** Listener which will be notified when there is error parsing the received message. */
private MessageReceivedErrorListener messageReceivedErrorListener;
+ /** Listener which will be notified when the version is exchanged. */
+ private VersionExchangedListener versionExchangedListener;
+
+ /** Listener which will be notified when the capabilities are exchanged. */
+ private CapabilitiesExchangedListener capabilitiesExchangedListener;
+
protected DeviceMessageStream(int defaultMaxWriteSize) {
maxWriteSize = defaultMaxWriteSize;
}
@@ -99,6 +124,24 @@ public abstract class DeviceMessageStream {
}
/**
+ * Set the given listener to be notified when the version was exchanged between the two devices.
+ * If listener is {@code null}, clear.
+ */
+ public final void setVersionExchangedListener(@Nullable VersionExchangedListener listener) {
+ versionExchangedListener = listener;
+ }
+
+ /**
+ * Set the given listener to be notified when the capabilities were exchanged between the two
+ * devices. If listener is {@code null}, clear.
+ */
+ public final void setCapabilitiesExchangedListener(
+ @Nullable CapabilitiesExchangedListener listener) {
+ logd(TAG, "Setting capabilities exchanged listener");
+ capabilitiesExchangedListener = listener;
+ }
+
+ /**
* Notify the {@code mMessageReceivedListener} about the message received if it is not {@code
* null}.
*
@@ -124,6 +167,24 @@ public abstract class DeviceMessageStream {
}
}
+ @VisibleForTesting
+ public final void notifyVersionExchanged(int messagingVersion, int securityVersion) {
+ if (versionExchangedListener != null) {
+ versionExchangedListener.onVersionExchanged(messagingVersion, securityVersion);
+ }
+ }
+
+ private final void notifyOobCapabilitiesExchanged(@NonNull List<OobChannel> oobChannels) {
+ logd(
+ TAG,
+ "Capabilitied exchanged listener is " + capabilitiesExchangedListener == null
+ ? "null"
+ : "not null");
+ if (capabilitiesExchangedListener != null) {
+ capabilitiesExchangedListener.onOobCapabilitiesExchanged(oobChannels);
+ }
+ }
+
/**
* Writes the given message to the write characteristic of this stream with operation type {@code
* CLIENT_MESSAGE}.
@@ -193,21 +254,28 @@ public abstract class DeviceMessageStream {
}
/** Process incoming data from stream. */
- protected final void onDataReceived(byte[] data) {
- if (!hasVersionBeenExchanged()) {
- processVersionExchange(data);
- return;
+ protected final synchronized void onDataReceived(byte[] data) {
+ switch (messageExchangeState) {
+ case WAITING_FOR_VERSION_EXCHANGE:
+ processVersionExchange(data);
+ break;
+ case WAITING_FOR_CAPABILITIES_EXCHANGE:
+ processCapabilitiesExchange(data);
+ break;
+ case WAITING_FOR_MESSAGE_PACKETS:
+ Packet packet;
+ try {
+ packet = Packet.parseFrom(data, ExtensionRegistryLite.getEmptyRegistry());
+ } catch (IOException e) {
+ loge(TAG, "Can not parse packet from client.", e);
+ notifyMessageReceivedErrorListener(e);
+ return;
+ }
+ processPacket(packet);
+ break;
+ case UNKNOWN:
+ loge(TAG, "Unknown state, don't know what to do with this message.");
}
-
- Packet packet;
- try {
- packet = Packet.parseFrom(data, ExtensionRegistryLite.getEmptyRegistry());
- } catch (IOException e) {
- loge(TAG, "Can not parse packet from client.", e);
- notifyMessageReceivedErrorListener(e);
- return;
- }
- processPacket(packet);
}
protected final void processPacket(@NonNull Packet packet) {
@@ -287,10 +355,6 @@ public abstract class DeviceMessageStream {
this.maxWriteSize = maxWriteSize;
}
- private boolean hasVersionBeenExchanged() {
- return isVersionExchanged.get();
- }
-
/** Indicate current send operation has completed. */
public void sendCompleted() {
isSendingInProgress.set(false);
@@ -314,8 +378,8 @@ public abstract class DeviceMessageStream {
int maxSecurityVersion = versionExchange.getMaxSupportedSecurityVersion();
if (minMessagingVersion > MESSAGING_VERSION
|| maxMessagingVersion < MESSAGING_VERSION
- || minSecurityVersion > SECURITY_VERSION
- || maxSecurityVersion < SECURITY_VERSION) {
+ || minSecurityVersion > MAX_SECURITY_VERSION
+ || maxSecurityVersion < MIN_SECURITY_VERSION) {
loge(
TAG,
"Unsupported message version for min "
@@ -335,13 +399,47 @@ public abstract class DeviceMessageStream {
VersionExchange.newBuilder()
.setMinSupportedMessagingVersion(MESSAGING_VERSION)
.setMaxSupportedMessagingVersion(MESSAGING_VERSION)
- .setMinSupportedSecurityVersion(SECURITY_VERSION)
- .setMaxSupportedSecurityVersion(SECURITY_VERSION)
+ .setMinSupportedSecurityVersion(MIN_SECURITY_VERSION)
+ .setMaxSupportedSecurityVersion(MAX_SECURITY_VERSION)
.build();
-
send(headunitVersion.toByteArray());
- isVersionExchanged.set(true);
logd(TAG, "Sent supported version to the phone.");
+
+ int maxSharedSecurityVersion = Math.min(maxSecurityVersion, MAX_SECURITY_VERSION);
+ notifyVersionExchanged(MESSAGING_VERSION, maxSharedSecurityVersion);
+ messageExchangeState =
+ maxSharedSecurityVersion >= MIN_SECURITY_VERSION_FOR_CAPABILITIES_EXCHANGE
+ ? MessageExchangeState.WAITING_FOR_CAPABILITIES_EXCHANGE
+ : MessageExchangeState.WAITING_FOR_MESSAGE_PACKETS;
+ }
+
+ // TODO(b/178045908): Move capabilities exchange logic out of DeviceMessageStream
+ private void processCapabilitiesExchange(@NonNull byte[] value) {
+ CapabilitiesExchange capabilitiesExchange;
+ try {
+ capabilitiesExchange =
+ CapabilitiesExchange.parseFrom(value, ExtensionRegistryLite.getEmptyRegistry());
+ } catch (IOException e) {
+ loge(TAG, "Could not parse capabilities exchange message", e);
+ notifyMessageReceivedErrorListener(e);
+ return;
+ }
+
+ CapabilitiesExchange headunitCapabilities =
+ CapabilitiesExchange.newBuilder()
+ .addAllSupportedOobChannels(SUPPORTED_OOB_CHANNELS)
+ .build();
+ send(headunitCapabilities.toByteArray());
+ logd(TAG, "Sent supported capabilities to the phone.");
+
+ List<OobChannel> sharedSupportedOobChanels = capabilitiesExchange.getSupportedOobChannelsList();
+ if (sharedSupportedOobChanels == null) {
+ sharedSupportedOobChanels = new ArrayList<>();
+ }
+ sharedSupportedOobChanels.retainAll(SUPPORTED_OOB_CHANNELS);
+ notifyOobCapabilitiesExchanged(sharedSupportedOobChanels);
+
+ messageExchangeState = MessageExchangeState.WAITING_FOR_MESSAGE_PACKETS;
}
/** A generator of unique IDs for messages. */
@@ -376,4 +474,25 @@ public abstract class DeviceMessageStream {
*/
void onMessageReceivedError(@NonNull Exception exception);
}
+
+ /** Listener to be invoked when the version exchange has been completed on the IHU. */
+ public interface VersionExchangedListener {
+ /**
+ * Called when version exchange has been completed on the IHU.
+ *
+ * @param messagingVersion The supported messaging version agreed upon by both devices
+ * @param securityVersion The supported security version agreed upon by both devices
+ */
+ void onVersionExchanged(int messagingVersion, int securityVersion);
+ }
+
+ /** Listener to be invoked when the capabilities exchange has been completed on the IHU. */
+ public interface CapabilitiesExchangedListener {
+ /**
+ * Called when the capabilities exchange has been completed on the IHU.
+ *
+ * @param oobChannels The list of out of band channels supported by both devices
+ */
+ void onOobCapabilitiesExchanged(@NonNull List<OobChannel> oobChannels);
+ }
}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/connection/ble/CarBlePeripheralManager.java b/libs/connecteddevice/src/com/google/android/connecteddevice/connection/ble/CarBlePeripheralManager.java
index d537a42..1f8f566 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/connection/ble/CarBlePeripheralManager.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/connection/ble/CarBlePeripheralManager.java
@@ -16,6 +16,7 @@
package com.google.android.connecteddevice.connection.ble;
+import static com.google.android.companionprotos.CapabilitiesExchangeProto.CapabilitiesExchange.OobChannel.BT_RFCOMM;
import static com.google.android.connecteddevice.model.Errors.DEVICE_ERROR_UNEXPECTED_DISCONNECTION;
import static com.google.android.connecteddevice.util.SafeLog.logd;
import static com.google.android.connecteddevice.util.SafeLog.loge;
@@ -38,11 +39,11 @@ import androidx.annotation.VisibleForTesting;
import com.google.android.connecteddevice.connection.AssociationCallback;
import com.google.android.connecteddevice.connection.AssociationSecureChannel;
import com.google.android.connecteddevice.connection.CarBluetoothManager;
+import com.google.android.connecteddevice.connection.DeviceMessageStream;
import com.google.android.connecteddevice.connection.OobAssociationSecureChannel;
import com.google.android.connecteddevice.connection.ReconnectSecureChannel;
-import com.google.android.connecteddevice.connection.SecureChannel;
+import com.google.android.connecteddevice.model.OobEligibleDevice;
import com.google.android.connecteddevice.oob.OobChannel;
-import com.google.android.connecteddevice.oob.OobConnectionManager;
import com.google.android.connecteddevice.storage.ConnectedDeviceStorage;
import com.google.android.connecteddevice.util.ByteUtils;
import com.google.android.connecteddevice.util.EventLog;
@@ -81,7 +82,7 @@ public class CarBlePeripheralManager extends CarBluetoothManager {
private final BluetoothGattCharacteristic writeCharacteristic;
- private final BluetoothGattCharacteristic readCharacteristic;
+ @VisibleForTesting final BluetoothGattCharacteristic readCharacteristic;
private final BluetoothGattCharacteristic advertiseDataCharacteristic;
@@ -99,11 +100,36 @@ public class CarBlePeripheralManager extends CarBluetoothManager {
private AdvertiseCallback advertiseCallback;
- private OobConnectionManager oobConnectionManager;
-
private Future<?> bluetoothNameTask;
- private AssociationCallback associationCallback;
+ private final OobChannel oobChannel;
+
+ public CarBlePeripheralManager(
+ @NonNull BlePeripheralManager blePeripheralManager,
+ @NonNull ConnectedDeviceStorage connectedDeviceStorage,
+ @NonNull UUID associationServiceUuid,
+ @NonNull UUID reconnectServiceUuid,
+ @NonNull UUID reconnectDataUuid,
+ @NonNull UUID advertiseDataCharacteristicUuid,
+ @NonNull UUID writeCharacteristicUuid,
+ @NonNull UUID readCharacteristicUuid,
+ @NonNull Duration maxReconnectAdvertisementDuration,
+ int defaultMtuSize,
+ boolean enableCompression) {
+ this(
+ blePeripheralManager,
+ connectedDeviceStorage,
+ associationServiceUuid,
+ reconnectServiceUuid,
+ reconnectDataUuid,
+ advertiseDataCharacteristicUuid,
+ writeCharacteristicUuid,
+ readCharacteristicUuid,
+ maxReconnectAdvertisementDuration,
+ defaultMtuSize,
+ enableCompression,
+ null);
+ }
/**
* Initialize a new instance of manager.
@@ -133,12 +159,14 @@ public class CarBlePeripheralManager extends CarBluetoothManager {
@NonNull UUID readCharacteristicUuid,
@NonNull Duration maxReconnectAdvertisementDuration,
int defaultMtuSize,
- boolean enableCompression) {
+ boolean enableCompression,
+ @Nullable OobChannel oobChannel) {
super(connectedDeviceStorage, enableCompression);
this.blePeripheralManager = blePeripheralManager;
this.associationServiceUuid = associationServiceUuid;
this.reconnectServiceUuid = reconnectServiceUuid;
this.reconnectDataUuid = reconnectDataUuid;
+ this.oobChannel = oobChannel;
writeCharacteristic =
new BluetoothGattCharacteristic(
@@ -207,16 +235,6 @@ public class CarBlePeripheralManager extends CarBluetoothManager {
}
@Override
- public AssociationCallback getAssociationCallback() {
- return associationCallback;
- }
-
- @Override
- public void setAssociationCallback(AssociationCallback callback) {
- associationCallback = callback;
- }
-
- @Override
public void reset() {
super.reset();
logd(TAG, "Resetting state.");
@@ -226,8 +244,6 @@ public class CarBlePeripheralManager extends CarBluetoothManager {
blePeripheralManager.cleanup();
reconnectDeviceId = null;
reconnectChallenge = null;
- oobConnectionManager = null;
- associationCallback = null;
if (bluetoothNameTask != null) {
bluetoothNameTask.cancel(true);
}
@@ -300,7 +316,7 @@ public class CarBlePeripheralManager extends CarBluetoothManager {
}
reset();
- associationCallback = callback;
+ setAssociationCallback(callback);
blePeripheralManager.unregisterCallback(reconnectPeripheralCallback);
blePeripheralManager.registerCallback(associationPeripheralCallback);
advertiseCallback =
@@ -329,36 +345,6 @@ public class CarBlePeripheralManager extends CarBluetoothManager {
reconnectDataUuid);
}
- /** Start the association with a new device using out of band verification code exchange */
- @Override
- public void startOutOfBandAssociation(
- @NonNull String nameForAssociation,
- @NonNull OobChannel oobChannel,
- @NonNull AssociationCallback callback) {
-
- logd(TAG, "Starting out of band association.");
- startAssociation(
- nameForAssociation,
- new AssociationCallback() {
- @Override
- public void onAssociationStartSuccess(String deviceName) {
- associationCallback = callback;
- boolean success = oobConnectionManager.startOobExchange(oobChannel);
- if (!success) {
- callback.onAssociationStartFailure();
- return;
- }
- callback.onAssociationStartSuccess(deviceName);
- }
-
- @Override
- public void onAssociationStartFailure() {
- callback.onAssociationStartFailure();
- }
- });
- oobConnectionManager = new OobConnectionManager();
- }
-
/** Set the timeout handler for testing. This should be called after {@link #start()}. */
@VisibleForTesting
void setTimeoutHandler(Handler handler) {
@@ -377,8 +363,7 @@ public class CarBlePeripheralManager extends CarBluetoothManager {
gattService.addCharacteristic(writeCharacteristic);
gattService.addCharacteristic(readCharacteristic);
- AdvertiseData.Builder advertisementBuilder =
- new AdvertiseData.Builder();
+ AdvertiseData.Builder advertisementBuilder = new AdvertiseData.Builder();
ParcelUuid uuid = new ParcelUuid(serviceUuid);
advertisementBuilder.addServiceUuid(uuid);
if (advertiseData != null) {
@@ -393,25 +378,17 @@ public class CarBlePeripheralManager extends CarBluetoothManager {
gattService.addCharacteristic(advertiseDataCharacteristic);
}
- AdvertiseData.Builder scanResponseBuilder =
- new AdvertiseData.Builder();
+ AdvertiseData.Builder scanResponseBuilder = new AdvertiseData.Builder();
if (scanResponse != null && scanResponseUuid != null) {
ParcelUuid scanResponseParcelUuid = new ParcelUuid(scanResponseUuid);
scanResponseBuilder.addServiceData(scanResponseParcelUuid, scanResponse);
}
- blePeripheralManager.startAdvertising(gattService, advertisementBuilder.build(),
- scanResponseBuilder.build(), callback);
+ blePeripheralManager.startAdvertising(
+ gattService, advertisementBuilder.build(), scanResponseBuilder.build(), callback);
}
private void addConnectedDevice(BluetoothDevice device, boolean isReconnect) {
- addConnectedDevice(device, isReconnect, /* oobConnectionManager= */ null);
- }
-
- private void addConnectedDevice(
- @NonNull BluetoothDevice device,
- boolean isReconnect,
- @Nullable OobConnectionManager oobConnectionManager) {
EventLog.onDeviceConnected();
blePeripheralManager.stopAdvertising(advertiseCallback);
if (timeoutHandler != null) {
@@ -427,7 +404,7 @@ public class CarBlePeripheralManager extends CarBluetoothManager {
}
setClientDeviceAddress(device.getAddress());
- BleDeviceMessageStream secureStream =
+ DeviceMessageStream secureStream =
new BleDeviceMessageStream(
blePeripheralManager,
device,
@@ -438,20 +415,71 @@ public class CarBlePeripheralManager extends CarBluetoothManager {
exception -> {
disconnectWithError("Error occurred in stream: " + exception.getMessage());
});
- SecureChannel secureChannel;
+
+ ConnectedRemoteDevice connectedDevice = new ConnectedRemoteDevice(device, /* gatt= */ null);
+
if (isReconnect) {
- secureChannel =
- new ReconnectSecureChannel(
- secureStream, storage, reconnectDeviceId, reconnectChallenge);
- } else if (oobConnectionManager != null) {
- secureChannel = new OobAssociationSecureChannel(secureStream, storage, oobConnectionManager);
+ ReconnectSecureChannel secureChannel =
+ new ReconnectSecureChannel(secureStream, storage, reconnectDeviceId, reconnectChallenge);
+ secureChannel.registerCallback(secureChannelCallback);
+ connectedDevice.secureChannel = secureChannel;
+ addConnectedDevice(connectedDevice);
+
} else {
- secureChannel = new AssociationSecureChannel(secureStream, storage);
+ secureStream.setVersionExchangedListener(
+ (messagingVersion, securityVersion) -> {
+ if (securityVersion
+ >= DeviceMessageStream.MIN_SECURITY_VERSION_FOR_CAPABILITIES_EXCHANGE) {
+ secureStream.setCapabilitiesExchangedListener(
+ oobChannels -> {
+ if (oobChannels.contains(BT_RFCOMM) && oobChannel != null) {
+ logd(TAG, "Completing out of band data exchange.");
+ oobChannel.completeOobDataExchange(
+ new OobEligibleDevice(
+ device.getAddress(), OobEligibleDevice.OOB_TYPE_BLUETOOTH),
+ new OobChannel.Callback() {
+ @Override
+ public void onOobExchangeSuccess() {
+ logd(
+ TAG,
+ "Out of band exchange succeeded. Proceeding to association with"
+ + " device.");
+ if (getOobConnectionManager().startOobExchange(oobChannel)) {
+ addConnectedDeviceWithAssociationSecureChannel(
+ connectedDevice,
+ new OobAssociationSecureChannel(
+ secureStream, storage, getOobConnectionManager()));
+ } else {
+ logw(
+ TAG,
+ "Out of band exchange failed, falling back to Numeric"
+ + " Comparison.");
+ addConnectedDeviceWithAssociationSecureChannel(
+ connectedDevice,
+ new AssociationSecureChannel(secureStream, storage));
+ }
+ }
+
+ @Override
+ public void onOobExchangeFailure() {
+ logw(
+ TAG,
+ "Out of band exchange failed, falling back to Numeric"
+ + " Comparison.");
+ addConnectedDeviceWithAssociationSecureChannel(
+ connectedDevice,
+ new AssociationSecureChannel(secureStream, storage));
+ }
+ });
+ }
+ });
+ } else {
+ addConnectedDeviceWithAssociationSecureChannel(
+ connectedDevice, new AssociationSecureChannel(secureStream, storage));
+ }
+ });
}
- secureChannel.registerCallback(secureChannelCallback);
- ConnectedRemoteDevice connectedDevice = new ConnectedRemoteDevice(device, /* gatt= */ null);
- connectedDevice.secureChannel = secureChannel;
- addConnectedDevice(connectedDevice);
+
if (isReconnect) {
setDeviceIdAndNotifyCallbacks(reconnectDeviceId);
reconnectDeviceId = null;
@@ -459,13 +487,20 @@ public class CarBlePeripheralManager extends CarBluetoothManager {
}
}
+ private void addConnectedDeviceWithAssociationSecureChannel(
+ ConnectedRemoteDevice connectedDevice, AssociationSecureChannel secureChannel) {
+ secureChannel.setShowVerificationCodeListener(this::onVerificationCodeAvailable);
+ secureChannel.registerCallback(secureChannelCallback);
+ connectedDevice.secureChannel = secureChannel;
+ addConnectedDevice(connectedDevice);
+ }
+
private void setMtuSize(int mtuSize) {
ConnectedRemoteDevice connectedDevice = getConnectedDevice();
if (connectedDevice != null
&& connectedDevice.secureChannel != null
&& connectedDevice.secureChannel.getStream() != null) {
- connectedDevice.secureChannel.getStream()
- .setMaxWriteSize(mtuSize - ATT_PROTOCOL_BYTES);
+ connectedDevice.secureChannel.getStream().setMaxWriteSize(mtuSize - ATT_PROTOCOL_BYTES);
}
}
@@ -531,20 +566,14 @@ public class CarBlePeripheralManager extends CarBluetoothManager {
@Override
public void onRemoteDeviceConnected(BluetoothDevice device) {
- addConnectedDevice(device, /* isReconnect= */ false, oobConnectionManager);
+ addConnectedDevice(device, /* isReconnect= */ false);
ConnectedRemoteDevice connectedDevice = getConnectedDevice();
if (connectedDevice == null || connectedDevice.secureChannel == null) {
return;
}
((AssociationSecureChannel) connectedDevice.secureChannel)
.setShowVerificationCodeListener(
- code -> {
- if (!isAssociating()) {
- loge(TAG, "No valid callback for association.");
- return;
- }
- associationCallback.onVerificationCodeAvailable(code);
- });
+ CarBlePeripheralManager.this::onVerificationCodeAvailable);
}
@Override
@@ -552,7 +581,7 @@ public class CarBlePeripheralManager extends CarBluetoothManager {
logd(TAG, "Remote device disconnected.");
ConnectedRemoteDevice connectedDevice = getConnectedDevice(device);
if (isAssociating()) {
- associationCallback.onAssociationError(DEVICE_ERROR_UNEXPECTED_DISCONNECTION);
+ getAssociationCallback().onAssociationError(DEVICE_ERROR_UNEXPECTED_DISCONNECTION);
}
// Reset before invoking callbacks to avoid a race condition with reconnect
// logic.
@@ -574,4 +603,12 @@ public class CarBlePeripheralManager extends CarBluetoothManager {
connectToDevice(UUID.fromString(reconnectDeviceId));
}
};
+
+ private void onVerificationCodeAvailable(String code) {
+ if (!isAssociating()) {
+ loge(TAG, "No valid callback for association.");
+ return;
+ }
+ getAssociationCallback().onVerificationCodeAvailable(code);
+ }
}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/connection/spp/CarSppManager.java b/libs/connecteddevice/src/com/google/android/connecteddevice/connection/spp/CarSppManager.java
index 96e829a..d3c958a 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/connection/spp/CarSppManager.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/connection/spp/CarSppManager.java
@@ -32,8 +32,6 @@ import com.google.android.connecteddevice.connection.CarBluetoothManager;
import com.google.android.connecteddevice.connection.DeviceMessageStream;
import com.google.android.connecteddevice.connection.ReconnectSecureChannel;
import com.google.android.connecteddevice.connection.SecureChannel;
-import com.google.android.connecteddevice.oob.OobChannel;
-import com.google.android.connecteddevice.oob.OobConnectionManager;
import com.google.android.connecteddevice.storage.ConnectedDeviceStorage;
import com.google.android.connecteddevice.transport.spp.ConnectedDeviceSppDelegateBinder;
import com.google.android.connecteddevice.transport.spp.ConnectedDeviceSppDelegateBinder.OnErrorListener;
@@ -65,10 +63,6 @@ public class CarSppManager extends CarBluetoothManager {
private PendingConnection currentPendingConnection;
- private OobConnectionManager oobConnectionManager;
-
- private AssociationCallback associationCallback;
-
/**
* Initialize a new instance of manager.
*
@@ -105,16 +99,6 @@ public class CarSppManager extends CarBluetoothManager {
}
@Override
- public AssociationCallback getAssociationCallback() {
- return associationCallback;
- }
-
- @Override
- public void setAssociationCallback(AssociationCallback callback) {
- associationCallback = callback;
- }
-
- @Override
public void initiateConnectionToDevice(@NonNull UUID deviceId) {
logd(TAG, "Start spp reconnection listening for device with id: " + deviceId);
currentConnection = null;
@@ -142,7 +126,6 @@ public class CarSppManager extends CarBluetoothManager {
public void reset() {
super.reset();
reconnectDeviceId = null;
- associationCallback = null;
if (currentConnection != null) {
try {
sppServiceBinder.disconnect(currentConnection);
@@ -175,7 +158,7 @@ public class CarSppManager extends CarBluetoothManager {
sppServiceBinder.unregisterConnectionCallback(UUID.fromString(reconnectDeviceId));
}
reset();
- associationCallback = callback;
+ setAssociationCallback(callback);
sppServiceBinder.registerConnectionCallback(associationServiceUuid, associationOnErrorListener);
try {
PendingConnection pendingConnection =
@@ -195,41 +178,7 @@ public class CarSppManager extends CarBluetoothManager {
}
}
- /** Start the association with a new device using out of band verification code exchange */
- @Override
- public void startOutOfBandAssociation(
- @NonNull String nameForAssociation,
- @NonNull OobChannel oobChannel,
- @NonNull AssociationCallback callback) {
-
- logd(TAG, "Starting out of band association.");
- startAssociation(
- nameForAssociation,
- new AssociationCallback() {
- @Override
- public void onAssociationStartSuccess(String deviceName) {
- associationCallback = callback;
- boolean success = oobConnectionManager.startOobExchange(oobChannel);
- if (!success) {
- callback.onAssociationStartFailure();
- return;
- }
- callback.onAssociationStartSuccess(deviceName);
- }
-
- @Override
- public void onAssociationStartFailure() {
- callback.onAssociationStartFailure();
- }
- });
- oobConnectionManager = new OobConnectionManager();
- }
-
private void onDeviceConnected(Connection connection, boolean isReconnect) {
- onDeviceConnected(connection, isReconnect, /* isOob= */ false);
- }
-
- private void onDeviceConnected(Connection connection, boolean isReconnect, boolean isOob) {
currentConnection = connection;
currentPendingConnection = null;
EventLog.onDeviceConnected();
@@ -242,15 +191,12 @@ public class CarSppManager extends CarBluetoothManager {
exception -> {
disconnectWithError("Error occurred in stream: " + exception.getMessage(), exception);
});
+ // TODO(b/172276170): Re-enable out of band support for SPP
SecureChannel secureChannel;
if (isReconnect) {
secureChannel =
new ReconnectSecureChannel(
secureStream, storage, reconnectDeviceId, /* expectedChallengeResponse= */ null);
- } else if (isOob) {
- // TODO(b/160901821): Integrate Oob with Spp channel
- loge(TAG, "Oob verification is currently not available for Spp");
- return;
} else {
secureChannel = new AssociationSecureChannel(secureStream, storage);
}
@@ -314,11 +260,11 @@ public class CarSppManager extends CarBluetoothManager {
((AssociationSecureChannel) connectedDevice.secureChannel)
.setShowVerificationCodeListener(
code -> {
- if (associationCallback == null) {
+ if (!isAssociating()) {
loge(TAG, "No valid callback for association.");
return;
}
- associationCallback.onVerificationCodeAvailable(code);
+ getAssociationCallback().onVerificationCodeAvailable(code);
});
}
};
@@ -343,7 +289,9 @@ public class CarSppManager extends CarBluetoothManager {
}
currentConnection = null;
if (isAssociating()) {
- associationCallback.onAssociationError(DEVICE_ERROR_UNEXPECTED_DISCONNECTION);
+ getAssociationCallback().onAssociationError(DEVICE_ERROR_UNEXPECTED_DISCONNECTION);
+ } else {
+ loge(TAG, "Encounter association error with no association callback registered.");
}
ConnectedRemoteDevice connectedDevice = getConnectedDevice(connection.getRemoteDevice());
// Reset before invoking callbacks to avoid a race condition with reconnect
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/model/AssociatedDevice.java b/libs/connecteddevice/src/com/google/android/connecteddevice/model/AssociatedDevice.java
index 64f7d17..9220b03 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/model/AssociatedDevice.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/model/AssociatedDevice.java
@@ -88,15 +88,12 @@ public class AssociatedDevice implements Parcelable {
return false;
}
AssociatedDevice associatedDevice = (AssociatedDevice) obj;
- return Objects.equals(deviceId, associatedDevice.deviceId)
- && Objects.equals(deviceAddress, associatedDevice.deviceAddress)
- && Objects.equals(deviceName, associatedDevice.deviceName)
- && isConnectionEnabled == associatedDevice.isConnectionEnabled;
+ return Objects.equals(deviceId, associatedDevice.deviceId);
}
@Override
public int hashCode() {
- return Objects.hash(deviceId, deviceAddress, deviceName, isConnectionEnabled);
+ return Objects.hashCode(deviceId);
}
@Override
diff --git a/companiondevice/src/com/google/android/companiondevicesupport/AssociatedDeviceDetails.java b/libs/connecteddevice/src/com/google/android/connecteddevice/model/AssociatedDeviceDetails.java
index 3c5cf07..5297165 100644
--- a/companiondevice/src/com/google/android/companiondevicesupport/AssociatedDeviceDetails.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/model/AssociatedDeviceDetails.java
@@ -14,14 +14,13 @@
* limitations under the License.
*/
-package com.google.android.companiondevicesupport;
+package com.google.android.connecteddevice.model;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.google.android.connecteddevice.model.AssociatedDevice;
/** Class that contains the details of an associated device. */
-class AssociatedDeviceDetails {
+public class AssociatedDeviceDetails {
private final String deviceId;
private final String deviceAddress;
@@ -32,7 +31,7 @@ class AssociatedDeviceDetails {
private final boolean isConnected;
- AssociatedDeviceDetails(@NonNull AssociatedDevice device, boolean isConnected) {
+ public AssociatedDeviceDetails(@NonNull AssociatedDevice device, boolean isConnected) {
deviceId = device.getDeviceId();
deviceAddress = device.getDeviceAddress();
deviceName = device.getDeviceName();
@@ -42,35 +41,35 @@ class AssociatedDeviceDetails {
/** Get the device id. */
@NonNull
- String getDeviceId() {
+ public String getDeviceId() {
return deviceId;
}
/** Get the name of the associated device. */
@Nullable
- String getDeviceName() {
+ public String getDeviceName() {
return deviceName;
}
/** Get the device address. */
@NonNull
- String getDeviceAddress() {
+ public String getDeviceAddress() {
return deviceAddress;
}
/** {@code true} if the connection is enabled for the device. */
- boolean isConnectionEnabled() {
+ public boolean isConnectionEnabled() {
return isConnectionEnabled;
}
/** {@code true} if the device is connected. */
- boolean isConnected() {
+ public boolean isConnected() {
return isConnected;
}
/** Get {@link AssociatedDevice}. */
@NonNull
- AssociatedDevice getAssociatedDevice() {
+ public AssociatedDevice getAssociatedDevice() {
return new AssociatedDevice(deviceId, deviceAddress, deviceName, isConnectionEnabled);
}
}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/model/ConnectedDevice.java b/libs/connecteddevice/src/com/google/android/connecteddevice/model/ConnectedDevice.java
index 2e9cc12..97bc163 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/model/ConnectedDevice.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/model/ConnectedDevice.java
@@ -102,15 +102,12 @@ public class ConnectedDevice implements Parcelable {
return false;
}
ConnectedDevice connectedDevice = (ConnectedDevice) obj;
- return Objects.equals(deviceId, connectedDevice.deviceId)
- && Objects.equals(deviceName, connectedDevice.deviceName)
- && belongsToActiveUser == connectedDevice.belongsToActiveUser
- && hasSecureChannel == connectedDevice.hasSecureChannel;
+ return Objects.equals(deviceId, connectedDevice.deviceId);
}
@Override
public int hashCode() {
- return Objects.hash(deviceId, deviceName, belongsToActiveUser, hasSecureChannel);
+ return Objects.hashCode(deviceId);
}
public static final Parcelable.Creator<ConnectedDevice> CREATOR =
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/oob/BluetoothRfcommChannel.java b/libs/connecteddevice/src/com/google/android/connecteddevice/oob/BluetoothRfcommChannel.java
index 6e7aec5..b2b2467 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/oob/BluetoothRfcommChannel.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/oob/BluetoothRfcommChannel.java
@@ -22,6 +22,8 @@ import static com.google.android.connecteddevice.util.SafeLog.logw;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
+import android.os.Handler;
+import android.os.Looper;
import android.os.ParcelUuid;
import android.os.RemoteException;
import androidx.annotation.NonNull;
@@ -32,6 +34,7 @@ import com.google.android.connecteddevice.transport.spp.ConnectedDeviceSppDelega
import com.google.android.connecteddevice.transport.spp.Connection;
import com.google.android.connecteddevice.transport.spp.PendingConnection;
import com.google.android.connecteddevice.transport.spp.PendingSentMessage;
+import java.util.Set;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -40,6 +43,8 @@ public class BluetoothRfcommChannel implements OobChannel {
private static final String TAG = "BluetoothRfcommChannel";
// TODO(b/159500330): Generate random UUID.
private static final UUID RFCOMM_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
+ private static final int CONNECTION_TIMEOUT_MS = 500;
+
private final AtomicBoolean isInterrupted = new AtomicBoolean();
private final ConnectedDeviceSppDelegateBinder sppDelegateBinder;
private Connection activeConnection;
@@ -53,29 +58,63 @@ public class BluetoothRfcommChannel implements OobChannel {
@Override
public void completeOobDataExchange(
@NonNull OobEligibleDevice device, @NonNull Callback callback) {
- completeOobDataExchange(device, callback, BluetoothAdapter.getDefaultAdapter());
+ completeOobDataExchange(
+ device, callback, () -> BluetoothAdapter.getDefaultAdapter().getBondedDevices());
}
@VisibleForTesting
void completeOobDataExchange(
- OobEligibleDevice device, Callback callback, BluetoothAdapter bluetoothAdapter) {
+ OobEligibleDevice device, Callback callback, BondedDevicesResolver bondedDevicesResolver) {
this.callback = callback;
- BluetoothDevice remoteDevice = bluetoothAdapter.getRemoteDevice(device.getDeviceAddress());
+ BluetoothDevice remoteDevice =
+ BluetoothAdapter.getDefaultAdapter().getRemoteDevice(device.getDeviceAddress());
+ Set<BluetoothDevice> bondedDevices = bondedDevicesResolver.getBondedDevices();
+ if (bondedDevices == null || !bondedDevices.contains(remoteDevice)) {
+ notifyFailure(
+ "This device has not been bonded to device with address " + remoteDevice.getAddress(),
+ /* exception= */ null);
+ return;
+ }
try {
PendingConnection connection =
sppDelegateBinder.connectAsClient(RFCOMM_UUID, remoteDevice, /* isSecure= */ true);
if (connection == null) {
- notifyFailure("Connection with " + remoteDevice.getName() + " failed.", null);
+ notifyFailure(
+ "Connection with " + remoteDevice.getName() + " failed.", /* exception= */ null);
return;
}
- connection.setOnConnectedListener(
- (uuid, btDevice, isSecure, deviceName) -> {
- activeConnection = new Connection(new ParcelUuid(uuid), btDevice, isSecure, deviceName);
- notifySuccess();
- });
+ Handler handler = new Handler(Looper.getMainLooper());
+ handler.postDelayed(
+ () -> {
+ logd(TAG, "Cancelling connection with " + remoteDevice.getName());
+ try {
+ sppDelegateBinder.cancelConnectionAttempt(connection);
+ } catch (RemoteException e) {
+ logw(TAG, "Failed to cancel connection attempt with " + remoteDevice.getName());
+ }
+ notifyFailure(
+ "Connection with " + remoteDevice.getName() + " timed out.", /* exception= */ null);
+ },
+ CONNECTION_TIMEOUT_MS);
+
+ connection
+ .setOnConnectedListener(
+ (uuid, btDevice, isSecure, deviceName) -> {
+ handler.removeCallbacksAndMessages(null);
+ activeConnection =
+ new Connection(new ParcelUuid(uuid), btDevice, isSecure, deviceName);
+ notifySuccess();
+ })
+ .setOnConnectionErrorListener(
+ () -> {
+ handler.removeCallbacksAndMessages(null);
+ notifyFailure(
+ "Connection with " + remoteDevice.getName() + " failed.",
+ /* exception= */ null);
+ });
} catch (RemoteException e) {
notifyFailure("Connection with " + remoteDevice.getName() + " failed.", e);
}
@@ -145,4 +184,12 @@ public class BluetoothRfcommChannel implements OobChannel {
callback.onOobExchangeSuccess();
}
}
+
+ /**
+ * Interface for determining all the devices that the current device is Bluetooth bonded to, used
+ * for testing.
+ */
+ interface BondedDevicesResolver {
+ Set<BluetoothDevice> getBondedDevices();
+ }
}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/oob/OobConnectionManager.java b/libs/connecteddevice/src/com/google/android/connecteddevice/oob/OobConnectionManager.java
index 3594359..5d51221 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/oob/OobConnectionManager.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/oob/OobConnectionManager.java
@@ -16,6 +16,7 @@
package com.google.android.connecteddevice.oob;
+import static com.google.android.connecteddevice.util.SafeLog.logd;
import static com.google.android.connecteddevice.util.SafeLog.loge;
import android.security.keystore.KeyProperties;
@@ -145,4 +146,12 @@ public class OobConnectionManager {
oobChannel.sendOobData(Bytes.concat(decryptionIv, encryptionIv, encryptionKey.getEncoded()));
return true;
}
+
+ /** Clears all stored encryption keys. */
+ public void reset() {
+ logd(TAG, "Resetting encryption keys.");
+ encryptionIv = new byte[NONCE_LENGTH_BYTES];
+ decryptionIv = new byte[NONCE_LENGTH_BYTES];
+ encryptionKey = null;
+ }
}
diff --git a/companiondevice/src/com/google/android/companiondevicesupport/AssociatedDeviceViewModel.java b/libs/connecteddevice/src/com/google/android/connecteddevice/service/AssociatedDeviceViewModel.java
index 6c803c3..c6cce3b 100644
--- a/companiondevice/src/com/google/android/companiondevicesupport/AssociatedDeviceViewModel.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/service/AssociatedDeviceViewModel.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.android.companiondevicesupport;
+package com.google.android.connecteddevice.service;
import static com.google.android.connecteddevice.api.RemoteFeature.ASSOCIATED_DEVICE_DATA_NAME_EXTRA;
import static com.google.android.connecteddevice.service.ConnectedDeviceService.ACTION_BIND_ASSOCIATION;
@@ -34,24 +34,23 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.ServiceConnection;
-import android.os.Handler;
import android.os.IBinder;
-import android.os.Looper;
import android.os.RemoteException;
import android.os.UserHandle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import com.google.android.connecteddevice.api.IAssociatedDeviceManager;
import com.google.android.connecteddevice.api.IAssociationCallback;
import com.google.android.connecteddevice.api.IConnectionCallback;
import com.google.android.connecteddevice.api.IDeviceAssociationCallback;
+import com.google.android.connecteddevice.api.IOnAssociatedDevicesRetrievedListener;
import com.google.android.connecteddevice.model.AssociatedDevice;
+import com.google.android.connecteddevice.model.AssociatedDeviceDetails;
import com.google.android.connecteddevice.model.ConnectedDevice;
-import com.google.android.connecteddevice.service.ConnectedDeviceService;
import java.time.Duration;
-import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.Executors;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
* Implementation {@link ViewModel} for sharing associated devices data between {@link
@@ -74,29 +73,49 @@ public class AssociatedDeviceViewModel extends AndroidViewModel {
}
private IAssociatedDeviceManager associatedDeviceManager;
- private List<AssociatedDevice> associatedDevices = new ArrayList<>();
- private List<ConnectedDevice> connectedDevices = new ArrayList<>();
+ private final List<AssociatedDevice> associatedDevices = new CopyOnWriteArrayList<>();
+ private final List<ConnectedDevice> connectedDevices = new CopyOnWriteArrayList<>();
- private final MutableLiveData<AssociatedDeviceDetails> deviceDetails =
+ private final MutableLiveData<AssociatedDeviceDetails> currentDeviceDetails =
new MutableLiveData<>(null);
private final MutableLiveData<String> advertisedCarName = new MutableLiveData<>(null);
private final MutableLiveData<String> pairingCode = new MutableLiveData<>(null);
- private final MutableLiveData<AssociatedDevice> deviceToRemove = new MutableLiveData<>(null);
private final MutableLiveData<Integer> bluetoothState =
new MutableLiveData<>(BluetoothAdapter.STATE_OFF);
private final MutableLiveData<AssociationState> associationState =
new MutableLiveData<>(AssociationState.NONE);
private final MutableLiveData<AssociatedDevice> removedDevice = new MutableLiveData<>(null);
- private final MutableLiveData<Boolean> isFinished = new MutableLiveData<>(false);
+ private final MutableLiveData<Boolean> isServiceDisconnected = new MutableLiveData<>(false);
+ private final boolean isSppEnabled;
+ private final BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
- public AssociatedDeviceViewModel(@NonNull Application application) {
+ public AssociatedDeviceViewModel(@NonNull Application application, boolean isSppEnabled) {
super(application);
+ this.isSppEnabled = isSppEnabled;
Intent intent = new Intent(getApplication(), ConnectedDeviceService.class);
intent.setAction(ACTION_BIND_ASSOCIATION);
getApplication().bindService(intent, connection, Context.BIND_AUTO_CREATE);
- BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
- if (adapter != null) {
- bluetoothState.postValue(adapter.getState());
+ if (bluetoothAdapter != null) {
+ bluetoothState.postValue(bluetoothAdapter.getState());
+ }
+ }
+
+ @VisibleForTesting
+ AssociatedDeviceViewModel(
+ @NonNull Application application,
+ IAssociatedDeviceManager associatedDeviceManager,
+ boolean isSppEnabled) {
+ super(application);
+ this.isSppEnabled = isSppEnabled;
+ this.associatedDeviceManager = associatedDeviceManager;
+ bluetoothState.postValue(BluetoothAdapter.STATE_ON);
+ try {
+ registerCallbacks();
+ setConnectedDevices(associatedDeviceManager.getActiveUserConnectedDevices());
+ associatedDeviceManager.retrievedActiveUserAssociatedDevices(
+ associatedDevicesRetrievedListener);
+ } catch (RemoteException e) {
+ loge(TAG, "Initial setup failed.", e);
}
}
@@ -139,18 +158,13 @@ public class AssociatedDeviceViewModel extends AndroidViewModel {
associationState.postValue(AssociationState.NONE);
}
- /** Retry association. */
+ /** Retries association. */
public void retryAssociation() {
stopAssociation();
startAssociation();
}
- /** Select the current associated device as the device to remove. */
- public void selectCurrentDeviceToRemove() {
- deviceToRemove.postValue(getAssociatedDevice());
- }
-
- /** Remove the current associated device. */
+ /** Removes the current associated device. */
public void removeCurrentDevice() {
AssociatedDevice device = getAssociatedDevice();
if (device == null) {
@@ -163,7 +177,7 @@ public class AssociatedDeviceViewModel extends AndroidViewModel {
}
}
- /** Toggle connection on the current associated device. */
+ /** Toggles connection on the current associated device. */
public void toggleConnectionStatusForCurrentDevice() {
AssociatedDevice device = getAssociatedDevice();
if (device == null) {
@@ -180,12 +194,12 @@ public class AssociatedDeviceViewModel extends AndroidViewModel {
}
}
- /** Get the associated device details. */
- public MutableLiveData<AssociatedDeviceDetails> getDeviceDetails() {
- return deviceDetails;
+ /** Gets the associated device details. */
+ public LiveData<AssociatedDeviceDetails> getCurrentDeviceDetails() {
+ return currentDeviceDetails;
}
- /** Start feature activity for the current associated device. */
+ /** Starts feature activity for the current associated device. */
public void startFeatureActivityForCurrentDevice(@NonNull String action) {
AssociatedDevice device = getAssociatedDevice();
if (device == null || action == null) {
@@ -196,62 +210,53 @@ public class AssociatedDeviceViewModel extends AndroidViewModel {
getApplication().startActivityAsUser(intent, UserHandle.of(ActivityManager.getCurrentUser()));
}
- /** Reset the value of {@link #associationState} to {@link AssociationState.NONE}. */
+ /** Resets the value of {@link #associationState} to {@link AssociationState.NONE}. */
public void resetAssociationState() {
associationState.postValue(AssociationState.NONE);
}
- /** Get the associated device to remove. The associated device could be null. */
- public LiveData<AssociatedDevice> getDeviceToRemove() {
- return deviceToRemove;
- }
-
- /** Get the name that is being advertised by the car. */
- public MutableLiveData<String> getAdvertisedCarName() {
+ /** Gets the name that is being advertised by the car. */
+ public LiveData<String> getAdvertisedCarName() {
return advertisedCarName;
}
- /** Get the generated pairing code. */
- public MutableLiveData<String> getPairingCode() {
+ /** Gets the generated pairing code. */
+ public LiveData<String> getPairingCode() {
return pairingCode;
}
/** Value is {@code true} if the current associated device has been removed. */
- public MutableLiveData<AssociatedDevice> getRemovedDevice() {
+ public LiveData<AssociatedDevice> getRemovedDevice() {
return removedDevice;
}
- /** Get the current {@link AssociationState}. */
+ /** Gets the current {@link AssociationState}. */
public MutableLiveData<AssociationState> getAssociationState() {
return associationState;
}
- /** Get the current Bluetooth state. */
- public MutableLiveData<Integer> getBluetoothState() {
+ /** Gets the current Bluetooth state. */
+ public LiveData<Integer> getBluetoothState() {
return bluetoothState;
}
- /** Value is {@code true} if IHU is not in association and has no associated device. */
- public MutableLiveData<Boolean> isFinished() {
- return isFinished;
+ /** Value is {@code true} if the service connection is lost. */
+ public LiveData<Boolean> isServiceDisconnected() {
+ return isServiceDisconnected;
}
- protected void startAssociation() {
+ /** Starts adding associated device. */
+ public void startAssociation() {
if (associatedDeviceManager == null) {
return;
}
associationState.postValue(AssociationState.PENDING);
- if (!BluetoothAdapter.getDefaultAdapter().isEnabled()) {
+ if (bluetoothAdapter == null || !bluetoothAdapter.isEnabled()) {
return;
}
try {
- boolean isSppEnabled =
- getApplication()
- .getApplicationContext()
- .getResources()
- .getBoolean(R.bool.enable_spp_support);
if (isSppEnabled
- && BluetoothAdapter.getDefaultAdapter().getScanMode()
+ && bluetoothAdapter.getScanMode()
!= BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
Intent discoverableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE);
discoverableIntent.putExtra(
@@ -279,7 +284,8 @@ public class AssociatedDeviceViewModel extends AndroidViewModel {
if (device == null) {
return;
}
- deviceDetails.postValue(new AssociatedDeviceDetails(getAssociatedDevice(), isConnected()));
+ currentDeviceDetails.postValue(
+ new AssociatedDeviceDetails(getAssociatedDevice(), isConnected()));
}
@Nullable
@@ -300,25 +306,27 @@ public class AssociatedDeviceViewModel extends AndroidViewModel {
}
private void setAssociatedDevices(@NonNull List<AssociatedDevice> associatedDevices) {
- this.associatedDevices = associatedDevices;
+ this.associatedDevices.clear();
+ this.associatedDevices.addAll(associatedDevices);
updateDeviceDetails();
}
private void setConnectedDevices(@NonNull List<ConnectedDevice> connectedDevices) {
- this.connectedDevices = connectedDevices;
+ this.connectedDevices.clear();
+ this.connectedDevices.addAll(connectedDevices);
updateDeviceDetails();
}
private void addOrUpdateAssociatedDevice(@NonNull AssociatedDevice device) {
- associatedDevices.removeIf(d -> d.getDeviceId().equals(device.getDeviceId()));
+ associatedDevices.remove(device);
associatedDevices.add(device);
updateDeviceDetails();
}
private void removeAssociatedDevice(AssociatedDevice device) {
- if (associatedDevices.removeIf(d -> d.getDeviceId().equals(device.getDeviceId()))) {
+ if (associatedDevices.remove(device)) {
removedDevice.postValue(device);
- deviceDetails.postValue(null);
+ currentDeviceDetails.postValue(null);
}
}
@@ -334,30 +342,6 @@ public class AssociatedDeviceViewModel extends AndroidViewModel {
associatedDeviceManager.clearConnectionCallback();
}
- private void retrieveAssociatedDevicesOnConnection() {
- AssociationState state = associationState.getValue();
- Executors.newSingleThreadExecutor()
- .execute(
- () -> {
- try {
- List<AssociatedDevice> devices =
- associatedDeviceManager.getActiveUserAssociatedDevices();
- Handler mainHandler = new Handler(Looper.getMainLooper());
- mainHandler.post(
- () -> {
- setAssociatedDevices(devices);
- if (devices.isEmpty()
- && state != AssociationState.STARTING
- && state != AssociationState.STARTED) {
- startAssociation();
- }
- });
- } catch (RemoteException e) {
- loge(TAG, "Failed to retrieve associated devices.", e);
- }
- });
- }
-
private final ServiceConnection connection =
new ServiceConnection() {
@Override
@@ -366,10 +350,11 @@ public class AssociatedDeviceViewModel extends AndroidViewModel {
try {
registerCallbacks();
setConnectedDevices(associatedDeviceManager.getActiveUserConnectedDevices());
+ associatedDeviceManager.retrievedActiveUserAssociatedDevices(
+ associatedDevicesRetrievedListener);
} catch (RemoteException e) {
loge(TAG, "Initial set failed onServiceConnected", e);
}
- retrieveAssociatedDevicesOnConnection();
logd(TAG, "Service connected:" + name.getClassName());
IntentFilter filter = new IntentFilter();
filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
@@ -380,7 +365,7 @@ public class AssociatedDeviceViewModel extends AndroidViewModel {
public void onServiceDisconnected(ComponentName name) {
associatedDeviceManager = null;
logd(TAG, "Service disconnected: " + name.getClassName());
- isFinished.postValue(true);
+ isServiceDisconnected.postValue(true);
}
};
@@ -425,6 +410,20 @@ public class AssociatedDeviceViewModel extends AndroidViewModel {
}
};
+ private final IOnAssociatedDevicesRetrievedListener associatedDevicesRetrievedListener =
+ new IOnAssociatedDevicesRetrievedListener.Stub() {
+ @Override
+ public void onAssociatedDevicesRetrieved(List<AssociatedDevice> devices) {
+ setAssociatedDevices(devices);
+ AssociationState state = associationState.getValue();
+ if (devices.isEmpty()
+ && state != AssociationState.STARTING
+ && state != AssociationState.STARTED) {
+ startAssociation();
+ }
+ }
+ };
+
private final IDeviceAssociationCallback deviceAssociationCallback =
new IDeviceAssociationCallback.Stub() {
@Override
@@ -452,8 +451,8 @@ public class AssociatedDeviceViewModel extends AndroidViewModel {
}
@Override
- public void onDeviceDisconnected(ConnectedDevice companionDevice) {
- connectedDevices.removeIf(d -> d.getDeviceId().equals(companionDevice.getDeviceId()));
+ public void onDeviceDisconnected(ConnectedDevice connectedDevice) {
+ connectedDevices.remove(connectedDevice);
updateDeviceDetails();
}
};
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/service/AssociatedDeviceViewModelFactory.java b/libs/connecteddevice/src/com/google/android/connecteddevice/service/AssociatedDeviceViewModelFactory.java
new file mode 100644
index 0000000..afc8f17
--- /dev/null
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/service/AssociatedDeviceViewModelFactory.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.connecteddevice.service;
+
+import android.app.Application;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.annotation.NonNull;
+
+/** Factory class for an {@link AssociatedDeviceViewModel}. */
+public class AssociatedDeviceViewModelFactory implements ViewModelProvider.Factory {
+ private final Application application;
+ private final boolean isSppEnabled;
+
+ public AssociatedDeviceViewModelFactory(Application application, boolean isSppEnabled) {
+ this.application = application;
+ this.isSppEnabled = isSppEnabled;
+ }
+
+ @NonNull
+ @Override
+ public <T extends ViewModel> T create(@NonNull Class<T> aClass) {
+ return aClass.cast(new AssociatedDeviceViewModel(application, isSppEnabled));
+ }
+}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/service/AssociationBinder.java b/libs/connecteddevice/src/com/google/android/connecteddevice/service/AssociationBinder.java
index 58a8f7d..a4cbcfc 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/service/AssociationBinder.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/service/AssociationBinder.java
@@ -19,43 +19,42 @@ package com.google.android.connecteddevice.service;
import static com.google.android.connecteddevice.util.SafeLog.loge;
import static com.google.android.connecteddevice.util.SafeLog.logw;
-import android.os.Looper;
import android.os.RemoteException;
-import androidx.annotation.WorkerThread;
import com.google.android.connecteddevice.ConnectedDeviceManager;
import com.google.android.connecteddevice.ConnectedDeviceManager.DeviceAssociationCallback;
import com.google.android.connecteddevice.api.IAssociatedDeviceManager;
import com.google.android.connecteddevice.api.IAssociationCallback;
import com.google.android.connecteddevice.api.IConnectionCallback;
import com.google.android.connecteddevice.api.IDeviceAssociationCallback;
+import com.google.android.connecteddevice.api.IOnAssociatedDevicesRetrievedListener;
import com.google.android.connecteddevice.connection.AssociationCallback;
import com.google.android.connecteddevice.model.AssociatedDevice;
import com.google.android.connecteddevice.model.ConnectedDevice;
import com.google.android.connecteddevice.model.OobEligibleDevice;
+import com.google.android.connecteddevice.storage.ConnectedDeviceStorage.OnAssociatedDevicesRetrievedListener;
import com.google.android.connecteddevice.util.RemoteCallbackBinder;
import java.util.List;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
-/** Binder for exposing connected device association actions to internal features. */
+/** Binder for exposing associated device actions to internal features. */
public class AssociationBinder extends IAssociatedDeviceManager.Stub {
private static final String TAG = "AssociationBinder";
private final ConnectedDeviceManager connectedDeviceManager;
/**
- * {@link #remoteAssociationCallbackBinder} and {@link #iAssociationCallback} can only be
- * modified together through {@link #setAssociationCallback(IAssociationCallback)} or {@link
+ * {@link #remoteAssociationCallbackBinder} and {@link #iAssociationCallback} can only be modified
+ * together through {@link #setAssociationCallback(IAssociationCallback)} or {@link
* #clearAssociationCallback()} from the association thread.
*/
private RemoteCallbackBinder remoteAssociationCallbackBinder;
private IAssociationCallback iAssociationCallback;
/**
- * {@link #remoteDeviceAssociationCallbackBinder} and {@link #deviceAssociationCallback} can
- * only be modified together through {@link
- * #setDeviceAssociationCallback(IDeviceAssociationCallback)} or {@link
- * #clearDeviceAssociationCallback()} from the association thread.
+ * {@link #remoteDeviceAssociationCallbackBinder} and {@link #deviceAssociationCallback} can only
+ * be modified together through {@link #setDeviceAssociationCallback(IDeviceAssociationCallback)}
+ * or {@link #clearDeviceAssociationCallback()} from the association thread.
*/
private RemoteCallbackBinder remoteDeviceAssociationCallbackBinder;
@@ -108,8 +107,7 @@ public class AssociationBinder extends IAssociatedDeviceManager.Stub {
return;
}
- connectedDeviceManager.startOutOfBandAssociation(
- eligibleDevice, associationCallback);
+ connectedDeviceManager.startOutOfBandAssociation(eligibleDevice, associationCallback);
}
@Override
@@ -117,13 +115,18 @@ public class AssociationBinder extends IAssociatedDeviceManager.Stub {
connectedDeviceManager.stopAssociation(associationCallback);
}
- @WorkerThread
@Override
- public List<AssociatedDevice> getActiveUserAssociatedDevices() {
- if (Looper.myLooper() == Looper.getMainLooper()) {
- throw new IllegalThreadStateException("Calling thread cannot be the main thread.");
- }
- return connectedDeviceManager.getActiveUserAssociatedDevices();
+ public void retrievedActiveUserAssociatedDevices(
+ IOnAssociatedDevicesRetrievedListener remoteListener) {
+ OnAssociatedDevicesRetrievedListener listener =
+ devices -> {
+ try {
+ remoteListener.onAssociatedDevicesRetrieved(devices);
+ } catch (RemoteException exception) {
+ loge(TAG, "onAssociatedDevicesRetrieved failed.", exception);
+ }
+ };
+ connectedDeviceManager.retrieveActiveUserAssociatedDevices(listener);
}
@Override
@@ -169,8 +172,7 @@ public class AssociationBinder extends IAssociatedDeviceManager.Stub {
};
remoteDeviceAssociationCallbackBinder =
new RemoteCallbackBinder(callback.asBinder(), iBinder -> clearDeviceAssociationCallback());
- connectedDeviceManager.registerDeviceAssociationCallback(
- deviceAssociationCallback, executor);
+ connectedDeviceManager.registerDeviceAssociationCallback(deviceAssociationCallback, executor);
}
@Override
@@ -222,8 +224,7 @@ public class AssociationBinder extends IAssociatedDeviceManager.Stub {
};
remoteConnectionCallbackBinder =
new RemoteCallbackBinder(callback.asBinder(), iBinder -> clearConnectionCallback());
- connectedDeviceManager.registerActiveUserConnectionCallback(
- connectionCallback, executor);
+ connectedDeviceManager.registerActiveUserConnectionCallback(connectionCallback, executor);
}
@Override
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/service/ConnectedDeviceFgUserService.java b/libs/connecteddevice/src/com/google/android/connecteddevice/service/ConnectedDeviceFgUserService.java
index 900c6c6..7cc5e51 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/service/ConnectedDeviceFgUserService.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/service/ConnectedDeviceFgUserService.java
@@ -17,15 +17,28 @@
package com.google.android.connecteddevice.service;
import static com.google.android.connecteddevice.util.SafeLog.logd;
+import static com.google.android.connecteddevice.util.SafeLog.loge;
+import static com.google.android.connecteddevice.util.SafeLog.logw;
import android.content.BroadcastReceiver;
+import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.content.ServiceConnection;
+import android.os.Handler;
import android.os.IBinder;
+import android.os.Looper;
+import android.os.UserManager;
import androidx.annotation.Nullable;
+import com.google.android.connecteddevice.api.IConnectedDeviceManager;
+import com.google.android.connecteddevice.api.RemoteFeature;
-/** Service responsible for starting services that must be run in the active foreground user. */
+/**
+ * Service responsible for starting services that must be run in the active foreground user.
+ * External features running in the foreground user may bind with {@code ACTION_BIND_REMOTE_FEATURE}
+ * to access the {@link IConnectedDeviceManager} instance.
+ */
public final class ConnectedDeviceFgUserService extends TrunkService {
private static final String TAG = "ConnectedDeviceFgUserService";
@@ -34,31 +47,114 @@ public final class ConnectedDeviceFgUserService extends TrunkService {
private static final String META_UNLOCK_SERVICES =
"com.google.android.connecteddevice.unlock_services";
+ private static final String FULLY_QUALIFIED_SERVICE_NAME =
+ "com.google.android.connecteddevice.service.ConnectedDeviceService";
+
+ private static final long BIND_RETRY_DURATION_MS = 1000;
+
+ private static final int MAX_BIND_ATTEMPTS = 3;
+
+ private int bindAttempts;
+
+ private IBinder connectedDeviceBinder;
+
@Override
public void onCreate() {
super.onCreate();
logd(TAG, "Starting service.");
- registerReceiver(userPresentReceiver, new IntentFilter(Intent.ACTION_USER_PRESENT));
+ // Listen to the unlock event to know when a new user has come to the foreground and storage is
+ // unlocked.
+ registerReceiver(userUnlockedReceiver, new IntentFilter(Intent.ACTION_USER_UNLOCKED));
+ // Listen for user going to the background so we can clean up.
+ registerReceiver(userBackgroundReceiver, new IntentFilter(Intent.ACTION_USER_BACKGROUND));
+ bindToService();
+ UserManager userManager = getSystemService(UserManager.class);
+ if (userManager.isUserUnlocked()) {
+ logd(TAG, "User was already unlocked on service start.");
+ onUserUnlocked();
+ }
}
@Override
public void onDestroy() {
- unregisterReceiver(userPresentReceiver);
+ unregisterReceiver(userUnlockedReceiver);
+ unregisterReceiver(userBackgroundReceiver);
+ logd(TAG, "Service was destroyed.");
super.onDestroy();
}
@Nullable
@Override
public IBinder onBind(Intent intent) {
+ if (intent == null || intent.getAction() == null) {
+ return null;
+ }
+
+ String action = intent.getAction();
+ logd(TAG, "Service bound. Action: " + action);
+ if (action.equals(RemoteFeature.ACTION_BIND_REMOTE_FEATURE)) {
+ return connectedDeviceBinder;
+ }
+
return null;
}
- private final BroadcastReceiver userPresentReceiver =
+ private void bindToService() {
+ String packageName = getApplicationContext().getPackageName();
+ Intent intent = new Intent();
+ intent.setComponent(new ComponentName(packageName, FULLY_QUALIFIED_SERVICE_NAME));
+ intent.setAction(RemoteFeature.ACTION_BIND_REMOTE_FEATURE);
+ boolean success = bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
+ if (success) {
+ return;
+ }
+ bindAttempts++;
+ if (bindAttempts > MAX_BIND_ATTEMPTS) {
+ loge(
+ TAG,
+ "Failed to bind to ConnectedDeviceService after "
+ + bindAttempts
+ + " attempts. Aborting.");
+ return;
+ }
+ logw(TAG, "Unable to bind to ConnectedDeviceService. Trying again.");
+ new Handler(Looper.getMainLooper()).postDelayed(this::bindToService, BIND_RETRY_DURATION_MS);
+ }
+
+ private void onUserUnlocked() {
+ logd(TAG, "Starting unlock branch services.");
+ startBranchServices(META_UNLOCK_SERVICES);
+ }
+
+ private final ServiceConnection serviceConnection =
+ new ServiceConnection() {
+ @Override
+ public void onServiceConnected(ComponentName name, IBinder service) {
+ logd(TAG, "Successfully bound to ConnectedDeviceService.");
+ connectedDeviceBinder = service;
+ }
+
+ @Override
+ public void onServiceDisconnected(ComponentName name) {
+ logd(TAG, "Disconnected from ConnectedDeviceService.");
+ }
+ };
+
+ private final BroadcastReceiver userUnlockedReceiver =
new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
- logd(TAG, "User has unlocked. Starting unlock branch services.");
- startBranchServices(META_UNLOCK_SERVICES);
+ logd(TAG, "User has been unlocked.");
+ onUserUnlocked();
}
};
+
+ private final BroadcastReceiver userBackgroundReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ logd(TAG, "User has been placed into the background. Stopping foreground user services.");
+ stopBranchServices();
+ stopSelf();
+ }
+ };
}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/service/ConnectedDeviceService.java b/libs/connecteddevice/src/com/google/android/connecteddevice/service/ConnectedDeviceService.java
index 732b77f..6da1010 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/service/ConnectedDeviceService.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/service/ConnectedDeviceService.java
@@ -38,6 +38,7 @@ import com.google.android.connecteddevice.connection.ble.CarBlePeripheralManager
import com.google.android.connecteddevice.connection.ble.OnDeviceBlePeripheralManager;
import com.google.android.connecteddevice.connection.spp.CarSppManager;
import com.google.android.connecteddevice.logging.LoggingManager;
+import com.google.android.connecteddevice.oob.BluetoothRfcommChannel;
import com.google.android.connecteddevice.storage.ConnectedDeviceStorage;
import com.google.android.connecteddevice.transport.proxy.ProxyBlePeripheralManager;
import com.google.android.connecteddevice.transport.spp.ConnectedDeviceSppDelegateBinder;
@@ -62,9 +63,8 @@ public final class ConnectedDeviceService extends TrunkService {
// reconnect advertisement every 6 minutes to avoid crossing a rotation.
private static final Duration MAX_ADVERTISEMENT_DURATION = Duration.ofMinutes(6);
- /** {@code boolean} Enable SPP transport. */
- private static final String META_ENABLE_SPP_SUPPORT =
- "com.google.android.connecteddevice.enable_spp_support";
+ /** {@code boolean} Enable SPP. */
+ private static final String META_ENABLE_SPP = "com.google.android.connecteddevice.enable_spp";
/** {@code String} UUID for SPP server. */
private static final String META_SPP_SERVICE_UUID =
"com.google.android.connecteddevice.spp_service_uuid";
@@ -157,7 +157,7 @@ public final class ConnectedDeviceService extends TrunkService {
super.onCreate();
logd(TAG, "Service created.");
EventLog.onServiceStarted();
- boolean isSppSupported = getMetaBoolean(META_ENABLE_SPP_SUPPORT, SPP_ENABLED_BY_DEFAULT);
+ boolean isSppSupported = getMetaBoolean(META_ENABLE_SPP, SPP_ENABLED_BY_DEFAULT);
ConnectedDeviceStorage storage = new ConnectedDeviceStorage(this);
boolean isCompressionEnabled =
@@ -233,7 +233,8 @@ public final class ConnectedDeviceService extends TrunkService {
readUuid,
MAX_ADVERTISEMENT_DURATION,
defaultMtuSize,
- isCompressionEnabled);
+ isCompressionEnabled,
+ new BluetoothRfcommChannel(sppDelegateBinder));
}
@Override
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/service/SppService.java b/libs/connecteddevice/src/com/google/android/connecteddevice/service/SppService.java
index acdb6e7..b39433d 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/service/SppService.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/service/SppService.java
@@ -155,6 +155,9 @@ public class SppService extends Service {
for (SppManager manager : activeConnections.values()) {
manager.cleanup();
}
+ for (SppManager manager : pendingConnections.values()) {
+ manager.cleanup();
+ }
activeConnections.clear();
pendingConnections.clear();
if (delegate == null) {
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/service/TrunkService.java b/libs/connecteddevice/src/com/google/android/connecteddevice/service/TrunkService.java
index a0cccb7..5617a8b 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/service/TrunkService.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/service/TrunkService.java
@@ -31,6 +31,8 @@ import androidx.annotation.NonNull;
import com.google.common.collect.HashMultiset;
import com.google.common.collect.Multiset;
import java.time.Duration;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/** A service that is used to maintain the lifecycle of branch services. */
public abstract class TrunkService extends MetaDataService {
@@ -47,6 +49,9 @@ public abstract class TrunkService extends MetaDataService {
private final Multiset<String> bindAttempts = HashMultiset.create();
+ @SuppressWarnings("AndroidConcurrentHashMap")
+ private final Map<ComponentName, ServiceConnection> startedServices = new ConcurrentHashMap<>();
+
@Override
public void onCreate() {
super.onCreate();
@@ -74,12 +79,23 @@ public abstract class TrunkService extends MetaDataService {
}
}
+ /** Stop all branch services that have been started by this service. */
+ protected final void stopBranchServices() {
+ logd(TAG, "Stopping connected branch services.");
+ for (Map.Entry<ComponentName, ServiceConnection> connection : startedServices.entrySet()) {
+ ComponentName name = connection.getKey();
+ ServiceConnection serviceConnection = connection.getValue();
+ logd(TAG, "Attempting to stop " + name.flattenToString());
+ unbindService(serviceConnection);
+ }
+ }
+
private void bindToService(@NonNull ComponentName componentName) {
Intent intent = new Intent();
intent.setComponent(componentName);
String flatComponentName = componentName.flattenToString();
- logd(TAG, "Attempting to start " + flatComponentName + ".");
- boolean success = bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
+ boolean success = bindService(intent, createServiceConnection(), Context.BIND_AUTO_CREATE);
+ logd(TAG, "Attempted to start " + flatComponentName + " with success: " + success + ".");
if (success) {
bindAttempts.remove(flatComponentName);
return;
@@ -97,18 +113,29 @@ public abstract class TrunkService extends MetaDataService {
.postDelayed(() -> bindToService(componentName), BIND_RETRY_DURATION.toMillis());
}
- private final ServiceConnection serviceConnection =
- new ServiceConnection() {
- @Override
- public void onServiceConnected(ComponentName name, IBinder service) {
- logd(TAG, name.flattenToString() + " started successfully.");
- }
-
- @Override
- public void onServiceDisconnected(ComponentName name) {
- loge(TAG, "Lost connection to " + name.flattenToString() + ". Attempting to reconnect.");
- bindAttempts.setCount(name.flattenToString(), 0);
- bindToService(name);
- }
- };
+ private void onBranchServiceStarted(ComponentName name, ServiceConnection connection) {
+ logd(TAG, name.flattenToString() + " started successfully.");
+ startedServices.put(name, connection);
+ }
+
+ private ServiceConnection createServiceConnection() {
+ return new ServiceConnection() {
+ @Override
+ public void onServiceConnected(ComponentName name, IBinder service) {
+ onBranchServiceStarted(name, this);
+ }
+
+ @Override
+ public void onServiceDisconnected(ComponentName name) {
+ loge(TAG, "Lost connection to " + name.flattenToString() + ". Attempting to reconnect.");
+ bindAttempts.setCount(name.flattenToString(), 0);
+ bindToService(name);
+ }
+
+ @Override
+ public void onNullBinding(ComponentName name) {
+ onBranchServiceStarted(name, this);
+ }
+ };
+ }
}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/storage/ConnectedDeviceStorage.java b/libs/connecteddevice/src/com/google/android/connecteddevice/storage/ConnectedDeviceStorage.java
index 88755f0..8920dd6 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/storage/ConnectedDeviceStorage.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/storage/ConnectedDeviceStorage.java
@@ -43,7 +43,6 @@ public class ConnectedDeviceStorage {
private static final String SHARED_PREFS_NAME = "com.google.android.connecteddevice";
private static final String UNIQUE_ID_KEY = "CTABM_unique_id";
- private static final String BT_NAME_KEY = "CTABM_bt_name";
private static final String DATABASE_NAME = "connected-device-database";
private static final String CHALLENGE_HASHING_ALGORITHM = "HmacSHA256";
@@ -195,8 +194,7 @@ public class ConnectedDeviceStorage {
if (sharedPreferences != null) {
return sharedPreferences;
}
- sharedPreferences =
- context.getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE);
+ sharedPreferences = context.getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE);
return sharedPreferences;
}
@@ -227,22 +225,6 @@ public class ConnectedDeviceStorage {
return uniqueId;
}
- /** Store the current bluetooth adapter name. */
- public void storeBluetoothName(@NonNull String name) {
- getSharedPrefs().edit().putString(BT_NAME_KEY, name).apply();
- }
-
- /** Get the previously stored bluetooth adapter name or {@code null} if not found. */
- @Nullable
- public String getStoredBluetoothName() {
- return getSharedPrefs().getString(BT_NAME_KEY, null);
- }
-
- /** Remove the previously stored bluetooth adapter name from storage. */
- public void removeStoredBluetoothName() {
- getSharedPrefs().edit().remove(BT_NAME_KEY).apply();
- }
-
/**
* Get a list of associated devices for the given user.
*
@@ -295,6 +277,16 @@ public class ConnectedDeviceStorage {
}
/**
+ * Retrieves devices associated with the active user.
+ *
+ * @param listener {@link OnAssociatedDevicesRetrievedListener} that will be notified when devices
+ * are retrieved.
+ */
+ public void retrieveForActiveUserAssociatedDevice(OnAssociatedDevicesRetrievedListener listener) {
+ listener.onAssociatedDevicesRetrieved(getActiveUserAssociatedDevices());
+ }
+
+ /**
* Returns a list of device ids of associated devices for the current user.
*
* @return List of device ids.
@@ -430,4 +422,11 @@ public class ConnectedDeviceStorage {
/** Triggered when an associated device has been updated. */
void onAssociatedDeviceUpdated(@NonNull AssociatedDevice device);
}
+
+ /** Listener for retrieving devices associated with the active user. */
+ public interface OnAssociatedDevicesRetrievedListener {
+
+ /** Triggered when the devices associated with the active user are retrieved. */
+ void onAssociatedDevicesRetrieved(List<AssociatedDevice> devices);
+ }
}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/transport/spp/ConnectTask.java b/libs/connecteddevice/src/com/google/android/connecteddevice/transport/spp/ConnectTask.java
index 1f6b01c..7427d64 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/transport/spp/ConnectTask.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/transport/spp/ConnectTask.java
@@ -31,7 +31,10 @@ import java.util.UUID;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
-/** This task runs when sending a connection request to remote device. */
+/**
+ * This task runs when always trying sending connection request to remote device until the task is
+ * cancelled or connection succeed.
+ */
class ConnectTask implements Runnable {
private static final String TAG = "ConnectTask";
private final Callback callback;
@@ -61,29 +64,28 @@ class ConnectTask implements Runnable {
public void run() {
if (socket == null) {
loge(TAG, "Socket is null, can not begin ConnectTask");
- callbackExecutor.execute(callback::onConnectionAttemptFailed);
+ // Do not trigger attempt failed callback when the task is cancelled intentionally.
+ if (!isCanceled.get()) {
+ callbackExecutor.execute(callback::onConnectionAttemptFailed);
+ }
return;
}
-
+ boolean isConnected = false;
logi(TAG, "Begin ConnectTask.");
// Always cancel discovery because it will slow down a connection
BluetoothAdapter.getDefaultAdapter().cancelDiscovery();
-
- try {
- // This is a blocking call and will only return on a successful connection or an exception
- socket.connect();
- } catch (IOException e) {
- loge(TAG, "Exception when connecting to device.", e);
-
- // Do not trigger attempt failed callback when the task is cancelled intentionally.
- if (!isCanceled.get()) {
- callbackExecutor.execute(callback::onConnectionAttemptFailed);
+ while (!isConnected && !isCanceled.get()) {
+ try {
+ // This is a blocking call and will only return on a successful connection or an exception
+ socket.connect();
+ } catch (IOException e) {
+ logi(TAG, "Exception when connecting to device, retry...");
+ continue;
}
- return;
+ isConnected = true;
}
-
- if (!isCanceled.get()) {
+ if (!isCanceled.get() && isConnected) {
callbackExecutor.execute(() -> callback.onConnectionSuccess(socket));
}
}
@@ -93,7 +95,7 @@ class ConnectTask implements Runnable {
*/
@SuppressWarnings("ObjectToString")
public void cancel() {
- logd(TAG, "CANCEL ConnectTask. Current socket: " + socket);
+ logd(TAG, "CANCEL ConnectTask.");
if (isCanceled.getAndSet(true)) {
logw(TAG, "Task already canceled. Ignoring.");
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/transport/spp/ReadMessageTask.java b/libs/connecteddevice/src/com/google/android/connecteddevice/transport/spp/ReadMessageTask.java
index 166a105..bbc70f9 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/transport/spp/ReadMessageTask.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/transport/spp/ReadMessageTask.java
@@ -19,6 +19,7 @@ package com.google.android.connecteddevice.transport.spp;
import static com.google.android.connecteddevice.util.SafeLog.logd;
import static com.google.android.connecteddevice.util.SafeLog.loge;
import static com.google.android.connecteddevice.util.SafeLog.logi;
+import static com.google.android.connecteddevice.util.SafeLog.logw;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
@@ -86,7 +87,7 @@ class ReadMessageTask implements Runnable {
try {
bytesRead = inputStream.read(buffer, offset, bytesToRead);
} catch (IOException e) {
- loge(TAG, "Encountered an exception when listening for incoming message.", e);
+ logw(TAG, "Encountered an exception when listening for incoming message.");
return false;
}
if (bytesRead == -1) {
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/transport/spp/SppManager.java b/libs/connecteddevice/src/com/google/android/connecteddevice/transport/spp/SppManager.java
index df07114..172537f 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/transport/spp/SppManager.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/transport/spp/SppManager.java
@@ -18,6 +18,7 @@ package com.google.android.connecteddevice.transport.spp;
import static com.google.android.connecteddevice.util.SafeLog.logd;
import static com.google.android.connecteddevice.util.SafeLog.loge;
+import static com.google.android.connecteddevice.util.SafeLog.logw;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
@@ -33,6 +34,7 @@ import java.io.InputStream;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.UUID;
+import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -65,6 +67,8 @@ public class SppManager {
private final ExecutorService writeExecutor = Executors.newSingleThreadExecutor();
private final Executor taskCallbackExecutor;
private BluetoothDevice device;
+ // Only the first registered {@code OnMessageReceivedListener} will receive the missed messages.
+ private final ConcurrentLinkedQueue<byte[]> missedMessages = new ConcurrentLinkedQueue<>();
@GuardedBy("lock")
@VisibleForTesting
@@ -120,6 +124,16 @@ public class SppManager {
public void addOnMessageReceivedListener(
@NonNull OnMessageReceivedListener listener, @NonNull Executor executor) {
receivedListeners.add(listener, executor);
+ while (!missedMessages.isEmpty()) {
+ logd(
+ TAG,
+ "OnMessageReceivedListener registered, poll missed message, current missed messages size"
+ + " is "
+ + missedMessages.size());
+ byte[] missedMessage = missedMessages.poll();
+ receivedListeners.invoke(
+ receivedListener -> receivedListener.onMessageReceived(device, missedMessage));
+ }
}
/**
@@ -183,7 +197,6 @@ public class SppManager {
return;
}
- // TODO(b/162537040): add retry logic for SPP
logd(TAG, "Attempting connect to remote device: " + device.getAddress());
// Start the task to connect with the given device
@@ -377,6 +390,15 @@ public class SppManager {
new ReadMessageTask.Callback() {
@Override
public void onMessageReceived(byte[] message) {
+ if (receivedListeners.size() == 0) {
+ missedMessages.add(message);
+ logw(
+ TAG,
+ "Receive message with size "
+ + message.length
+ + " while no listener registered, storing the message");
+ return;
+ }
receivedListeners.invoke(listener -> listener.onMessageReceived(device, message));
}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/trust/TrustedDeviceManager.java b/libs/connecteddevice/src/com/google/android/connecteddevice/trust/TrustedDeviceManager.java
index d926e34..309940b 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/trust/TrustedDeviceManager.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/trust/TrustedDeviceManager.java
@@ -28,11 +28,13 @@ import android.os.RemoteCallbackList;
import android.os.RemoteException;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
import com.google.android.connecteddevice.api.IConnectedDeviceManager;
import com.google.android.connecteddevice.api.IDeviceAssociationCallback;
import com.google.android.connecteddevice.model.AssociatedDevice;
import com.google.android.connecteddevice.model.ConnectedDevice;
import com.google.android.connecteddevice.trust.api.IOnTrustedDeviceEnrollmentNotificationRequestListener;
+import com.google.android.connecteddevice.trust.api.IOnTrustedDevicesRetrievedListener;
import com.google.android.connecteddevice.trust.api.ITrustedDeviceAgentDelegate;
import com.google.android.connecteddevice.trust.api.ITrustedDeviceCallback;
import com.google.android.connecteddevice.trust.api.ITrustedDeviceEnrollmentCallback;
@@ -81,9 +83,9 @@ public class TrustedDeviceManager extends ITrustedDeviceManager.Stub {
private final TrustedDeviceFeature trustedDeviceFeature;
- private final Executor executor = Executors.newSingleThreadExecutor();
+ private final Executor databaseExecutor = Executors.newSingleThreadExecutor();
- private final Executor remoteCallbackListExecutor = Executors.newSingleThreadExecutor();
+ private final Executor remoteCallbackExecutor = Executors.newSingleThreadExecutor();
private final AtomicBoolean isWaitingForCredentials = new AtomicBoolean(false);
@@ -214,7 +216,7 @@ public class TrustedDeviceManager extends ITrustedDeviceManager.Stub {
entity.userId = userId;
entity.handle = handle;
- Executors.newSingleThreadExecutor().execute(() -> database.addOrReplaceTrustedDevice(entity));
+ databaseExecutor.execute(() -> database.addOrReplaceTrustedDevice(entity));
pendingDevice = null;
@@ -242,20 +244,16 @@ public class TrustedDeviceManager extends ITrustedDeviceManager.Stub {
}
@Override
- public List<TrustedDevice> getTrustedDevicesForActiveUser() {
- List<TrustedDeviceEntity> foundEntities =
- database.getTrustedDevicesForUser(ActivityManager.getCurrentUser());
-
- List<TrustedDevice> trustedDevices = new ArrayList<>();
- if (foundEntities == null) {
- return trustedDevices;
- }
-
- for (TrustedDeviceEntity entity : foundEntities) {
- trustedDevices.add(entity.toTrustedDevice());
- }
-
- return trustedDevices;
+ public void retrieveTrustedDevicesForActiveUser(IOnTrustedDevicesRetrievedListener listener) {
+ databaseExecutor.execute(
+ () -> {
+ List<TrustedDevice> devices = getTrustedDevicesForActiveUser();
+ try {
+ listener.onTrustedDevicesRetrieved(devices);
+ } catch (RemoteException exception) {
+ loge(TAG, "Failed to notify that trusted devices are retrieved.", exception);
+ }
+ });
}
@Override
@@ -265,21 +263,25 @@ public class TrustedDeviceManager extends ITrustedDeviceManager.Stub {
return;
}
- try {
- trustAgentDelegate.removeEscrowToken(trustedDevice.getHandle(), trustedDevice.getUserId());
- database.removeTrustedDevice(new TrustedDeviceEntity(trustedDevice));
- } catch (RemoteException e) {
- loge(TAG, "Error while removing token through delegate.", e);
- return;
- }
- notifyRemoteCallbackList(
- remoteTrustedDeviceCallbacks,
- callback -> {
+ databaseExecutor.execute(
+ () -> {
try {
- callback.onTrustedDeviceRemoved(trustedDevice);
+ trustAgentDelegate.removeEscrowToken(
+ trustedDevice.getHandle(), trustedDevice.getUserId());
+ database.removeTrustedDevice(new TrustedDeviceEntity(trustedDevice));
} catch (RemoteException e) {
- loge(TAG, "Failed to notify that a trusted device has been removed.", e);
+ loge(TAG, "Error while removing token through delegate.", e);
+ return;
}
+ notifyRemoteCallbackList(
+ remoteTrustedDeviceCallbacks,
+ callback -> {
+ try {
+ callback.onTrustedDeviceRemoved(trustedDevice);
+ } catch (RemoteException e) {
+ loge(TAG, "Failed to notify that a trusted device has been removed.", e);
+ }
+ });
});
}
@@ -329,7 +331,7 @@ public class TrustedDeviceManager extends ITrustedDeviceManager.Stub {
remoteEnrollmentCallbacks.register(callback);
// A token has been added and is waiting on user credential validation.
if (isWaitingForCredentials.getAndSet(false)) {
- executor.execute(
+ remoteCallbackExecutor.execute(
() -> {
try {
callback.onValidateCredentialsRequest();
@@ -396,6 +398,23 @@ public class TrustedDeviceManager extends ITrustedDeviceManager.Stub {
this.trustAgentDelegate = null;
}
+ @WorkerThread
+ private List<TrustedDevice> getTrustedDevicesForActiveUser() {
+ List<TrustedDeviceEntity> foundEntities =
+ database.getTrustedDevicesForUser(ActivityManager.getCurrentUser());
+
+ List<TrustedDevice> trustedDevices = new ArrayList<>();
+ if (foundEntities == null) {
+ return trustedDevices;
+ }
+
+ for (TrustedDeviceEntity entity : foundEntities) {
+ trustedDevices.add(entity.toTrustedDevice());
+ }
+
+ return trustedDevices;
+ }
+
private static boolean areCredentialsValid(@Nullable PhoneCredentials credentials) {
return credentials != null;
}
@@ -425,8 +444,7 @@ public class TrustedDeviceManager extends ITrustedDeviceManager.Stub {
PhoneCredentials credentials = null;
try {
- credentials = PhoneCredentials.parseFrom(message,
- ExtensionRegistryLite.getEmptyRegistry());
+ credentials = PhoneCredentials.parseFrom(message, ExtensionRegistryLite.getEmptyRegistry());
} catch (InvalidProtocolBufferException e) {
loge(TAG, "Unable to parse credentials from device. Not unlocking head unit.");
return;
@@ -474,8 +492,8 @@ public class TrustedDeviceManager extends ITrustedDeviceManager.Stub {
}
TrustedDeviceError trustedDeviceError = null;
try {
- trustedDeviceError = TrustedDeviceError.parseFrom(payload,
- ExtensionRegistryLite.getEmptyRegistry());
+ trustedDeviceError =
+ TrustedDeviceError.parseFrom(payload, ExtensionRegistryLite.getEmptyRegistry());
} catch (InvalidProtocolBufferException e) {
loge(TAG, "Received error message from client, but cannot parse.", e);
notifyEnrollmentError(TrustedDeviceConstants.TRUSTED_DEVICE_ERROR_UNKNOWN);
@@ -511,15 +529,12 @@ public class TrustedDeviceManager extends ITrustedDeviceManager.Stub {
private <T extends IInterface> void notifyRemoteCallbackList(
RemoteCallbackList<T> remoteCallbackList, SafeConsumer<T> notification) {
- remoteCallbackListExecutor.execute(
- () -> {
- int num = remoteCallbackList.beginBroadcast();
- for (int i = 0; i < num; i++) {
- T callback = remoteCallbackList.getBroadcastItem(i);
- executor.execute(() -> notification.accept(callback));
- }
- remoteCallbackList.finishBroadcast();
- });
+ int num = remoteCallbackList.beginBroadcast();
+ for (int i = 0; i < num; i++) {
+ T callback = remoteCallbackList.getBroadcastItem(i);
+ remoteCallbackExecutor.execute(() -> notification.accept(callback));
+ }
+ remoteCallbackList.finishBroadcast();
}
private static byte[] createAcknowledgmentMessage() {
@@ -554,8 +569,7 @@ public class TrustedDeviceManager extends ITrustedDeviceManager.Stub {
TrustedDeviceMessage trustedDeviceMessage = null;
try {
trustedDeviceMessage =
- TrustedDeviceMessage.parseFrom(
- message, ExtensionRegistryLite.getEmptyRegistry());
+ TrustedDeviceMessage.parseFrom(message, ExtensionRegistryLite.getEmptyRegistry());
} catch (InvalidProtocolBufferException e) {
loge(TAG, "Received message from client, but cannot parse.", e);
return;
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/trust/TrustedDeviceUiDelegateService.java b/libs/connecteddevice/src/com/google/android/connecteddevice/trust/TrustedDeviceUiDelegateService.java
index f20321d..88d8759 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/trust/TrustedDeviceUiDelegateService.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/trust/TrustedDeviceUiDelegateService.java
@@ -77,8 +77,9 @@ public class TrustedDeviceUiDelegateService extends MetaDataService {
@Override
public void onDestroy() {
- super.onDestroy();
+ logd(TAG, "Service was destroyed.");
unregisterCallbacks();
+ super.onDestroy();
}
private void showEnrollmentNotification() {
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/trust/TrustedDeviceViewModel.java b/libs/connecteddevice/src/com/google/android/connecteddevice/trust/TrustedDeviceViewModel.java
index 576918e..c04301f 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/trust/TrustedDeviceViewModel.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/trust/TrustedDeviceViewModel.java
@@ -16,28 +16,80 @@
package com.google.android.connecteddevice.trust;
+import static com.google.android.connecteddevice.util.SafeLog.logd;
import static com.google.android.connecteddevice.util.SafeLog.loge;
+import android.app.Application;
+import android.app.KeyguardManager;
+import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
import android.os.RemoteException;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import com.google.android.connecteddevice.api.IDeviceAssociationCallback;
import com.google.android.connecteddevice.model.AssociatedDevice;
+import com.google.android.connecteddevice.model.ConnectedDevice;
+import com.google.android.connecteddevice.trust.api.IOnTrustedDevicesRetrievedListener;
+import com.google.android.connecteddevice.trust.api.ITrustedDeviceCallback;
+import com.google.android.connecteddevice.trust.api.ITrustedDeviceEnrollmentCallback;
import com.google.android.connecteddevice.trust.api.ITrustedDeviceManager;
import com.google.android.connecteddevice.trust.api.TrustedDevice;
import java.util.List;
-import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
/** ViewModel that powers the Trusted Device views. */
-public class TrustedDeviceViewModel extends ViewModel {
+public class TrustedDeviceViewModel extends AndroidViewModel {
private static final String TAG = "TrustedDeviceViewModel";
+ /** State of trusted device enrollment. */
+ public enum EnrollmentState {
+ NONE,
+ WAITING_FOR_PASSWORD_SETUP,
+ IN_PROGRESS,
+ CREDENTIAL_PENDING,
+ FINISHED,
+ NO_CONNECTION
+ }
+
+ private final AtomicBoolean hasPendingCredential = new AtomicBoolean(false);
private final MutableLiveData<List<TrustedDevice>> trustedDevices = new MutableLiveData<>();
private final MutableLiveData<AssociatedDevice> associatedDevice = new MutableLiveData<>(null);
- private final MutableLiveData<TrustedDevice> deviceToDisable = new MutableLiveData<>(null);
- private final MutableLiveData<AssociatedDevice> deviceToEnable = new MutableLiveData<>(null);
private final MutableLiveData<TrustedDevice> deviceDisabled = new MutableLiveData<>(null);
private final MutableLiveData<TrustedDevice> deviceEnabled = new MutableLiveData<>(null);
+ private final MutableLiveData<Integer> enrollmentError = new MutableLiveData<>(null);
+ private final MutableLiveData<EnrollmentState> enrollmentState =
+ new MutableLiveData<>(EnrollmentState.NONE);
+ private final MutableLiveData<Boolean> isCurrentAssociatedDeviceRemoved =
+ new MutableLiveData<>(false);
+
+ private ITrustedDeviceManager trustedDeviceManager;
+ private KeyguardManager keyguardManager;
+
+ public TrustedDeviceViewModel(@NonNull Application application) {
+ super(application);
+ Intent intent = new Intent(application, TrustedDeviceManagerService.class);
+ getApplication().bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
+ }
+
+ @VisibleForTesting
+ TrustedDeviceViewModel(
+ @NonNull Application application, @NonNull ITrustedDeviceManager trustedDeviceManager) {
+ super(application);
+ this.trustedDeviceManager = trustedDeviceManager;
+ try {
+ registerCallbacks();
+ trustedDeviceManager.retrieveTrustedDevicesForActiveUser(onTrustedDevicesRetrievedListener);
+ } catch (RemoteException e) {
+ loge(TAG, "Initial set up failed.", e);
+ }
+ }
/**
* Set trusted devices.
@@ -54,25 +106,7 @@ public class TrustedDeviceViewModel extends ViewModel {
* @param device Associated device.
*/
public void setAssociatedDevice(@NonNull AssociatedDevice device) {
- associatedDevice.setValue(device);
- }
-
- /**
- * Set the trusted device to disable.
- *
- * @param device The trusted device to disable.
- */
- public void setDeviceToDisable(TrustedDevice device) {
- deviceToDisable.setValue(device);
- }
-
- /**
- * Set the associated device to enroll.
- *
- * @param device The associated device to enroll.
- */
- public void setDeviceToEnable(AssociatedDevice device) {
- deviceToEnable.setValue(device);
+ associatedDevice.postValue(device);
}
/** Set the disabled trusted device. */
@@ -86,47 +120,261 @@ public class TrustedDeviceViewModel extends ViewModel {
}
/** Get trusted device list. It will return an empty list if there's no trusted device. */
- public MutableLiveData<List<TrustedDevice>> getTrustedDevices() {
+ public LiveData<List<TrustedDevice>> getTrustedDevices() {
return trustedDevices;
}
/** Get current associated device. */
- public MutableLiveData<AssociatedDevice> getAssociatedDevice() {
+ public LiveData<AssociatedDevice> getAssociatedDevice() {
return associatedDevice;
}
- /** Get the trusted device to disable. */
- public MutableLiveData<TrustedDevice> getDeviceToDisable() {
- return deviceToDisable;
- }
-
- /** Get the associated device to enroll. */
- public MutableLiveData<AssociatedDevice> getDeviceToEnable() {
- return deviceToEnable;
- }
-
/** Get the disabled trusted device. */
- public MutableLiveData<TrustedDevice> getDisabledDevice() {
+ public LiveData<TrustedDevice> getDisabledDevice() {
return deviceDisabled;
}
/** Get the enabled trusted device. */
- public MutableLiveData<TrustedDevice> getEnabledDevice() {
+ public LiveData<TrustedDevice> getEnabledDevice() {
return deviceEnabled;
}
- public void updateTrustedDevices(ITrustedDeviceManager trustedDeviceManager) {
- Executors.newSingleThreadExecutor()
- .execute(
- () -> {
- List<TrustedDevice> trustedDevices;
- try {
- trustedDevices = trustedDeviceManager.getTrustedDevicesForActiveUser();
- } catch (RemoteException e) {
- loge(TAG, "Error while retrieving trusted devices.");
- return;
- }
- setTrustedDevices(trustedDevices);
- });
+ /** Get enrollment state. */
+ public LiveData<EnrollmentState> getEnrollmentState() {
+ return enrollmentState;
+ }
+
+ /** Get enrollment error. */
+ public LiveData<Integer> getEnrollmentError() {
+ return enrollmentError;
+ }
+
+ /** Value is {@code true} if IHU has no associated device. */
+ public LiveData<Boolean> isCurrentAssociatedDeviceRemoved() {
+ return isCurrentAssociatedDeviceRemoved;
+ }
+
+ /** Resets enrollment state to {@link EnrollmentState#NONE}. */
+ public void resetEnrollmentState() {
+ enrollmentState.postValue(EnrollmentState.NONE);
+ }
+
+ public void processEnrollment() {
+ if (!isDeviceSecure()) {
+ enrollmentState.postValue(EnrollmentState.WAITING_FOR_PASSWORD_SETUP);
+ return;
+ }
+ if (hasPendingCredential.get()) {
+ enrollmentState.postValue(EnrollmentState.CREDENTIAL_PENDING);
+ return;
+ }
+ enrollmentState.postValue(EnrollmentState.IN_PROGRESS);
+ }
+
+ /**
+ * Enroll the given associated device as trusted device.
+ *
+ * @param device The associated device to be enrolled.
+ */
+ public void enrollTrustedDevice(AssociatedDevice device) {
+ attemptInitiatingEnrollment(device);
+ }
+
+ /**
+ * Disable the given trusted device.
+ *
+ * @param device The trusted device to disable.
+ */
+ public void disableTrustedDevice(TrustedDevice device) {
+ if (trustedDeviceManager == null) {
+ loge(TAG, "Failed to remove trusted device. service not connected.");
+ return;
+ }
+ try {
+ trustedDeviceManager.removeTrustedDevice(device);
+ } catch (RemoteException e) {
+ loge(TAG, "Failed to remove trusted device.", e);
+ }
+ }
+
+ /** Marks enrollment as finished. */
+ public void finishEnrollment() {
+ hasPendingCredential.set(false);
+ enrollmentState.postValue(EnrollmentState.FINISHED);
+ }
+
+ @Override
+ protected void onCleared() {
+ try {
+ unregisterCallbacks();
+ hasPendingCredential.set(false);
+ } catch (RemoteException e) {
+ loge(TAG, "Error clearing registered callbacks.", e);
+ }
+ getApplication().unbindService(serviceConnection);
+ trustedDeviceManager = null;
+ }
+
+ private void attemptInitiatingEnrollment(AssociatedDevice device) {
+ if (!isCompanionDeviceConnected(device.getDeviceId())) {
+ enrollmentState.postValue(EnrollmentState.NO_CONNECTION);
+ return;
+ }
+ try {
+ trustedDeviceManager.initiateEnrollment(device.getDeviceId());
+ } catch (RemoteException e) {
+ loge(TAG, "Failed to initiate enrollment. ", e);
+ }
+ }
+
+ private boolean isCompanionDeviceConnected(String deviceId) {
+ if (trustedDeviceManager == null) {
+ loge(
+ TAG,
+ "Failed to check connection status for device: " + deviceId + ". Service not connected.");
+ return false;
+ }
+ List<ConnectedDevice> devices;
+ try {
+ devices = trustedDeviceManager.getActiveUserConnectedDevices();
+ } catch (RemoteException e) {
+ loge(TAG, "Failed to check connection status for device: " + deviceId, e);
+ return false;
+ }
+ if (devices == null || devices.isEmpty()) {
+ return false;
+ }
+ for (ConnectedDevice device : devices) {
+ if (device.getDeviceId().equals(deviceId)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private boolean isDeviceSecure() {
+ KeyguardManager keyguardManager = getKeyguardManager();
+ if (keyguardManager == null) {
+ return false;
+ }
+ return keyguardManager.isDeviceSecure();
+ }
+
+ @Nullable
+ private KeyguardManager getKeyguardManager() {
+ if (keyguardManager == null) {
+ keyguardManager = getApplication().getSystemService(KeyguardManager.class);
+ }
+ if (keyguardManager == null) {
+ loge(TAG, "Unable to get KeyguardManager.");
+ }
+ return keyguardManager;
}
+
+ private void registerCallbacks() throws RemoteException {
+ if (trustedDeviceManager == null) {
+ loge(TAG, "Server not connected when attempting to register callbacks.");
+ return;
+ }
+ trustedDeviceManager.registerTrustedDeviceEnrollmentCallback(trustedDeviceEnrollmentCallback);
+ trustedDeviceManager.registerTrustedDeviceCallback(trustedDeviceCallback);
+ trustedDeviceManager.registerAssociatedDeviceCallback(deviceAssociationCallback);
+ }
+
+ private void unregisterCallbacks() throws RemoteException {
+ if (trustedDeviceManager == null) {
+ loge(TAG, "Server not connected when attempting to unregister callbacks.");
+ return;
+ }
+ trustedDeviceManager.unregisterTrustedDeviceEnrollmentCallback(trustedDeviceEnrollmentCallback);
+ trustedDeviceManager.unregisterTrustedDeviceCallback(trustedDeviceCallback);
+ trustedDeviceManager.unregisterAssociatedDeviceCallback(deviceAssociationCallback);
+ }
+
+ private final ServiceConnection serviceConnection =
+ new ServiceConnection() {
+ @Override
+ public void onServiceConnected(ComponentName name, IBinder service) {
+ trustedDeviceManager = ITrustedDeviceManager.Stub.asInterface(service);
+ try {
+ registerCallbacks();
+ trustedDeviceManager.retrieveTrustedDevicesForActiveUser(
+ onTrustedDevicesRetrievedListener);
+ } catch (RemoteException e) {
+ loge(TAG, "Error while connecting to service.");
+ return;
+ }
+ logd(TAG, "Successfully connected to TrustedDeviceManager.");
+ }
+
+ @Override
+ public void onServiceDisconnected(ComponentName name) {}
+ };
+
+ private final ITrustedDeviceCallback trustedDeviceCallback =
+ new ITrustedDeviceCallback.Stub() {
+ @Override
+ public void onTrustedDeviceAdded(TrustedDevice device) {
+ logd(TAG, "Added trusted device: " + device.getDeviceId() + ".");
+ setEnabledDevice(device);
+ finishEnrollment();
+ }
+
+ @Override
+ public void onTrustedDeviceRemoved(TrustedDevice device) {
+ logd(TAG, "Removed trusted device: " + device.getDeviceId() + ".");
+ setDisabledDevice(device);
+ }
+ };
+
+ private final IDeviceAssociationCallback deviceAssociationCallback =
+ new IDeviceAssociationCallback.Stub() {
+ @Override
+ public void onAssociatedDeviceAdded(AssociatedDevice device) {}
+
+ @Override
+ public void onAssociatedDeviceRemoved(AssociatedDevice device) {
+ AssociatedDevice currentDevice = getAssociatedDevice().getValue();
+ if (device.equals(currentDevice)) {
+ isCurrentAssociatedDeviceRemoved.postValue(true);
+ }
+ }
+
+ @Override
+ public void onAssociatedDeviceUpdated(AssociatedDevice device) {
+ if (device != null) {
+ setAssociatedDevice(device);
+ }
+ }
+ };
+
+ private final ITrustedDeviceEnrollmentCallback trustedDeviceEnrollmentCallback =
+ new ITrustedDeviceEnrollmentCallback.Stub() {
+
+ @Override
+ public void onValidateCredentialsRequest() {
+
+ if (enrollmentState.getValue() == EnrollmentState.IN_PROGRESS) {
+ enrollmentState.postValue(EnrollmentState.CREDENTIAL_PENDING);
+ return;
+ }
+ hasPendingCredential.set(true);
+ }
+
+ @Override
+ public void onTrustedDeviceEnrollmentError(int error) {
+ loge(TAG, "Failed to enroll trusted device, encountered error: " + error + ".");
+ enrollmentError.postValue(error);
+ }
+ };
+
+ private final IOnTrustedDevicesRetrievedListener onTrustedDevicesRetrievedListener =
+ new IOnTrustedDevicesRetrievedListener.Stub() {
+
+ @Override
+ public void onTrustedDevicesRetrieved(List<TrustedDevice> devices) {
+ setTrustedDevices(devices);
+ logd(TAG, "on trusted devices retrieved.");
+ }
+ };
}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/trust/api/IOnTrustedDevicesRetrievedListener.aidl b/libs/connecteddevice/src/com/google/android/connecteddevice/trust/api/IOnTrustedDevicesRetrievedListener.aidl
new file mode 100644
index 0000000..e1bc11f
--- /dev/null
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/trust/api/IOnTrustedDevicesRetrievedListener.aidl
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.connecteddevice.trust.api;
+
+import com.google.android.connecteddevice.trust.api.TrustedDevice;
+
+/** Listener for retrieving trusted devices. */
+oneway interface IOnTrustedDevicesRetrievedListener {
+
+ /** Triggered when trusted devices are retrieved. */
+ void onTrustedDevicesRetrieved(in List<TrustedDevice> devices);
+}
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/trust/api/ITrustedDeviceManager.aidl b/libs/connecteddevice/src/com/google/android/connecteddevice/trust/api/ITrustedDeviceManager.aidl
index a14e9f3..07a9574 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/trust/api/ITrustedDeviceManager.aidl
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/trust/api/ITrustedDeviceManager.aidl
@@ -20,6 +20,7 @@ import com.google.android.connecteddevice.trust.api.ITrustedDeviceAgentDelegate;
import com.google.android.connecteddevice.trust.api.ITrustedDeviceCallback;
import com.google.android.connecteddevice.trust.api.ITrustedDeviceEnrollmentCallback;
import com.google.android.connecteddevice.trust.api.IOnTrustedDeviceEnrollmentNotificationRequestListener;
+import com.google.android.connecteddevice.trust.api.IOnTrustedDevicesRetrievedListener;
import com.google.android.connecteddevice.trust.api.TrustedDevice;
import com.google.android.connecteddevice.api.IDeviceAssociationCallback;
import com.google.android.connecteddevice.model.ConnectedDevice;
@@ -65,8 +66,8 @@ interface ITrustedDeviceManager {
/** Remove a prevoiusly set delegate. */
void clearTrustedDeviceAgentDelegate(in ITrustedDeviceAgentDelegate trustAgentDelegate);
- /** Returns a list of trusted devices for user. */
- List<TrustedDevice> getTrustedDevicesForActiveUser();
+ /** Retrieves trusted devices for the active user. */
+ void retrieveTrustedDevicesForActiveUser(in IOnTrustedDevicesRetrievedListener listener);
/** Remove a trusted device and invalidate any credentials associated with it. */
void removeTrustedDevice(in TrustedDevice trustedDevice);
diff --git a/libs/connecteddevice/src/com/google/android/connecteddevice/util/SafeLog.java b/libs/connecteddevice/src/com/google/android/connecteddevice/util/SafeLog.java
index 933319e..4de4ead 100644
--- a/libs/connecteddevice/src/com/google/android/connecteddevice/util/SafeLog.java
+++ b/libs/connecteddevice/src/com/google/android/connecteddevice/util/SafeLog.java
@@ -23,11 +23,13 @@ import androidx.annotation.Nullable;
/** Convenience logging methods that respect allow list tags. */
public class SafeLog {
+ private static final boolean LOCAL_MODE = false;
+
private SafeLog() {}
/** Log message if tag is allow listed for {@code Log.VERBOSE}. */
public static void logv(@NonNull String tag, @NonNull String message) {
- if (Log.isLoggable(tag, Log.VERBOSE)) {
+ if (LOCAL_MODE || Log.isLoggable(tag, Log.VERBOSE)) {
Log.v(tag, message);
}
Logger.getLogger().verbose(tag, message);
@@ -35,7 +37,7 @@ public class SafeLog {
/** Log message if tag is allow listed for {@code Log.INFO}. */
public static void logi(@NonNull String tag, @NonNull String message) {
- if (Log.isLoggable(tag, Log.INFO)) {
+ if (LOCAL_MODE || Log.isLoggable(tag, Log.INFO)) {
Log.i(tag, message);
}
Logger.getLogger().info(tag, message);
@@ -43,7 +45,7 @@ public class SafeLog {
/** Log message if tag is allow listed for {@code Log.DEBUG}. */
public static void logd(@NonNull String tag, @NonNull String message) {
- if (Log.isLoggable(tag, Log.DEBUG)) {
+ if (LOCAL_MODE || Log.isLoggable(tag, Log.DEBUG)) {
Log.d(tag, message);
}
Logger.getLogger().debug(tag, message);
@@ -51,7 +53,7 @@ public class SafeLog {
/** Log message if tag is allow listed for {@code Log.WARN}. */
public static void logw(@NonNull String tag, @NonNull String message) {
- if (Log.isLoggable(tag, Log.WARN)) {
+ if (LOCAL_MODE || Log.isLoggable(tag, Log.WARN)) {
Log.w(tag, message);
}
Logger.getLogger().warn(tag, message);
@@ -60,13 +62,12 @@ public class SafeLog {
/** Log message if tag is allow listed for {@code Log.ERROR}. */
public static void loge(@NonNull String tag, @NonNull String message) {
loge(tag, message, /* exception= */ null);
- Logger.getLogger().error(tag, message);
}
/** Log message and optional exception if tag is allow listed for {@code Log.ERROR}. */
public static void loge(
@NonNull String tag, @NonNull String message, @Nullable Exception exception) {
- if (Log.isLoggable(tag, Log.ERROR)) {
+ if (LOCAL_MODE || Log.isLoggable(tag, Log.ERROR)) {
Log.e(tag, message, exception);
}
Logger.getLogger().error(tag, message, exception);
diff --git a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/ConnectedDeviceManagerTest.java b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/ConnectedDeviceManagerTest.java
index 5a84d17..9760ed1 100644
--- a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/ConnectedDeviceManagerTest.java
+++ b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/ConnectedDeviceManagerTest.java
@@ -90,6 +90,7 @@ public class ConnectedDeviceManagerTest {
mockStorage,
new ConnectedDeviceSppDelegateBinder(),
directExecutor,
+ directExecutor,
directExecutor);
verify(mockStorage).setAssociatedDeviceCallback(callbackCaptor.capture());
when(mockStorage.getActiveUserAssociatedDevices()).thenReturn(userDevices);
diff --git a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/calendarsync/CalendarSyncFeature2Test.java b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/calendarsync/CalendarSyncFeature2Test.java
new file mode 100644
index 0000000..e2aeec7
--- /dev/null
+++ b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/calendarsync/CalendarSyncFeature2Test.java
@@ -0,0 +1,81 @@
+package com.google.android.connecteddevice.calendarsync;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.connecteddevice.calendarsync.android.CalendarSyncAccess;
+import com.google.android.connecteddevice.calendarsync.common.CalendarSync;
+import com.google.android.connecteddevice.model.ConnectedDevice;
+import java.nio.charset.StandardCharsets;
+import java.util.function.Consumer;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.stubbing.Answer;
+
+@RunWith(AndroidJUnit4.class)
+public class CalendarSyncFeature2Test {
+
+ private static final String DEVICE_ID = "The device id";
+ private static final byte[] MESSAGE = "A message from the phone".getBytes(StandardCharsets.UTF_8);
+ @Mock private CalendarSyncAccess mockCalendarSyncAccess;
+ @Mock private ConnectedDevice mockConnectedDevice;
+ @Mock private CalendarSync mockCalendarSync;
+
+ private CalendarSyncFeature2 feature;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ Context context = ApplicationProvider.getApplicationContext();
+ feature = new CalendarSyncFeature2(context, mockCalendarSyncAccess);
+ when(mockConnectedDevice.getDeviceId()).thenReturn(DEVICE_ID);
+ when(mockConnectedDevice.hasSecureChannel()).thenReturn(true);
+
+ // When access(callback) is called, pass mockCalendarSync to the callback.
+ doAnswer(
+ (Answer<Void>)
+ invocation -> {
+ Consumer<CalendarSync> callback = invocation.getArgument(0);
+ callback.accept(mockCalendarSync);
+ return null;
+ })
+ .when(mockCalendarSyncAccess)
+ .access(any());
+ }
+
+ @Test
+ public void start_startsCalendarSyncAccess() {
+ feature.start();
+
+ verify(mockCalendarSyncAccess).start();
+ }
+
+ @Test
+ public void stop_stopsCalendarSyncAccess() {
+ feature.stop();
+
+ verify(mockCalendarSyncAccess).stop();
+ }
+
+ @Test
+ public void onMessageReceived_callsSyncReceive() {
+ feature.onMessageReceived(mockConnectedDevice, MESSAGE);
+
+ verify(mockCalendarSync).receive(DEVICE_ID, MESSAGE);
+ }
+
+ @Test
+ public void onDeviceDisconnected_callsSyncClear() {
+ feature.onDeviceDisconnected(mockConnectedDevice);
+
+ verify(mockCalendarSync).clear(DEVICE_ID);
+ }
+}
diff --git a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/calendarsync/android/CalendarSyncAccessTest.java b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/calendarsync/android/CalendarSyncAccessTest.java
new file mode 100644
index 0000000..2716de1
--- /dev/null
+++ b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/calendarsync/android/CalendarSyncAccessTest.java
@@ -0,0 +1,62 @@
+package com.google.android.connecteddevice.calendarsync.android;
+
+import static com.google.common.truth.Truth.assertThat;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.os.Looper;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.connecteddevice.calendarsync.common.Logger;
+import java.util.concurrent.CountDownLatch;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class CalendarSyncAccessTest {
+
+ private CalendarSyncAccess calendarSyncAccess;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ Logger.Factory mockLoggerFactory = mock(Logger.Factory.class);
+ when(mockLoggerFactory.create(anyString())).thenReturn(mock(Logger.class));
+ calendarSyncAccess = new CalendarSyncAccess(mockLoggerFactory);
+ }
+
+ @Test
+ public void start_isStarted() {
+ assertThat(calendarSyncAccess.isStarted()).isFalse();
+
+ calendarSyncAccess.start();
+
+ assertThat(calendarSyncAccess.isStarted()).isTrue();
+ }
+
+ @Test
+ public void stop_isNotStarted() {
+ calendarSyncAccess.start();
+ calendarSyncAccess.stop();
+
+ assertThat(calendarSyncAccess.isStarted()).isFalse();
+ }
+
+ @Test
+ public void access_runsTaskOnBackgroundLooper() throws InterruptedException {
+ CountDownLatch latch = new CountDownLatch(1);
+
+ calendarSyncAccess.start();
+ calendarSyncAccess.access(
+ (sync) -> {
+ assertThat(sync).isNotNull();
+ assertThat(Looper.myLooper()).isNotEqualTo(Looper.getMainLooper());
+ latch.countDown();
+ });
+
+ assertThat(latch.await(2, SECONDS)).isTrue();
+ }
+}
diff --git a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/calendarsync/common/CalendarSyncTest.java b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/calendarsync/common/CalendarSyncTest.java
new file mode 100644
index 0000000..9a5b9cf
--- /dev/null
+++ b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/calendarsync/common/CalendarSyncTest.java
@@ -0,0 +1,34 @@
+package com.google.android.connecteddevice.calendarsync.common;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class CalendarSyncTest {
+
+ @Mock private Logger.Factory mockLoggerFactory;
+
+ @SuppressWarnings("unused")
+ private CalendarSync sync;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ when(mockLoggerFactory.create(anyString())).thenReturn(mock(Logger.class));
+ sync = new CalendarSync(mockLoggerFactory);
+ }
+
+ @Test
+ public void testCreate_createsLogger() {
+ verify(mockLoggerFactory).create(anyString());
+ }
+}
diff --git a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/connection/DeviceMessageStreamTest.java b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/connection/DeviceMessageStreamTest.java
index f457550..8a6c1b5 100644
--- a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/connection/DeviceMessageStreamTest.java
+++ b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/connection/DeviceMessageStreamTest.java
@@ -23,22 +23,27 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
import androidx.annotation.NonNull;
import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.companionprotos.CapabilitiesExchangeProto.CapabilitiesExchange;
import com.google.android.companionprotos.DeviceMessageProto.Message;
import com.google.android.companionprotos.OperationProto.OperationType;
import com.google.android.companionprotos.PacketProto.Packet;
+import com.google.android.companionprotos.VersionExchangeProto.VersionExchange;
import com.google.android.connecteddevice.connection.DeviceMessageStream.MessageReceivedErrorListener;
import com.google.android.connecteddevice.connection.DeviceMessageStream.MessageReceivedListener;
import com.google.android.connecteddevice.util.ByteUtils;
import com.google.common.collect.Iterables;
import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -159,6 +164,77 @@ public class DeviceMessageStreamTest {
verify(mockErrorListener).onMessageReceivedError(any(IllegalStateException.class));
}
+ @Test
+ public void processVersionExchange_invalidVersionExchangeMessage() {
+ stream.setMessageReceivedErrorListener(mockErrorListener);
+ stream.onDataReceived(ByteUtils.randomBytes(WRITE_SIZE));
+ verify(mockErrorListener).onMessageReceivedError(any(InvalidProtocolBufferException.class));
+ verify(stream, times(0)).send(any());
+ }
+
+ @Test
+ public void processVersionExchange_invalidVersionNumbers() {
+ int invalidVersion = 0;
+ stream.setMessageReceivedErrorListener(mockErrorListener);
+ byte[] phoneVersionBytes =
+ VersionExchange.newBuilder()
+ .setMinSupportedMessagingVersion(invalidVersion)
+ .setMaxSupportedMessagingVersion(invalidVersion)
+ .setMinSupportedSecurityVersion(invalidVersion)
+ .setMaxSupportedSecurityVersion(invalidVersion)
+ .build()
+ .toByteArray();
+ stream.onDataReceived(phoneVersionBytes);
+ verify(mockErrorListener).onMessageReceivedError(any(IllegalStateException.class));
+ verify(stream, times(0)).send(any());
+ }
+
+ @Test
+ public void processVersionExchange_success() {
+ stream.setMessageReceivedListener(mockMessageReceivedListener);
+ byte[] phoneVersionBytes = createVersionExchangeMessage().toByteArray();
+ stream.onDataReceived(phoneVersionBytes);
+ verify(stream).send(phoneVersionBytes);
+
+ ArgumentCaptor<DeviceMessage> messageCaptor = ArgumentCaptor.forClass(DeviceMessage.class);
+ byte[] data = ByteUtils.randomBytes(WRITE_SIZE);
+ notifyPacketsReceived(data);
+ verify(mockMessageReceivedListener).onMessageReceived(messageCaptor.capture(), any());
+ assertThat(Arrays.equals(data, messageCaptor.getValue().getMessage())).isTrue();
+ }
+
+ @Test
+ @Ignore("b/175066810")
+ public void processCapabilitiesExchange_success() {
+ stream.setMessageReceivedListener(mockMessageReceivedListener);
+ byte[] phoneVersionBytes = createVersionExchangeMessage().toByteArray();
+ stream.onDataReceived(phoneVersionBytes);
+ verify(stream).send(phoneVersionBytes);
+
+ byte[] phoneCapabilitiesBytes = CapabilitiesExchange.newBuilder().build().toByteArray();
+ stream.onDataReceived(phoneCapabilitiesBytes);
+ verify(stream).send(phoneCapabilitiesBytes);
+
+ ArgumentCaptor<DeviceMessage> messageCaptor = ArgumentCaptor.forClass(DeviceMessage.class);
+ byte[] data = ByteUtils.randomBytes((int) WRITE_SIZE);
+ notifyPacketsReceived(data);
+ verify(mockMessageReceivedListener).onMessageReceived(messageCaptor.capture(), any());
+ assertThat(Arrays.equals(data, messageCaptor.getValue().getMessage())).isTrue();
+ }
+
+ @Test
+ @Ignore("b/175066810")
+ public void processCapabilitiesExchange_invalidCapabilitiesExchangeMessage() {
+ stream.setMessageReceivedErrorListener(mockErrorListener);
+ byte[] phoneVersionBytes = createVersionExchangeMessage().toByteArray();
+ stream.onDataReceived(phoneVersionBytes);
+ verify(stream).send(phoneVersionBytes);
+
+ stream.onDataReceived(ByteUtils.randomBytes((int) WRITE_SIZE));
+ verify(mockErrorListener).onMessageReceivedError(any(InvalidProtocolBufferException.class));
+ verifyNoMoreInteractions(stream);
+ }
+
@NonNull
private static List<Packet> createPackets(byte[] data) {
try {
@@ -175,10 +251,26 @@ public class DeviceMessageStreamTest {
}
}
+ private static VersionExchange createVersionExchangeMessage() {
+ return VersionExchange.newBuilder()
+ .setMinSupportedMessagingVersion(DeviceMessageStream.MESSAGING_VERSION)
+ .setMaxSupportedMessagingVersion(DeviceMessageStream.MESSAGING_VERSION)
+ .setMinSupportedSecurityVersion(DeviceMessageStream.MIN_SECURITY_VERSION)
+ .setMaxSupportedSecurityVersion(DeviceMessageStream.MAX_SECURITY_VERSION)
+ .build();
+ }
+
private void processMessage(byte[] data) {
List<Packet> packets = createPackets(data);
for (Packet packet : packets) {
stream.processPacket(packet);
}
}
+
+ private void notifyPacketsReceived(byte[] data) {
+ List<Packet> packets = createPackets(data);
+ for (Packet packet : packets) {
+ stream.onDataReceived(packet.toByteArray());
+ }
+ }
}
diff --git a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/connection/ble/CarBlePeripheralManagerTest.java b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/connection/ble/CarBlePeripheralManagerTest.java
index 8a2c094..4cb8e95 100644
--- a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/connection/ble/CarBlePeripheralManagerTest.java
+++ b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/connection/ble/CarBlePeripheralManagerTest.java
@@ -33,8 +33,10 @@ import android.bluetooth.le.AdvertiseSettings;
import android.os.Handler;
import android.os.ParcelUuid;
import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.companionprotos.VersionExchangeProto.VersionExchange;
import com.google.android.connecteddevice.connection.AssociationCallback;
import com.google.android.connecteddevice.connection.AssociationSecureChannel;
+import com.google.android.connecteddevice.connection.DeviceMessageStream;
import com.google.android.connecteddevice.connection.SecureChannel;
import com.google.android.connecteddevice.model.AssociatedDevice;
import com.google.android.connecteddevice.oob.OobConnectionManager;
@@ -247,6 +249,22 @@ public class CarBlePeripheralManagerTest {
BluetoothDevice bluetoothDevice =
BluetoothAdapter.getDefaultAdapter().getRemoteDevice(TEST_REMOTE_DEVICE_ADDRESS);
bleManagerCallback.onRemoteDeviceConnected(bluetoothDevice);
+ ArgumentCaptor<BlePeripheralManager.OnCharacteristicWriteListener> listenerCaptor =
+ ArgumentCaptor.forClass(BlePeripheralManager.OnCharacteristicWriteListener.class);
+ verify(mockBlePeripheralManager).addOnCharacteristicWriteListener(listenerCaptor.capture());
+ VersionExchange versionExchangeMessage =
+ VersionExchange.newBuilder()
+ .setMinSupportedMessagingVersion(DeviceMessageStream.MESSAGING_VERSION)
+ .setMaxSupportedMessagingVersion(DeviceMessageStream.MESSAGING_VERSION)
+ .setMinSupportedSecurityVersion(DeviceMessageStream.MIN_SECURITY_VERSION)
+ .setMaxSupportedSecurityVersion(DeviceMessageStream.MAX_SECURITY_VERSION)
+ .build();
+ listenerCaptor
+ .getValue()
+ .onCharacteristicWrite(
+ bluetoothDevice,
+ carBlePeripheralManager.readCharacteristic,
+ versionExchangeMessage.toByteArray());
return (AssociationSecureChannel) carBlePeripheralManager.getConnectedDeviceChannel();
}
diff --git a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/connection/spp/CarSppManagerTest.java b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/connection/spp/CarSppManagerTest.java
index fb6f48b..e7d9648 100644
--- a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/connection/spp/CarSppManagerTest.java
+++ b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/connection/spp/CarSppManagerTest.java
@@ -35,6 +35,7 @@ import com.google.android.connecteddevice.connection.CarBluetoothManager;
import com.google.android.connecteddevice.connection.ReconnectSecureChannel;
import com.google.android.connecteddevice.connection.SecureChannel;
import com.google.android.connecteddevice.model.AssociatedDevice;
+import com.google.android.connecteddevice.oob.OobChannel;
import com.google.android.connecteddevice.storage.ConnectedDeviceStorage;
import com.google.android.connecteddevice.transport.spp.ConnectedDeviceSppDelegateBinder;
import com.google.android.connecteddevice.transport.spp.PendingConnection;
@@ -71,6 +72,7 @@ public class CarSppManagerTest {
@Mock private AssociationCallback mockAssociationCallback;
@Mock private ConnectedDeviceSppDelegateBinder mockSppBinder;
@Mock private ConnectedDeviceStorage mockStorage;
+ @Mock private OobChannel mockOobChannel;
private CarSppManager carSppManager;
private ConnectionResultCaptor connectionResultCaptor;
@@ -255,6 +257,14 @@ public class CarSppManagerTest {
verify(mockCallback, never()).onDeviceDisconnected(any());
}
+ @Test
+ public void testStartOutOfBandAssociation() {
+ carSppManager.startOutOfBandAssociation(
+ /* nameForAssociation= */ null, mockOobChannel, mockAssociationCallback);
+
+ assertThat(carSppManager.getOobConnectionManager()).isNotNull();
+ }
+
private AssociationSecureChannel getChannelForAssociation(AssociationCallback callback) {
carSppManager.startAssociation(/* nameForAssociation= */ null, callback);
diff --git a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/oob/BluetoothRfcommChannelTest.java b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/oob/BluetoothRfcommChannelTest.java
index cde1187..152222d 100644
--- a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/oob/BluetoothRfcommChannelTest.java
+++ b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/oob/BluetoothRfcommChannelTest.java
@@ -35,6 +35,7 @@ import com.google.android.connecteddevice.model.OobEligibleDevice;
import com.google.android.connecteddevice.transport.spp.ConnectedDeviceSppDelegateBinder;
import com.google.android.connecteddevice.transport.spp.PendingConnection;
import com.google.android.connecteddevice.transport.spp.PendingSentMessage;
+import com.google.common.collect.ImmutableSet;
import com.google.common.primitives.Bytes;
import java.util.UUID;
import org.junit.Before;
@@ -45,6 +46,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+import org.robolectric.shadows.ShadowLooper;
@RunWith(AndroidJUnit4.class)
public class BluetoothRfcommChannelTest {
@@ -107,7 +109,35 @@ public class BluetoothRfcommChannelTest {
.connectAsClient(any(), any(), anyBoolean());
bluetoothRfcommChannel.completeOobDataExchange(
- OOB_ELIGIBLE_DEVICE, mockCallback, BLUETOOTH_ADAPTER);
+ OOB_ELIGIBLE_DEVICE, mockCallback, () -> ImmutableSet.of(TEST_BLUETOOTH_DEVICE));
+ verify(mockCallback).onOobExchangeFailure();
+ }
+
+ @Test
+ public void completeOobExchange_noBondedDevices_callOnFailed() throws Exception {
+ bluetoothRfcommChannel.completeOobDataExchange(
+ OOB_ELIGIBLE_DEVICE, mockCallback, ImmutableSet::of);
+
+ verify(mockCallback).onOobExchangeFailure();
+ }
+
+ @Test
+ public void completeOobExchange_bondedToTheWrongDevice_callOnFailed() throws Exception {
+ BluetoothDevice otherBtDevice = BLUETOOTH_ADAPTER.getRemoteDevice("BB:AA:33:22:11:00");
+ bluetoothRfcommChannel.completeOobDataExchange(
+ OOB_ELIGIBLE_DEVICE, mockCallback, () -> ImmutableSet.of(otherBtDevice));
+
+ verify(mockCallback).onOobExchangeFailure();
+ }
+
+ @Test
+ public void completeOobExchange_timeout_cancelsConnectionAndCallsOnFailed() throws Exception {
+ PendingConnection pendingConnection = requestConnection();
+
+ // Simulate the timeout
+ ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
+
+ verify(mockSppDelegateBinder).cancelConnectionAttempt(pendingConnection);
verify(mockCallback).onOobExchangeFailure();
}
@@ -146,27 +176,31 @@ public class BluetoothRfcommChannelTest {
.connectAsClient(any(), any(), anyBoolean());
bluetoothRfcommChannel.completeOobDataExchange(
- OOB_ELIGIBLE_DEVICE, mockCallback, BLUETOOTH_ADAPTER);
+ OOB_ELIGIBLE_DEVICE, mockCallback, () -> ImmutableSet.of(TEST_BLUETOOTH_DEVICE));
verify(mockCallback, never()).onOobExchangeSuccess();
verify(mockCallback, never()).onOobExchangeFailure();
}
private PendingConnection establishConnection() throws Exception {
+ PendingConnection connection = requestConnection();
+ connection.notifyConnected(TEST_BLUETOOTH_DEVICE, TEST_BLUETOOTH_DEVICE.getName());
+ verify(mockCallback).onOobExchangeSuccess();
+
+ return connection;
+ }
+
+ private PendingConnection requestConnection() throws Exception {
ConnectionResultCaptor connectionCaptor = new ConnectionResultCaptor();
doAnswer(connectionCaptor)
.when(mockSppDelegateBinder)
.connectAsClient(any(), any(), anyBoolean());
bluetoothRfcommChannel.completeOobDataExchange(
- OOB_ELIGIBLE_DEVICE, mockCallback, BLUETOOTH_ADAPTER);
+ OOB_ELIGIBLE_DEVICE, mockCallback, () -> ImmutableSet.of(TEST_BLUETOOTH_DEVICE));
verify(mockSppDelegateBinder).connectAsClient(any(), any(), anyBoolean());
- PendingConnection connection = connectionCaptor.getResult();
- connection.notifyConnected(TEST_BLUETOOTH_DEVICE, TEST_BLUETOOTH_DEVICE.getName());
- verify(mockCallback).onOobExchangeSuccess();
-
- return connection;
+ return connectionCaptor.getResult();
}
private static class ConnectionResultCaptor implements Answer<PendingConnection> {
diff --git a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/service/AssociatedDeviceViewModelTest.java b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/service/AssociatedDeviceViewModelTest.java
new file mode 100644
index 0000000..27f1360
--- /dev/null
+++ b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/service/AssociatedDeviceViewModelTest.java
@@ -0,0 +1,305 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.connecteddevice.service;
+
+import static android.os.Looper.getMainLooper;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.robolectric.Shadows.shadowOf;
+
+import androidx.lifecycle.Observer;
+import android.bluetooth.BluetoothAdapter;
+import android.os.RemoteException;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.connecteddevice.api.IAssociatedDeviceManager;
+import com.google.android.connecteddevice.api.IAssociationCallback;
+import com.google.android.connecteddevice.api.IConnectionCallback;
+import com.google.android.connecteddevice.api.IDeviceAssociationCallback;
+import com.google.android.connecteddevice.api.IOnAssociatedDevicesRetrievedListener;
+import com.google.android.connecteddevice.model.AssociatedDevice;
+import com.google.android.connecteddevice.model.AssociatedDeviceDetails;
+import com.google.android.connecteddevice.model.ConnectedDevice;
+import com.google.android.connecteddevice.service.AssociatedDeviceViewModel.AssociationState;
+import java.util.Collections;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+@RunWith(AndroidJUnit4.class)
+public final class AssociatedDeviceViewModelTest {
+ private static final String TEST_ASSOCIATED_DEVICE_ID = "test_device_id";
+ private static final String TEST_ASSOCIATED_DEVICE_NAME_1 = "test_device_name_1";
+ private static final String TEST_ASSOCIATED_DEVICE_NAME_2 = "test_device_name_2";
+ private static final String TEST_ASSOCIATED_DEVICE_ADDRESS = "test_device_address";
+ private static final String TEST_CAR_NAME = "test_car_name";
+ private static final String TEST_VERIFICATION_CODE = "test_code";
+
+ @Rule public final MockitoRule mockito = MockitoJUnit.rule();
+ @Mock private IAssociatedDeviceManager mockAssociatedDeviceManager;
+ @Mock private Observer<AssociationState> mockAssociationStateObserver;
+ @Mock private Observer<AssociatedDeviceDetails> mockDeviceDetailsObserver;
+ @Mock private Observer<String> mockCarNameObserver;
+ @Mock private Observer<String> mockPairingCodeObserver;
+ @Mock private Observer<AssociatedDevice> mockRemovedDeviceObserver;
+
+ private AssociatedDeviceViewModel viewModel;
+
+ private IAssociationCallback associationCallback;
+ private IDeviceAssociationCallback deviceAssociationCallback;
+ private IConnectionCallback connectionCallback;
+ private IOnAssociatedDevicesRetrievedListener devicesRetrievedListener;
+
+ @Before
+ public void setUp() throws RemoteException {
+ viewModel =
+ new AssociatedDeviceViewModel(
+ ApplicationProvider.getApplicationContext(),
+ mockAssociatedDeviceManager,
+ /* isSppEnabled= */ false);
+ BluetoothAdapter.getDefaultAdapter().enable();
+ captureCallbacks();
+ }
+
+ @After
+ public void cleanUp() {
+ viewModel.getAdvertisedCarName().removeObserver(mockCarNameObserver);
+ viewModel.getRemovedDevice().removeObserver(mockRemovedDeviceObserver);
+ viewModel.getPairingCode().removeObserver(mockPairingCodeObserver);
+ viewModel.getAssociationState().removeObserver(mockAssociationStateObserver);
+ viewModel.getCurrentDeviceDetails().removeObserver(mockDeviceDetailsObserver);
+ }
+
+ @Test
+ public void acceptVerification() throws RemoteException {
+ viewModel.acceptVerification();
+ verify(mockAssociatedDeviceManager).acceptVerification();
+ }
+
+ @Test
+ public void removeCurrentDevice() throws RemoteException {
+ AssociatedDevice testDevice = createAssociatedDevice(/* isConnectionEnabled= */ true);
+ devicesRetrievedListener.onAssociatedDevicesRetrieved(Collections.singletonList(testDevice));
+ viewModel.removeCurrentDevice();
+ verify(mockAssociatedDeviceManager).removeAssociatedDevice(eq(TEST_ASSOCIATED_DEVICE_ID));
+ }
+
+ @Test
+ public void toggleConnectionStatusForCurrentDevice_disableDevice() throws RemoteException {
+ AssociatedDevice testDevice = createAssociatedDevice(/* isConnectionEnabled= */ true);
+ devicesRetrievedListener.onAssociatedDevicesRetrieved(Collections.singletonList(testDevice));
+ viewModel.toggleConnectionStatusForCurrentDevice();
+ verify(mockAssociatedDeviceManager)
+ .disableAssociatedDeviceConnection(eq(TEST_ASSOCIATED_DEVICE_ID));
+ }
+
+ @Test
+ public void toggleConnectionStatusForCurrentDevice_enableDevice() throws RemoteException {
+ AssociatedDevice testDevice = createAssociatedDevice(/* isConnectionEnabled= */ false);
+ devicesRetrievedListener.onAssociatedDevicesRetrieved(Collections.singletonList(testDevice));
+ viewModel.toggleConnectionStatusForCurrentDevice();
+ verify(mockAssociatedDeviceManager)
+ .enableAssociatedDeviceConnection(eq(TEST_ASSOCIATED_DEVICE_ID));
+ }
+
+ @Test
+ public void startAssociation_deviceNotReady() throws RemoteException {
+ BluetoothAdapter.getDefaultAdapter().disable();
+ viewModel.startAssociation();
+ viewModel.getAssociationState().observeForever(mockAssociationStateObserver);
+ waitForLiveDataUpdate();
+ verify(mockAssociationStateObserver).onChanged(AssociationState.PENDING);
+ verify(mockAssociatedDeviceManager, never()).startAssociation();
+ }
+
+ @Test
+ public void startAssociation_waitingForPasswordSetup() throws RemoteException {
+ viewModel.startAssociation();
+ viewModel.getAssociationState().observeForever(mockAssociationStateObserver);
+ waitForLiveDataUpdate();
+ verify(mockAssociationStateObserver).onChanged(AssociationState.STARTING);
+ verify(mockAssociatedDeviceManager).startAssociation();
+ }
+
+ @Test
+ public void startAssociation_inProgress() throws RemoteException {
+ viewModel.startAssociation();
+ associationCallback.onAssociationStartSuccess(TEST_CAR_NAME);
+ viewModel.getAssociationState().observeForever(mockAssociationStateObserver);
+ viewModel.getAdvertisedCarName().observeForever(mockCarNameObserver);
+ waitForLiveDataUpdate();
+ verify(mockAssociationStateObserver).onChanged(AssociationState.STARTED);
+ verify(mockCarNameObserver).onChanged(TEST_CAR_NAME);
+ }
+
+ @Test
+ public void startAssociation_waitingForVerification() throws RemoteException {
+ viewModel.startAssociation();
+ associationCallback.onAssociationStartSuccess(TEST_CAR_NAME);
+ associationCallback.onVerificationCodeAvailable(TEST_VERIFICATION_CODE);
+ viewModel.getAssociationState().observeForever(mockAssociationStateObserver);
+ viewModel.getPairingCode().observeForever(mockPairingCodeObserver);
+ waitForLiveDataUpdate();
+ verify(mockAssociationStateObserver).onChanged(AssociationState.STARTED);
+ verify(mockPairingCodeObserver).onChanged(TEST_VERIFICATION_CODE);
+ }
+
+ @Test
+ public void startAssociation_associationCompleted() throws RemoteException {
+ viewModel.startAssociation();
+ associationCallback.onAssociationStartSuccess(TEST_CAR_NAME);
+ associationCallback.onVerificationCodeAvailable(TEST_VERIFICATION_CODE);
+ associationCallback.onAssociationCompleted();
+ viewModel.getAssociationState().observeForever(mockAssociationStateObserver);
+ waitForLiveDataUpdate();
+ verify(mockAssociationStateObserver).onChanged(AssociationState.COMPLETED);
+ }
+
+ @Test
+ public void stopAssociation() throws RemoteException {
+ viewModel.startAssociation();
+ waitForLiveDataUpdate();
+ viewModel.stopAssociation();
+ viewModel.getAssociationState().observeForever(mockAssociationStateObserver);
+ waitForLiveDataUpdate();
+ verify(mockAssociationStateObserver).onChanged(AssociationState.NONE);
+ verify(mockAssociatedDeviceManager).stopAssociation();
+ }
+
+ @Test
+ public void retrieveAssociatedDevice() throws RemoteException {
+ AssociatedDevice testDevice = createAssociatedDevice(/* isConnectionEnabled= */ true);
+ devicesRetrievedListener.onAssociatedDevicesRetrieved(Collections.singletonList(testDevice));
+ viewModel.getCurrentDeviceDetails().observeForever(mockDeviceDetailsObserver);
+ waitForLiveDataUpdate();
+ assertThat(viewModel.getCurrentDeviceDetails().getValue().getAssociatedDevice())
+ .isEqualTo(testDevice);
+ }
+
+ @Test
+ public void associatedDeviceUpdated() throws RemoteException {
+ AssociatedDevice testDevice = createAssociatedDevice(/* isConnectionEnabled= */ true);
+ devicesRetrievedListener.onAssociatedDevicesRetrieved(Collections.singletonList(testDevice));
+ AssociatedDevice updatedDevice =
+ new AssociatedDevice(
+ TEST_ASSOCIATED_DEVICE_ID,
+ TEST_ASSOCIATED_DEVICE_ADDRESS,
+ TEST_ASSOCIATED_DEVICE_NAME_2,
+ /* isConnectionEnabled= */ true);
+ deviceAssociationCallback.onAssociatedDeviceUpdated(updatedDevice);
+ viewModel.getCurrentDeviceDetails().observeForever(mockDeviceDetailsObserver);
+ waitForLiveDataUpdate();
+ assertThat(viewModel.getCurrentDeviceDetails().getValue().getDeviceName())
+ .isEqualTo(TEST_ASSOCIATED_DEVICE_NAME_2);
+ }
+
+ @Test
+ public void removeAssociatedDevice() throws RemoteException {
+ AssociatedDevice testDevice = createAssociatedDevice(/* isConnectionEnabled= */ true);
+ devicesRetrievedListener.onAssociatedDevicesRetrieved(Collections.singletonList(testDevice));
+ waitForLiveDataUpdate();
+ viewModel.removeCurrentDevice();
+ verify(mockAssociatedDeviceManager).removeAssociatedDevice(eq(TEST_ASSOCIATED_DEVICE_ID));
+ }
+
+ @Test
+ public void associatedDeviceRemoved() throws RemoteException {
+ AssociatedDevice testDevice = createAssociatedDevice(/* isConnectionEnabled= */ true);
+ devicesRetrievedListener.onAssociatedDevicesRetrieved(Collections.singletonList(testDevice));
+ deviceAssociationCallback.onAssociatedDeviceRemoved(testDevice);
+ viewModel.getRemovedDevice().observeForever(mockRemovedDeviceObserver);
+ waitForLiveDataUpdate();
+ verify(mockRemovedDeviceObserver).onChanged(testDevice);
+ }
+
+ @Test
+ public void associatedDeviceConnected() throws RemoteException {
+ AssociatedDevice testAssociatedDevice = createAssociatedDevice(/* isConnectionEnabled= */ true);
+ devicesRetrievedListener.onAssociatedDevicesRetrieved(
+ Collections.singletonList(testAssociatedDevice));
+ ConnectedDevice testConnectedDevice = createConnectedDevice();
+ connectionCallback.onDeviceConnected(testConnectedDevice);
+ viewModel.getCurrentDeviceDetails().observeForever(mockDeviceDetailsObserver);
+ waitForLiveDataUpdate();
+ assertThat(viewModel.getCurrentDeviceDetails().getValue().isConnected()).isTrue();
+ }
+
+ @Test
+ public void associatedDeviceDisconnected() throws RemoteException {
+ AssociatedDevice testAssociatedDevice = createAssociatedDevice(/* isConnectionEnabled= */ true);
+ devicesRetrievedListener.onAssociatedDevicesRetrieved(
+ Collections.singletonList(testAssociatedDevice));
+ ConnectedDevice testConnectedDevice = createConnectedDevice();
+ connectionCallback.onDeviceConnected(testConnectedDevice);
+ connectionCallback.onDeviceDisconnected(testConnectedDevice);
+ viewModel.getCurrentDeviceDetails().observeForever(mockDeviceDetailsObserver);
+ waitForLiveDataUpdate();
+ assertThat(viewModel.getCurrentDeviceDetails().getValue().isConnected()).isFalse();
+ }
+
+ private void captureCallbacks() throws RemoteException {
+ ArgumentCaptor<IAssociationCallback> associationCallbackCaptor =
+ ArgumentCaptor.forClass(IAssociationCallback.class);
+ verify(mockAssociatedDeviceManager).setAssociationCallback(associationCallbackCaptor.capture());
+ associationCallback = associationCallbackCaptor.getValue();
+
+ ArgumentCaptor<IDeviceAssociationCallback> deviceAssociationCallbackCaptor =
+ ArgumentCaptor.forClass(IDeviceAssociationCallback.class);
+ verify(mockAssociatedDeviceManager)
+ .setDeviceAssociationCallback(deviceAssociationCallbackCaptor.capture());
+ deviceAssociationCallback = deviceAssociationCallbackCaptor.getValue();
+
+ ArgumentCaptor<IConnectionCallback> connectionCallbackCaptor =
+ ArgumentCaptor.forClass(IConnectionCallback.class);
+ verify(mockAssociatedDeviceManager).setConnectionCallback(connectionCallbackCaptor.capture());
+ connectionCallback = connectionCallbackCaptor.getValue();
+
+ ArgumentCaptor<IOnAssociatedDevicesRetrievedListener> devicesRetrievedListenerCaptor =
+ ArgumentCaptor.forClass(IOnAssociatedDevicesRetrievedListener.class);
+ verify(mockAssociatedDeviceManager)
+ .retrievedActiveUserAssociatedDevices(devicesRetrievedListenerCaptor.capture());
+ devicesRetrievedListener = devicesRetrievedListenerCaptor.getValue();
+ }
+
+ private void waitForLiveDataUpdate() {
+ shadowOf(getMainLooper()).idle();
+ }
+
+ private static AssociatedDevice createAssociatedDevice(boolean isConnectionEnabled) {
+ return new AssociatedDevice(
+ TEST_ASSOCIATED_DEVICE_ID,
+ TEST_ASSOCIATED_DEVICE_ADDRESS,
+ TEST_ASSOCIATED_DEVICE_NAME_1,
+ isConnectionEnabled);
+ }
+
+ private static ConnectedDevice createConnectedDevice() {
+ return new ConnectedDevice(
+ TEST_ASSOCIATED_DEVICE_ID,
+ TEST_ASSOCIATED_DEVICE_NAME_1,
+ /* belongsToActiveUser= */ true,
+ /* hasSecureChannel= */ true);
+ }
+}
diff --git a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/transport/spp/ConnectTaskTest.java b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/transport/spp/ConnectTaskTest.java
index 42f9c60..583de82 100644
--- a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/transport/spp/ConnectTaskTest.java
+++ b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/transport/spp/ConnectTaskTest.java
@@ -24,7 +24,6 @@ import static org.mockito.Mockito.verify;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import androidx.test.ext.junit.runners.AndroidJUnit4;
-import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.Executor;
import org.junit.Before;
@@ -83,26 +82,7 @@ public class ConnectTaskTest {
}
@Test
- public void testRun_connectException_onConnectionAttemptFailed() throws IOException {
- connectTask.socket.close();
-
- connectTask.run();
-
- verify(mockCallback).onConnectionAttemptFailed();
- }
-
- @Test
- public void testCancel_runAfterCancel_doNotInformCallback() throws IOException {
- connectTask.cancel();
-
- connectTask.socket.close();
- connectTask.run();
-
- verify(mockCallback, never()).onConnectionAttemptFailed();
- }
-
- @Test
- public void testCancel_connectAfterCancel_doNotInformCallback() {
+ public void testRun_connectAfterCancel_doNotInformCallback() {
connectTask.cancel();
connectTask.run();
diff --git a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/transport/spp/SppManagerTest.java b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/transport/spp/SppManagerTest.java
index 34ddbd0..bde4363 100644
--- a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/transport/spp/SppManagerTest.java
+++ b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/transport/spp/SppManagerTest.java
@@ -21,6 +21,7 @@ import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.robolectric.Shadows.shadowOf;
@@ -64,7 +65,6 @@ public class SppManagerTest {
sppManager = new SppManager(IS_SECURE_RFCOMM_CHANNEL, callbackExecutor);
sppManager.connectedSocket = shadowBluetoothSocket;
sppManager.registerCallback(mockConnectionCallback, callbackExecutor);
- sppManager.addOnMessageReceivedListener(mockListener, callbackExecutor);
}
@After
@@ -93,6 +93,7 @@ public class SppManagerTest {
@Test
public void testReadMessageTaskCallback_onMessageReceived_callOnMessageReceivedListener()
throws InterruptedException {
+ sppManager.addOnMessageReceivedListener(mockListener, callbackExecutor);
sppManager.readMessageTaskCallback.onMessageReceived(testData);
verify(mockListener).onMessageReceived(any(), eq(testData));
}
@@ -153,4 +154,13 @@ public class SppManagerTest {
assertThat(sppManager.acceptTask).isNull();
}
+
+ @Test
+ public void testAddOnMessageReceivedListener_sendMissedMessages() {
+ sppManager.readMessageTaskCallback.onMessageReceived(testData);
+ verify(mockListener, never()).onMessageReceived(any(), eq(testData));
+
+ sppManager.addOnMessageReceivedListener(mockListener, callbackExecutor);
+ verify(mockListener).onMessageReceived(any(), eq(testData));
+ }
}
diff --git a/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/trust/TrustedDeviceViewModelTest.java b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/trust/TrustedDeviceViewModelTest.java
new file mode 100644
index 0000000..61ef832
--- /dev/null
+++ b/libs/connecteddevice/tests/unit/src/com/google/android/connecteddevice/trust/TrustedDeviceViewModelTest.java
@@ -0,0 +1,183 @@
+package com.google.android.connecteddevice.trust;
+
+import static android.os.Looper.getMainLooper;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.app.Application;
+import android.app.KeyguardManager;
+import androidx.lifecycle.Observer;
+import android.os.RemoteException;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.connecteddevice.model.AssociatedDevice;
+import com.google.android.connecteddevice.model.ConnectedDevice;
+import com.google.android.connecteddevice.trust.TrustedDeviceViewModel.EnrollmentState;
+import com.google.android.connecteddevice.trust.api.IOnTrustedDevicesRetrievedListener;
+import com.google.android.connecteddevice.trust.api.ITrustedDeviceCallback;
+import com.google.android.connecteddevice.trust.api.ITrustedDeviceEnrollmentCallback;
+import com.google.android.connecteddevice.trust.api.ITrustedDeviceManager;
+import com.google.android.connecteddevice.trust.api.TrustedDevice;
+import java.util.ArrayList;
+import java.util.Collections;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public final class TrustedDeviceViewModelTest {
+ private static final String TEST_ASSOCIATED_DEVICE_ID = "test_device_id";
+ private static final String TEST_ASSOCIATED_DEVICE_NAME = "test_device_name";
+ private static final String TEST_ASSOCIATED_DEVICE_ADDRESS = "test_device_address";
+ private static final int TEST_USER_ID = 10;
+ private static final long TEST_HANDLE = 0L;
+
+ @Mock private ITrustedDeviceManager mockTrustedDeviceManager;
+ private KeyguardManager keyguardManager;
+ @Mock private Observer<EnrollmentState> mockEnrollmentStateObserver;
+
+ private TrustedDeviceViewModel viewModel;
+
+ private ITrustedDeviceEnrollmentCallback enrollmentCallback;
+ private ITrustedDeviceCallback trustedDeviceCallback;
+ private IOnTrustedDevicesRetrievedListener devicesRetrievedListener;
+
+ @Before
+ public void setUp() throws RemoteException {
+ MockitoAnnotations.initMocks(this);
+ Application application = ApplicationProvider.getApplicationContext();
+ keyguardManager = application.getSystemService(KeyguardManager.class);
+ viewModel = new TrustedDeviceViewModel(application, mockTrustedDeviceManager);
+ viewModel.setAssociatedDevice(createAssociatedDevice());
+ captureCallbacks();
+ }
+
+ @Test
+ public void enrollTrustedDevice_deviceConnected() throws RemoteException {
+ when(mockTrustedDeviceManager.getActiveUserConnectedDevices())
+ .thenReturn(Collections.singletonList(createConnectedDevice()));
+ viewModel.enrollTrustedDevice(createAssociatedDevice());
+ verify(mockTrustedDeviceManager).initiateEnrollment(eq(TEST_ASSOCIATED_DEVICE_ID));
+ }
+
+ @Test
+ public void enrollTrustedDevice_deviceNotConnected() throws RemoteException {
+ when(mockTrustedDeviceManager.getActiveUserConnectedDevices()).thenReturn(new ArrayList<>());
+ viewModel.enrollTrustedDevice(createAssociatedDevice());
+ viewModel.getEnrollmentState().observeForever(mockEnrollmentStateObserver);
+ waitForLiveDataUpdate();
+ verify(mockEnrollmentStateObserver).onChanged(EnrollmentState.NO_CONNECTION);
+ }
+
+ @Test
+ public void disableTrustedDevice() throws RemoteException {
+ TrustedDevice testDevice = createTrustedDevice();
+ viewModel.disableTrustedDevice(testDevice);
+ verify(mockTrustedDeviceManager).removeTrustedDevice(eq(testDevice));
+ }
+
+ @Test
+ public void processEnrollment_deviceNotSecured() {
+ shadowOf(keyguardManager).setIsDeviceSecure(false);
+ viewModel.processEnrollment();
+ viewModel.getEnrollmentState().observeForever(mockEnrollmentStateObserver);
+ waitForLiveDataUpdate();
+ verify(mockEnrollmentStateObserver).onChanged(EnrollmentState.WAITING_FOR_PASSWORD_SETUP);
+ }
+
+ @Test
+ public void processEnrollment_receivedCredentialBeforeStartEnrollment() throws RemoteException {
+ shadowOf(keyguardManager).setIsDeviceSecure(true);
+ enrollmentCallback.onValidateCredentialsRequest();
+ viewModel.processEnrollment();
+ viewModel.getEnrollmentState().observeForever(mockEnrollmentStateObserver);
+ waitForLiveDataUpdate();
+ verify(mockEnrollmentStateObserver).onChanged(EnrollmentState.CREDENTIAL_PENDING);
+ }
+
+ @Test
+ public void processEnrollment_receivedCredentialAfterStartEnrollment() {
+ shadowOf(keyguardManager).setIsDeviceSecure(true);
+ viewModel.processEnrollment();
+ viewModel.getEnrollmentState().observeForever(mockEnrollmentStateObserver);
+ waitForLiveDataUpdate();
+ verify(mockEnrollmentStateObserver).onChanged(EnrollmentState.IN_PROGRESS);
+ }
+
+ @Test
+ public void trustedDeviceEnabled_valueUpdated() throws RemoteException {
+ TrustedDevice testDevice = createTrustedDevice();
+ trustedDeviceCallback.onTrustedDeviceAdded(testDevice);
+ viewModel.getEnabledDevice().observeForever(v -> {});
+ waitForLiveDataUpdate();
+ assertThat(viewModel.getEnabledDevice().getValue().equals(testDevice)).isTrue();
+ }
+
+ @Test
+ public void trustedDeviceDisabled_valueUpdated() throws RemoteException {
+ TrustedDevice testDevice = createTrustedDevice();
+ trustedDeviceCallback.onTrustedDeviceRemoved(testDevice);
+ viewModel.getDisabledDevice().observeForever(v -> {});
+ waitForLiveDataUpdate();
+ assertThat(viewModel.getDisabledDevice().getValue().equals(testDevice)).isTrue();
+ }
+
+ @Test
+ public void trustedDeviceRetrieved_valueUpdated() throws RemoteException {
+ TrustedDevice testDevice = createTrustedDevice();
+ devicesRetrievedListener.onTrustedDevicesRetrieved(Collections.singletonList(testDevice));
+ viewModel.getTrustedDevices().observeForever(v -> {});
+ waitForLiveDataUpdate();
+ assertThat(viewModel.getTrustedDevices().getValue().get(0).equals(testDevice)).isTrue();
+ }
+
+ private static void waitForLiveDataUpdate() {
+ shadowOf(getMainLooper()).idle();
+ }
+
+ private void captureCallbacks() throws RemoteException {
+ ArgumentCaptor<ITrustedDeviceEnrollmentCallback> enrollmentCallbackCaptor =
+ ArgumentCaptor.forClass(ITrustedDeviceEnrollmentCallback.class);
+ verify(mockTrustedDeviceManager)
+ .registerTrustedDeviceEnrollmentCallback(enrollmentCallbackCaptor.capture());
+ enrollmentCallback = enrollmentCallbackCaptor.getValue();
+
+ ArgumentCaptor<ITrustedDeviceCallback> trustedDeviceCallbackCaptor =
+ ArgumentCaptor.forClass(ITrustedDeviceCallback.class);
+ verify(mockTrustedDeviceManager)
+ .registerTrustedDeviceCallback(trustedDeviceCallbackCaptor.capture());
+ trustedDeviceCallback = trustedDeviceCallbackCaptor.getValue();
+
+ ArgumentCaptor<IOnTrustedDevicesRetrievedListener> devicesRetrievedListenerCaptor =
+ ArgumentCaptor.forClass(IOnTrustedDevicesRetrievedListener.class);
+ verify(mockTrustedDeviceManager)
+ .retrieveTrustedDevicesForActiveUser(devicesRetrievedListenerCaptor.capture());
+ devicesRetrievedListener = devicesRetrievedListenerCaptor.getValue();
+ }
+
+ private static AssociatedDevice createAssociatedDevice() {
+ return new AssociatedDevice(
+ TEST_ASSOCIATED_DEVICE_ID,
+ TEST_ASSOCIATED_DEVICE_ADDRESS,
+ TEST_ASSOCIATED_DEVICE_NAME,
+ /* isConnectionEnabled= */ true);
+ }
+
+ private static ConnectedDevice createConnectedDevice() {
+ return new ConnectedDevice(
+ TEST_ASSOCIATED_DEVICE_ID,
+ TEST_ASSOCIATED_DEVICE_NAME,
+ /* belongsToActiveUser= */ true,
+ /* hasSecureChannel= */ true);
+ }
+
+ private static TrustedDevice createTrustedDevice() {
+ return new TrustedDevice(TEST_ASSOCIATED_DEVICE_ID, TEST_USER_ID, TEST_HANDLE);
+ }
+}